summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-01-30 20:19:21 +0100
committerSlávek Banko <slavek.banko@axis.cz>2016-01-30 20:19:21 +0100
commit1e2672ad64a3a6bee8e12dd2496a85ddc80768a6 (patch)
treec72c3e1d875a1bc747ca05400ccda8aaaf7ad7ec /ubuntu
parent65a078c0bcb64fc1a2bc14389e08692bbf99094b (diff)
downloadtde-packaging-1e2672ad64a3a6bee8e12dd2496a85ddc80768a6.tar.gz
tde-packaging-1e2672ad64a3a6bee8e12dd2496a85ddc80768a6.zip
Switch remaining packages to dh_python2 on Debian and Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/applications/fusion-icon/debian/control2
-rwxr-xr-xubuntu/maverick/applications/fusion-icon/debian/rules16
-rw-r--r--ubuntu/maverick/applications/tde-guidance/debian/control2
-rw-r--r--ubuntu/maverick/applications/tde-guidance/debian/rules10
-rw-r--r--ubuntu/maverick/libraries/pytdeextensions/debian/control2
-rwxr-xr-xubuntu/maverick/libraries/pytdeextensions/debian/rules10
6 files changed, 29 insertions, 13 deletions
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/control b/ubuntu/maverick/applications/fusion-icon/debian/control
index 2bbbdbdaa..d1c814e7c 100644
--- a/ubuntu/maverick/applications/fusion-icon/debian/control
+++ b/ubuntu/maverick/applications/fusion-icon/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
XS-Python-Version: all
Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev
-Build-Depends-Indep: python-support (>= 0.6), intltool
+Build-Depends-Indep: python-support (>= 0.6) | dh-python, intltool
Standards-Version: 3.8.4
Package: fusion-icon-trinity
diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules
index 3fe3dd8ea..f1b2fcb21 100755
--- a/ubuntu/maverick/applications/fusion-icon/debian/rules
+++ b/ubuntu/maverick/applications/fusion-icon/debian/rules
@@ -1,10 +1,15 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport)
+DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport)
+DEB_PYTHON2_MODULE_PACKAGES=fusion-icon-trinity
include /usr/share/cdbs/1/rules/debhelper.mk
-# include /usr/share/cdbs/1/class/python-distutils.mk
-include debian/python-distutils-custom.mk
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+ include debian/python-distutils-custom.mk
+else
+ include /usr/share/cdbs/1/class/python-distutils.mk
+endif
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
@@ -19,7 +24,7 @@ binary-install/fusion-icon-trinity::
mkdir -p debian/fusion-icon-trinity/opt/trinity
cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/
rm -rf debian/fusion-icon-trinity/usr
- dh_pysupport -pfusion-icon-trinity
+ ${DH_PYTHON2} -pfusion-icon-trinity
###
# Must be done after invoking dh_pysupport, otherwise python scripts will
# end up in /usr/share/pyshare instead of dist-packages
@@ -27,4 +32,7 @@ binary-install/fusion-icon-trinity::
mv debian/fusion-icon-trinity/temp/lib debian/fusion-icon-trinity/usr
rm -rf debian/fusion-icon-trinity/temp
###
+ mkdir -p debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity
+ mv debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity/* debian/fusion-icon-trinity/usr/share/doc/fusion-icon-trinity/
+ rmdir -p --ignore-fail-on-non-empty debian/fusion-icon-trinity/opt/trinity/share/doc/fusion-icon-trinity
dh_icons
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control
index 3398429dc..66b008863 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/control
+++ b/ubuntu/maverick/applications/tde-guidance/debian/control
@@ -7,7 +7,7 @@ Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev,
libpythonize0-trinity-dev, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev,
- python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
+ python-support (>= 0.6) | dh-python, python-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata
Standards-Version: 3.8.4
Package: tde-guidance-trinity
diff --git a/ubuntu/maverick/applications/tde-guidance/debian/rules b/ubuntu/maverick/applications/tde-guidance/debian/rules
index 217eea9ed..656eac6d4 100644
--- a/ubuntu/maverick/applications/tde-guidance/debian/rules
+++ b/ubuntu/maverick/applications/tde-guidance/debian/rules
@@ -1,13 +1,17 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = pysupport
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport)
+DEB_PYTHON2_MODULE_PACKAGES=tde-guidance-trinity guidance-backends-trinity
PYSUPPORT_INST_PATH = /opt/trinity/share/python-support
GUIDANCE_INST_PATH = $(PYSUPPORT_INST_PATH)/tde-guidance-trinity
export EXTRA_MODULE_DIR=$(GUIDANCE_INST_PATH)
include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/class/python-distutils.mk
-include debian/python-distutils-jaunty.mk
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+ include debian/python-distutils-jaunty.mk
+else
+ include /usr/share/cdbs/1/class/python-distutils.mk
+endif
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control
index 55a083b0c..e6ccaea77 100644
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/control
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool,
libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity,
- python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python-all (>= 2.5), python-all-dev (>= 2.5)
+ python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6) | dh-python, python-all (>= 2.5), python-all-dev (>= 2.5)
Standards-Version: 3.8.4
Package: pytdeextensions-trinity
diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/rules b/ubuntu/maverick/libraries/pytdeextensions/debian/rules
index 308059b26..188238d79 100755
--- a/ubuntu/maverick/libraries/pytdeextensions/debian/rules
+++ b/ubuntu/maverick/libraries/pytdeextensions/debian/rules
@@ -1,10 +1,14 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = pysupport
+DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_pysupport),pysupport)
+DEB_PYTHON2_MODULE_PACKAGES=pytdeextensions-trinity libpythonize0-trinity
include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/class/python-distutils.mk
-include debian/python-distutils-jaunty.mk
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+ include debian/python-distutils-jaunty.mk
+else
+ include /usr/share/cdbs/1/class/python-distutils.mk
+endif
#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk