From 2d0d0ba99b507cab093962cb910ddc7dd4755c94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 27 Aug 2013 04:57:39 +0200 Subject: Switch to dh_python2 (or dh_pysupport as fallback) on Debian and Ubuntu --- ubuntu/precise/dependencies/sip4-tqt/debian/control | 2 +- ubuntu/precise/dependencies/sip4-tqt/debian/python-sip-dev.links | 0 ubuntu/precise/dependencies/sip4-tqt/debian/rules | 5 ++++- 3 files changed, 5 insertions(+), 2 deletions(-) mode change 100755 => 100644 ubuntu/precise/dependencies/sip4-tqt/debian/python-sip-dev.links (limited to 'ubuntu/precise/dependencies/sip4-tqt/debian') diff --git a/ubuntu/precise/dependencies/sip4-tqt/debian/control b/ubuntu/precise/dependencies/sip4-tqt/debian/control index 825f458eb..7091f5392 100644 --- a/ubuntu/precise/dependencies/sip4-tqt/debian/control +++ b/ubuntu/precise/dependencies/sip4-tqt/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: Torsten Marek , Bernd Zeimetz , Michael Casadevall -Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1), libtqtinterface-dev +Build-Depends: debhelper (>= 7), python-all-dev (>= 2.3.5-10), python-all-dbg, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), libtqtinterface-dev Standards-Version: 3.8.4 XS-Python-Version: all diff --git a/ubuntu/precise/dependencies/sip4-tqt/debian/python-sip-dev.links b/ubuntu/precise/dependencies/sip4-tqt/debian/python-sip-dev.links old mode 100755 new mode 100644 diff --git a/ubuntu/precise/dependencies/sip4-tqt/debian/rules b/ubuntu/precise/dependencies/sip4-tqt/debian/rules index 2286739d5..9073bd22f 100755 --- a/ubuntu/precise/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/precise/dependencies/sip4-tqt/debian/rules @@ -19,6 +19,9 @@ endif PYTHONS := $(shell pyversions -vr debian/control) +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2 --no-dbg-cleaning,dh_pysupport) + -include /usr/share/python/python.mk ifeq (,$(py_sitename)) py_sitename = site-packages @@ -132,7 +135,7 @@ ifneq (,$(findstring -a, $(DH_OPTIONS))) endif dh_compress dh_fixperms - dh_pysupport + ${DH_PYTHON2} dh_installdeb dh_shlibdeps dh_gencontrol -- cgit v1.2.1