Switch to dh_python2 (or dh_pysupport as fallback) on Debian and Ubuntu

18 files changed, 51 insertions, 71 deletions

diff --git a/debian/lenny/applications/desktop-effects-tde/debian/control b/debian/lenny/applications/desktop-effects-tde/debian/control
index 205a644a6..a44a9d821 100644
--- a/debian/lenny/applications/desktop-effects-tde/debian/control
+++ b/debian/lenny/applications/desktop-effects-tde/debian/control
@@ -2,7 +2,7 @@ Source: desktop-effects-tde-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-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-tde/debian/rules b/debian/lenny/applications/desktop-effects-tde/debian/rules
index d494616db..41ad63be2 100755
--- a/debian/lenny/applications/desktop-effects-tde/debian/rules
+++ b/debian/lenny/applications/desktop-effects-tde/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/tde
@@ -13,4 +16,4 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
 binary-install/desktop-effects-tde-trinity::
-	dh_pycentral -pdesktop-effects-tde-trinity
+	${DH_PYTHON2} -pdesktop-effects-tde-trinity
diff --git a/debian/lenny/applications/fusion-icon/debian/control b/debian/lenny/applications/fusion-icon/debian/control
index 25234c2dd..992d74863 100644
--- a/debian/lenny/applications/fusion-icon/debian/control
+++ b/debian/lenny/applications/fusion-icon/debian/control
@@ -5,7 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Uploaders: Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 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/dependencies/python-tqt/debian/control b/debian/lenny/dependencies/python-tqt/debian/control
index 71f586675..4eb3719bd 100644
--- a/debian/lenny/dependencies/python-tqt/debian/control
+++ b/debian/lenny/dependencies/python-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 (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1), python-sip-dbg, python-all-dbg
+Build-Depends: debhelper (>= 6.0.7~), python-all-dev (>= 2.3.5-10), libtqtinterface-dev, tqt3-dev-tools, tqt3-apps-dev, python-sip-dev (>= 4.10.0-2ubuntu1), libtqscintilla-dev, python-support (>= 0.7.1) | python-dev (>= 2.6.6-3~), python-sip-dbg, python-all-dbg
 Standards-Version: 3.8.4
 
 Package: python-tqt
diff --git a/debian/lenny/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides b/debian/lenny/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
index 3d0ed6137..36e6c1349 100644
--- a/debian/lenny/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
+++ b/debian/lenny/dependencies/python-tqt/debian/python-tqt-dev.lintian-overrides
@@ -1,15 +1,15 @@
 # lintian test overriden as the files tripping this error are put into the source
 # of the generated package. This is a false-positive
 
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qt/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtaxcontainer/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtcanvas/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtext/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtgl/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtnetwork/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtpe/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtsql/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qttable/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtui/copying.sip
-python-qt-dev binary: extra-license-file usr/share/sip/qt/qtxml/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qt/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtaxcontainer/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtcanvas/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtext/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtgl/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtnetwork/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtpe/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtsql/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qttable/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtui/copying.sip
+python-tqt-dev binary: extra-license-file usr/share/sip/tqt/qtxml/copying.sip
 
diff --git a/debian/lenny/dependencies/python-tqt/debian/python-tqt-dev.preinst b/debian/lenny/dependencies/python-tqt/debian/python-tqt-dev.preinst
deleted file mode 100644
index b17b35a44..000000000
--- a/debian/lenny/dependencies/python-tqt/debian/python-tqt-dev.preinst
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-# TODO: remove this file after releasing Squeeze
-set -e
-if [ "$1" = upgrade ]
-then
-	if dpkg --compare-versions "$2" lt 3.17.6-2; then
-	    if which python >/dev/null 2>&1 && which pycentral >/dev/null 2>&1; then
-		pycentral pkgremove python-qt-dev
-	    else
-		flist=$(tempfile)
-		find /usr/share/pycentral/python-qt-dev -depth -mindepth 2 \
-		    \( -name '*.py' -printf 'p %P\n' -o -printf '%y %P\n' \) \
-		    > $flist 2>/dev/null || true
-		    if [ -s $flist ]; then
-			for d in /usr/lib/python[0-9].[0-9]; do
-			    case "$d" in */python2.1|*/python2.2) continue; esac
-			    while read t n; do
-				case "$t" in
-				    p) rm -f $d/$n $d/${n}[co];;
-				    d) rmdir $d/$n 2>/dev/null || true;;
-				    *) rm -f $d/$n
-				esac
-			    done < $flist
-			done
-		    fi
-		    rm -f $flist
-		    dpkg -L python-qt-dev \
-			| awk '/\/usr\/share\/pycentral/ {next} /\.py$/ {print $0"c\n" $0"o"}' \
-			| xargs rm -f >&2
-	    fi
-	fi
-fi
-
-#DEBHELPER#
-
diff --git a/debian/lenny/dependencies/python-tqt/debian/python-tqt-doc.dirs b/debian/lenny/dependencies/python-tqt/debian/python-tqt-doc.dirs
index dcd0e5b12..43a4fa9fa 100644
--- a/debian/lenny/dependencies/python-tqt/debian/python-tqt-doc.dirs
+++ b/debian/lenny/dependencies/python-tqt/debian/python-tqt-doc.dirs
@@ -1,2 +1,2 @@
-usr/share/doc/python-qt3-doc/html
-usr/share/doc/python-qt3-doc/examples
+usr/share/doc/python-tqt-doc/html
+usr/share/doc/python-tqt-doc/examples
diff --git a/debian/lenny/dependencies/python-tqt/debian/python-tqt-doc.install b/debian/lenny/dependencies/python-tqt/debian/python-tqt-doc.install
index 840625c0a..65f82036b 100644
--- a/debian/lenny/dependencies/python-tqt/debian/python-tqt-doc.install
+++ b/debian/lenny/dependencies/python-tqt/debian/python-tqt-doc.install
@@ -1 +1 @@
-doc/PyQt.html usr/share/doc/python-qt3-doc/html
+doc/PyQt.html usr/share/doc/python-tqt-doc/html
diff --git a/debian/lenny/dependencies/python-tqt/debian/rules b/debian/lenny/dependencies/python-tqt/debian/rules
index 86eca95c9..b0acb35f6 100755
--- a/debian/lenny/dependencies/python-tqt/debian/rules
+++ b/debian/lenny/dependencies/python-tqt/debian/rules
@@ -32,6 +32,9 @@ CXXFLAGS += "-I/usr/include/tqt"
 
 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,dh_pysupport)
+
 
 GCCVER := $(shell gcc --version | sed -n '/^gcc (GCC)/s/.*(GCC) \(...\).*/\1/p')
 ifneq (,$(filter $(GCCVER),4.2 4.3))
@@ -154,7 +157,7 @@ endif
 #	dh_strip
 	dh_compress -X.py -X.bmp -X.ui -X.sql
 	dh_fixperms
-	dh_pysupport
+	${DH_PYTHON2}
 	dh_sip
 	dh_lintian
 	dh_installdeb
diff --git a/debian/lenny/dependencies/sip4-tqt/debian/control b/debian/lenny/dependencies/sip4-tqt/debian/control
index 825f458eb..7091f5392 100644
--- a/debian/lenny/dependencies/sip4-tqt/debian/control
+++ b/debian/lenny/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/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.links b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.links
index 26a9ded9b..26a9ded9b 100755..100644
--- a/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.links
+++ b/debian/lenny/dependencies/sip4-tqt/debian/python-sip-dev.links
diff --git a/debian/lenny/dependencies/sip4-tqt/debian/rules b/debian/lenny/dependencies/sip4-tqt/debian/rules
index 2286739d5..9073bd22f 100755
--- a/debian/lenny/dependencies/sip4-tqt/debian/rules
+++ b/debian/lenny/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
diff --git a/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides b/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
index 17743dd31..7cd5d5817 100644
--- a/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
+++ b/debian/lenny/libraries/pytdeextensions/debian/pytdeextensions-trinity.lintian-overrides
@@ -1,10 +1,10 @@
-pytdeextensions: desktop-entry-contains-unknown-key ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop tdecmshell
-pytdeextensions: desktop-entry-invalid-category QT ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-entry-invalid-category X-TDE-settings-system ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-entry-lacks-main-category ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
-pytdeextensions: desktop-command-not-in-package ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
+pytdeextensions-trinity: desktop-entry-contains-unknown-key ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop:4 name[en_GB]
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop tdecmshell
+pytdeextensions-trinity: desktop-entry-invalid-category QT ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-entry-invalid-category X-TDE-settings-system ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-entry-lacks-main-category ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/kcontrol_module.desktop
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeapp/src/kdeapp.desktop $APPNAMELC$
+pytdeextensions-trinity: desktop-command-not-in-package ./opt/trinity/share/apps/pytdeextensions/app_templates/kdeutility/src/kdeutility.desktop $APPNAMELC$
 
-pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
-pytdeextensions: executable-not-elf-or-script ./usr/share/apps/pytdeextensions/app_templates/kdeutility/src/KDEUtilityDialogUI.py
+pytdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pytdeextensions/app_templates/kcontrol_module/src/KcontrolModuleWidgetUI.py
+pytdeextensions-trinity: executable-not-elf-or-script ./opt/trinity/share/apps/pytdeextensions/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 cad02055c..7f37be0e1 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 <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), libtqtinterface-dev, python, python-all-dev, python-all-dbg, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-tqt-dev, tdelibs4-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-tqt-dev, tdelibs4-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/pytde/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 67af8c2d8..d4dac70f3 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/lenny/tdebindings/debian/control b/debian/lenny/tdebindings/debian/control
index b1ebe7223..1f431c4d1 100644
--- a/debian/lenny/tdebindings/debian/control
+++ b/debian/lenny/tdebindings/debian/control
@@ -1,6 +1,6 @@
 Source: tdebindings-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],
  tdelibs4-trinity-dev, libtqt3-compat-headers (>= 3:3.3.5),
  ruby, ruby-dev, flex, bison,
diff --git a/debian/lenny/tdebindings/debian/rules b/debian/lenny/tdebindings/debian/rules
index f6ae5709b..c31999f17 100755
--- a/debian/lenny/tdebindings/debian/rules
+++ b/debian/lenny/tdebindings/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)
 
 ###