diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-08-27 04:57:39 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-14 00:55:05 +0200 |
| commit | 969208d92e57960ab67adf648474c3d8905ac0a6 (patch) | |
| tree | 8c30f887bb530d429e8c0e406bb86312bae8ca46 /ubuntu/maverick/libraries | |
| parent | 0f086e717486c3aa5097a63d8ce3608d823a6f0c (diff) | |
| download | tde-packaging-969208d92e57960ab67adf648474c3d8905ac0a6.tar.gz tde-packaging-969208d92e57960ab67adf648474c3d8905ac0a6.zip | |
Switch to dh_python2 (or dh_pysupport as fallback) on Debian and Ubuntu
(cherry picked from commit 2d0d0ba99b507cab093962cb910ddc7dd4755c94)
Diffstat (limited to 'ubuntu/maverick/libraries')
3 files changed, 14 insertions, 11 deletions
diff --git a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides index 06b60205b..71fc709f5 100644 --- a/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides +++ b/ubuntu/maverick/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides @@ -1,10 +1,10 @@ -pykdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell -pykdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ -pykdeextensions: desktop-command-not-in-package ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ +pykdeextensions-trinity: desktop-entry-contains-unknown-key ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB] +pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop kcmshell +pykdeextensions-trinity: desktop-entry-invalid-category QT ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pykdeextensions-trinity: desktop-entry-invalid-category X-KDE-settings-system ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pykdeextensions-trinity: desktop-entry-lacks-main-category ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop +pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$ +pykdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$ -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py -pykdeextensions: executable-not-elf-or-script ./usr/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py +pykdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pykdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py +pykdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pykdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py diff --git a/ubuntu/maverick/libraries/python-trinity/debian/control b/ubuntu/maverick/libraries/python-trinity/debian/control index 2868ae41c..169a8250d 100644 --- a/ubuntu/maverick/libraries/python-trinity/debian/control +++ b/ubuntu/maverick/libraries/python-trinity/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina <rcardenes@debian.org> Uploaders: Torsten Marek <shlomme@debian.org>, Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> -Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-central (>= 0.6.11), python-sip4, python-sip4-dbg, python-sip4-dev +Build-Depends: debhelper (>= 5.0.38), quilt, libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt-dev (>= 3.18), kdelibs4-trinity-dev, python-support (>= 0.6) | python-dev (>= 2.6.6-3~), python-sip4, python-sip4-dbg, python-sip4-dev Standards-Version: 3.8.4 Homepage: http://www.riverbankcomputing.co.uk/pykde/index.php XS-Python-Version: all diff --git a/ubuntu/maverick/libraries/python-trinity/debian/rules b/ubuntu/maverick/libraries/python-trinity/debian/rules index 6051507bb..d024dc84d 100755 --- a/ubuntu/maverick/libraries/python-trinity/debian/rules +++ b/ubuntu/maverick/libraries/python-trinity/debian/rules @@ -31,6 +31,9 @@ endif PYTHONS := $(shell pyversions -vr debian/control) DBG_PYTHONS := $(shell pyversions -vd) +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) + GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p') ifneq (,$(filter $(GCCVER),4.2 4.3)) SPLIT=20 @@ -149,7 +152,7 @@ ifeq (,$(findstring -i, $(DH_OPTIONS))) endif dh_compress -X.py -X.ui -X.dtd dh_fixperms - DH_PYCENTRAL=nomove dh_pycentral + ${DH_PYTHON2} dh_installdeb dh_shlibdeps -l /opt/trinity/lib dh_gencontrol |