From 41241c98d3255e62d21969821c5fa86754a46127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 30 Jan 2016 20:19:21 +0100 Subject: Switch remaining packages to dh_python2 on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 1e2672ad64a3a6bee8e12dd2496a85ddc80768a6) --- ubuntu/maverick/libraries/pytdeextensions/debian/control | 2 +- ubuntu/maverick/libraries/pytdeextensions/debian/rules | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'ubuntu/maverick/libraries/pytdeextensions') 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 Uploaders: Fathi Boudra , Mark Purcell 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 -- cgit v1.2.1