diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-08-27 21:17:52 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-08-27 21:17:52 +0200 |
| commit | 1af57210e2e55d40eb39a274fcf48779c6b9e7d5 (patch) | |
| tree | 55c22bbd35462f1c940b24614af05ea07bcd7f35 /ubuntu/maverick/dependencies/sip4-tqt | |
| parent | af8c5ead9ac4c1ece3408b74224e5e273b6994ce (diff) | |
| parent | 2d0d0ba99b507cab093962cb910ddc7dd4755c94 (diff) | |
| download | tde-packaging-1af57210e2e55d40eb39a274fcf48779c6b9e7d5.tar.gz tde-packaging-1af57210e2e55d40eb39a274fcf48779c6b9e7d5.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/dependencies/sip4-tqt')
| -rw-r--r-- | ubuntu/maverick/dependencies/sip4-tqt/debian/control | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links | 0 | ||||
| -rwxr-xr-x | ubuntu/maverick/dependencies/sip4-tqt/debian/rules | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/control b/ubuntu/maverick/dependencies/sip4-tqt/debian/control index 825f458eb..7091f5392 100644 --- a/ubuntu/maverick/dependencies/sip4-tqt/debian/control +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Bernd Zeimetz <bzed@debian.org>, Michael Casadevall <mcasadevall@debian.org> -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/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links index 26a9ded9b..26a9ded9b 100755..100644 --- a/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links +++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/python-sip-dev.links diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules index 2286739d5..9073bd22f 100755 --- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules +++ b/ubuntu/maverick/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 |