From 969208d92e57960ab67adf648474c3d8905ac0a6 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: [PATCH] Switch to dh_python2 (or dh_pysupport as fallback) on Debian and Ubuntu (cherry picked from commit 2d0d0ba99b507cab093962cb910ddc7dd4755c94) --- .../desktop-effects-kde/debian/control | 2 +- .../desktop-effects-kde/debian/rules | 5 ++++- .../applications/fusion-icon/debian/control | 2 +- .../applications/fusion-icon/debian/rules | 4 ++-- debian/lenny/kdebindings/debian/control | 2 +- debian/lenny/kdebindings/debian/rules | 5 ++++- .../pykdeextensions-trinity.lintian-overrides | 18 +++++++++--------- .../libraries/python-trinity/debian/control | 2 +- .../libraries/python-trinity/debian/rules | 5 ++++- .../desktop-effects-kde/debian/control | 2 +- .../desktop-effects-kde/debian/rules | 5 ++++- .../applications/fusion-icon/debian/control | 2 +- .../applications/fusion-icon/debian/rules | 4 ++-- debian/squeeze/kdebindings/debian/control | 2 +- debian/squeeze/kdebindings/debian/rules | 5 ++++- .../pykdeextensions-trinity.lintian-overrides | 18 +++++++++--------- .../libraries/python-trinity/debian/control | 2 +- .../libraries/python-trinity/debian/rules | 5 ++++- .../desktop-effects-kde/debian/control | 2 +- .../desktop-effects-kde/debian/rules | 5 ++++- .../applications/fusion-icon/debian/control | 2 +- .../applications/fusion-icon/debian/rules | 4 ++-- ubuntu/maverick/kdebindings/debian/control | 2 +- ubuntu/maverick/kdebindings/debian/rules | 5 ++++- .../pykdeextensions-trinity.lintian-overrides | 18 +++++++++--------- .../libraries/python-trinity/debian/control | 2 +- .../libraries/python-trinity/debian/rules | 5 ++++- 27 files changed, 81 insertions(+), 54 deletions(-) diff --git a/debian/lenny/applications/desktop-effects-kde/debian/control b/debian/lenny/applications/desktop-effects-kde/debian/control index 80486a941..7db9bcac5 100644 --- a/debian/lenny/applications/desktop-effects-kde/debian/control +++ b/debian/lenny/applications/desktop-effects-kde/debian/control @@ -2,7 +2,7 @@ Source: desktop-effects-kde-trinity Section: kde Priority: optional Maintainer: Timothy Pearson -Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-central (>= 0.5.6) +Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), python-support (>= 0.6) | python-dev (>= 2.6.6-3~) Standards-Version: 3.8.4 XS-Python-Version: all diff --git a/debian/lenny/applications/desktop-effects-kde/debian/rules b/debian/lenny/applications/desktop-effects-kde/debian/rules index 8eee42e6a..25fa64a44 100755 --- a/debian/lenny/applications/desktop-effects-kde/debian/rules +++ b/debian/lenny/applications/desktop-effects-kde/debian/rules @@ -1,5 +1,8 @@ #!/usr/bin/make -f +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) + include /usr/share/cdbs/1/rules/debhelper.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde @@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) binary-install/desktop-effects-kde-trinity:: - dh_pycentral -pdesktop-effects-kde-trinity + ${DH_PYTHON2} -pdesktop-effects-kde-trinity diff --git a/debian/lenny/applications/fusion-icon/debian/control b/debian/lenny/applications/fusion-icon/debian/control index 07c8a3d28..7130740f7 100644 --- a/debian/lenny/applications/fusion-icon/debian/control +++ b/debian/lenny/applications/fusion-icon/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson Uploaders: Python Applications Packaging Team XS-Python-Version: all Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), pkg-config, python-all-dev -Build-Depends-Indep: python-central (>= 0.6.0), intltool +Build-Depends-Indep: python-support (>= 0.6), intltool Standards-Version: 3.8.4 Package: fusion-icon-trinity diff --git a/debian/lenny/applications/fusion-icon/debian/rules b/debian/lenny/applications/fusion-icon/debian/rules index 8c79610db..2b780a204 100755 --- a/debian/lenny/applications/fusion-icon/debian/rules +++ b/debian/lenny/applications/fusion-icon/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM=pycentral +DEB_PYTHON_SYSTEM=pysupport include /usr/share/cdbs/1/rules/debhelper.mk # include /usr/share/cdbs/1/class/python-distutils.mk @@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/opt/trinity cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ rm -rf debian/fusion-icon-trinity/usr - dh_pycentral -pfusion-icon-trinity + dh_pysupport -pfusion-icon-trinity dh_icons diff --git a/debian/lenny/kdebindings/debian/control b/debian/lenny/kdebindings/debian/control index 93f18fdde..57cf0c78b 100644 --- a/debian/lenny/kdebindings/debian/control +++ b/debian/lenny/kdebindings/debian/control @@ -1,6 +1,6 @@ Source: kdebindings-trinity Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), - python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, + python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk, gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), ruby, ruby-dev, flex, bison, diff --git a/debian/lenny/kdebindings/debian/rules b/debian/lenny/kdebindings/debian/rules index 5e3594929..c913935d5 100755 --- a/debian/lenny/kdebindings/debian/rules +++ b/debian/lenny/kdebindings/debian/rules @@ -3,6 +3,9 @@ DEB_QUILT_PATCHDIR_LINK := export QUILT_PATCHES=debian/patches +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) + include /usr/share/cdbs/1/rules/debhelper.mk override DEB_BUILDDIR := $(DEB_SRCDIR) @@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity:: mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ binary-install/python-dcop-trinity:: - dh_pysupport -p$(cdbs_curpkg) + ${DH_PYTHON2} -p$(cdbs_curpkg) ### diff --git a/debian/lenny/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides b/debian/lenny/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides index 06b60205b..71fc709f5 100644 --- a/debian/lenny/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides +++ b/debian/lenny/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/debian/lenny/libraries/python-trinity/debian/control b/debian/lenny/libraries/python-trinity/debian/control index 7f6e42bca..97a7d4ccd 100644 --- a/debian/lenny/libraries/python-trinity/debian/control +++ b/debian/lenny/libraries/python-trinity/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina Uploaders: Torsten Marek , Debian Python Modules Team -Build-Depends: debhelper (>= 5.0.38), 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), dpatch, python-sip4, python-sip4-dbg, python-sip4-dev +Build-Depends: debhelper (>= 5.0.38), 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~), dpatch, 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/debian/lenny/libraries/python-trinity/debian/rules b/debian/lenny/libraries/python-trinity/debian/rules index ea15a4d21..1569d242c 100755 --- a/debian/lenny/libraries/python-trinity/debian/rules +++ b/debian/lenny/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 diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/control b/debian/squeeze/applications/desktop-effects-kde/debian/control index 36f61de74..991915975 100644 --- a/debian/squeeze/applications/desktop-effects-kde/debian/control +++ b/debian/squeeze/applications/desktop-effects-kde/debian/control @@ -2,7 +2,7 @@ Source: desktop-effects-kde-trinity Section: kde Priority: optional Maintainer: Timothy Pearson -Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-central (>= 0.5.6) +Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-support (>= 0.6) | python-dev (>= 2.6.6-3~) Standards-Version: 3.8.4 XS-Python-Version: all diff --git a/debian/squeeze/applications/desktop-effects-kde/debian/rules b/debian/squeeze/applications/desktop-effects-kde/debian/rules index 8eee42e6a..25fa64a44 100755 --- a/debian/squeeze/applications/desktop-effects-kde/debian/rules +++ b/debian/squeeze/applications/desktop-effects-kde/debian/rules @@ -1,5 +1,8 @@ #!/usr/bin/make -f +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) + include /usr/share/cdbs/1/rules/debhelper.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde @@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) binary-install/desktop-effects-kde-trinity:: - dh_pycentral -pdesktop-effects-kde-trinity + ${DH_PYTHON2} -pdesktop-effects-kde-trinity diff --git a/debian/squeeze/applications/fusion-icon/debian/control b/debian/squeeze/applications/fusion-icon/debian/control index 9735598d1..cbc63cebc 100644 --- a/debian/squeeze/applications/fusion-icon/debian/control +++ b/debian/squeeze/applications/fusion-icon/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson Uploaders: Python Applications Packaging Team XS-Python-Version: all Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev -Build-Depends-Indep: python-central (>= 0.6.0), intltool +Build-Depends-Indep: python-support (>= 0.6), intltool Standards-Version: 3.8.4 Package: fusion-icon-trinity diff --git a/debian/squeeze/applications/fusion-icon/debian/rules b/debian/squeeze/applications/fusion-icon/debian/rules index 572f6e270..207573dea 100755 --- a/debian/squeeze/applications/fusion-icon/debian/rules +++ b/debian/squeeze/applications/fusion-icon/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM=pycentral +DEB_PYTHON_SYSTEM=pysupport include /usr/share/cdbs/1/rules/debhelper.mk # include /usr/share/cdbs/1/class/python-distutils.mk @@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/opt/trinity cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ rm -rf debian/fusion-icon-trinity/usr - dh_pycentral -pfusion-icon-trinity + dh_pysupport -pfusion-icon-trinity dh_icons diff --git a/debian/squeeze/kdebindings/debian/control b/debian/squeeze/kdebindings/debian/control index 93f18fdde..57cf0c78b 100644 --- a/debian/squeeze/kdebindings/debian/control +++ b/debian/squeeze/kdebindings/debian/control @@ -1,6 +1,6 @@ Source: kdebindings-trinity Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), - python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, + python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk, gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), ruby, ruby-dev, flex, bison, diff --git a/debian/squeeze/kdebindings/debian/rules b/debian/squeeze/kdebindings/debian/rules index 002b7f5f9..2a96323d3 100755 --- a/debian/squeeze/kdebindings/debian/rules +++ b/debian/squeeze/kdebindings/debian/rules @@ -3,6 +3,9 @@ DEB_QUILT_PATCHDIR_LINK := export QUILT_PATCHES=debian/patches +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) + include /usr/share/cdbs/1/rules/debhelper.mk override DEB_BUILDDIR := $(DEB_SRCDIR) @@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity:: mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ binary-install/python-dcop-trinity:: - dh_pysupport -p$(cdbs_curpkg) + ${DH_PYTHON2} -p$(cdbs_curpkg) ### diff --git a/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides b/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides index 06b60205b..71fc709f5 100644 --- a/debian/squeeze/libraries/pykdeextensions/debian/pykdeextensions-trinity.lintian-overrides +++ b/debian/squeeze/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/debian/squeeze/libraries/python-trinity/debian/control b/debian/squeeze/libraries/python-trinity/debian/control index bcc228eb1..f1f8eea94 100644 --- a/debian/squeeze/libraries/python-trinity/debian/control +++ b/debian/squeeze/libraries/python-trinity/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina Uploaders: Torsten Marek , Debian Python Modules Team -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/debian/squeeze/libraries/python-trinity/debian/rules b/debian/squeeze/libraries/python-trinity/debian/rules index 6051507bb..d024dc84d 100755 --- a/debian/squeeze/libraries/python-trinity/debian/rules +++ b/debian/squeeze/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 diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/control b/ubuntu/maverick/applications/desktop-effects-kde/debian/control index d6572a130..741a16a35 100644 --- a/ubuntu/maverick/applications/desktop-effects-kde/debian/control +++ b/ubuntu/maverick/applications/desktop-effects-kde/debian/control @@ -2,7 +2,7 @@ Source: desktop-effects-kde-trinity Section: kde Priority: optional Maintainer: Timothy Pearson -Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-central (>= 0.5.6) +Build-Depends-Indep: cdbs (>= 0.4.43), debhelper (>= 5.0.38), quilt, python-support (>= 0.6) | python-dev (>= 2.6.6-3~) Standards-Version: 3.8.4 XS-Python-Version: all diff --git a/ubuntu/maverick/applications/desktop-effects-kde/debian/rules b/ubuntu/maverick/applications/desktop-effects-kde/debian/rules index 8eee42e6a..25fa64a44 100755 --- a/ubuntu/maverick/applications/desktop-effects-kde/debian/rules +++ b/ubuntu/maverick/applications/desktop-effects-kde/debian/rules @@ -1,5 +1,8 @@ #!/usr/bin/make -f +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) + include /usr/share/cdbs/1/rules/debhelper.mk DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/kde @@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ && echo xz || echo bzip2) binary-install/desktop-effects-kde-trinity:: - dh_pycentral -pdesktop-effects-kde-trinity + ${DH_PYTHON2} -pdesktop-effects-kde-trinity diff --git a/ubuntu/maverick/applications/fusion-icon/debian/control b/ubuntu/maverick/applications/fusion-icon/debian/control index a18c43475..e90061663 100644 --- a/ubuntu/maverick/applications/fusion-icon/debian/control +++ b/ubuntu/maverick/applications/fusion-icon/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson Uploaders: Python Applications Packaging Team XS-Python-Version: all Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5.0.37.1), quilt, pkg-config, python-all-dev -Build-Depends-Indep: python-central (>= 0.6.0), intltool +Build-Depends-Indep: python-support (>= 0.6), intltool Standards-Version: 3.8.4 Package: fusion-icon-trinity diff --git a/ubuntu/maverick/applications/fusion-icon/debian/rules b/ubuntu/maverick/applications/fusion-icon/debian/rules index 572f6e270..207573dea 100755 --- a/ubuntu/maverick/applications/fusion-icon/debian/rules +++ b/ubuntu/maverick/applications/fusion-icon/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -DEB_PYTHON_SYSTEM=pycentral +DEB_PYTHON_SYSTEM=pysupport include /usr/share/cdbs/1/rules/debhelper.mk # include /usr/share/cdbs/1/class/python-distutils.mk @@ -17,5 +17,5 @@ binary-install/fusion-icon-trinity:: mkdir -p debian/fusion-icon-trinity/opt/trinity cp -Rp debian/fusion-icon-trinity/usr/* debian/fusion-icon-trinity/opt/trinity/ rm -rf debian/fusion-icon-trinity/usr - dh_pycentral -pfusion-icon-trinity + dh_pysupport -pfusion-icon-trinity dh_icons diff --git a/ubuntu/maverick/kdebindings/debian/control b/ubuntu/maverick/kdebindings/debian/control index 35567eec0..343f7aa47 100644 --- a/ubuntu/maverick/kdebindings/debian/control +++ b/ubuntu/maverick/kdebindings/debian/control @@ -1,6 +1,6 @@ Source: kdebindings-trinity Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5), - python-dev (>= 2.3.5-11), python-support (>= 0.5), quilt, gawk, + python-dev (>= 2.3.5-11), python-support (>= 0.5) | python-dev (>= 2.6.6-3~), quilt, gawk, gettext, default-jdk [amd64 i386 ia64 lpia powerpc s390 sparc], kdelibs4-trinity-dev (>= 4:3.5.9), libqt3-compat-headers (>= 3:3.3.5), ruby, ruby-dev, flex, bison, diff --git a/ubuntu/maverick/kdebindings/debian/rules b/ubuntu/maverick/kdebindings/debian/rules index 002b7f5f9..2a96323d3 100755 --- a/ubuntu/maverick/kdebindings/debian/rules +++ b/ubuntu/maverick/kdebindings/debian/rules @@ -3,6 +3,9 @@ DEB_QUILT_PATCHDIR_LINK := export QUILT_PATCHES=debian/patches +DEB_PYTHON_SYSTEM = $(if $(wildcard /usr/bin/dh_python2),,pysupport) +DH_PYTHON2 = $(if $(wildcard /usr/bin/dh_python2),dh_python2,dh_pysupport) + include /usr/share/cdbs/1/rules/debhelper.mk override DEB_BUILDDIR := $(DEB_SRCDIR) @@ -131,7 +134,7 @@ binary-install/libqt0-ruby1.8-trinity:: mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/ binary-install/python-dcop-trinity:: - dh_pysupport -p$(cdbs_curpkg) + ${DH_PYTHON2} -p$(cdbs_curpkg) ### 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 XSBC-Original-Maintainer: Ricardo Javier Cardenes Medina Uploaders: Torsten Marek , Debian Python Modules Team -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