Bug#631392: python-debian: convert to dh_python2?

[Colin Watson]

Package: python-debian
Version: 0.1.20
Severity: wishlist
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch oneiric

In Ubuntu 11.10, we'd like to eliminate python-support and
python-central from the Python packages on our CDs, and consolidate on
dh_python2:

  https://wiki.ubuntu.com/BarryWarsaw/PythonHelpers
  http://wiki.debian.org/Python/PythonSupportToDHPython2

We don't yet have a consensus on deprecating python-support in Debian.
Nevertheless, dh_python2 is usable as of squeeze.  Would you be willing
to apply this patch to switch to it?

diff --git a/debian/control b/debian/control
index e8ad071..1d5b984 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,11 @@ Uploaders: Adeodato Simó <dato at net.com.org.es>,
  Reinhard Tartler <siretart at tauware.de>,
  Stefano Zacchiroli <zack at debian.org>,
  John Wright <jsw at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python, python-setuptools, python-chardet
-Build-Depends-Indep: python-support (>= 0.3)
+Build-Depends: debhelper (>= 5.0.37.2), python (>= 2.6.6-3~), python-setuptools, python-chardet
 Standards-Version: 3.8.4
 Vcs-Browser: http://git.debian.org/?p=pkg-python-debian/python-debian.git
 Vcs-Git: git://git.debian.org/git/pkg-python-debian/python-debian.git
+X-Python-Version: >= 2.5
 
 Package: python-debian
 Architecture: all
@@ -22,6 +22,7 @@ Suggests: gpgv
 Provides: python-deb822
 Conflicts: python-deb822
 Replaces: python-deb822
+Breaks: ${python:Breaks}
 Description: Python modules to work with Debian-related data formats
  This package provides Python modules that abstract many formats of Debian
  related files. Currently handled are:
diff --git a/debian/pyversions b/debian/pyversions
deleted file mode 100644
index b3dc41e..0000000
--- a/debian/pyversions
+++ /dev/null
@@ -1 +0,0 @@
-2.5-
diff --git a/debian/rules b/debian/rules
index 740b153..6a11aeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ install: build
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
-	python setup.py install --root="$(CURDIR)/debian/python-debian" --no-compile
+	python setup.py install --root="$(CURDIR)/debian/python-debian" --no-compile --install-layout=deb
 
 
 # Build architecture-independent files here.
@@ -66,7 +66,7 @@ binary-indep: build install
 #	dh_install
 	dh_compress -Xexamples
 	dh_fixperms
-	dh_pysupport -d
+	dh_python2
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]