summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/libraries
diff options
context:
space:
mode:
authorSlávek Banko <[email protected]>2016-01-30 20:19:21 +0100
committerSlávek Banko <[email protected]>2016-01-30 20:19:21 +0100
commit1e2672ad64a3a6bee8e12dd2496a85ddc80768a6 (patch)
treec72c3e1d875a1bc747ca05400ccda8aaaf7ad7ec /ubuntu/maverick/libraries
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 <[email protected]>
Diffstat (limited to 'ubuntu/maverick/libraries')
-rw-r--r--ubuntu/maverick/libraries/pytdeextensions/debian/control2
-rwxr-xr-xubuntu/maverick/libraries/pytdeextensions/debian/rules10
2 files changed, 8 insertions, 4 deletions
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 <[email protected]>
Uploaders: Fathi Boudra <[email protected]>, Mark Purcell <[email protected]>
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