[python-debian/master] Use dh_python2 instead of python-support.

[John Wright]

Thanks to Colin Watson for the patch.

Closes: #631392
---
 debian/changelog  |    7 +++++--
 debian/control    |    4 ++--
 debian/pyversions |    1 -
 debian/rules      |    4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 debian/pyversions

diff --git a/debian/changelog b/debian/changelog
index f4cd69d..661499d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-python-debian (0.1.21) UNRELEASED; urgency=low
+python-debian (0.1.22) UNRELEASED; urgency=low
 
   [ Tshepang Lekhonkhobe ]
   * test_changelog.py: Close open files. (Closes: #625672)
@@ -22,7 +22,10 @@ python-debian (0.1.21) UNRELEASED; urgency=low
   * deb822.Deb822.gpg_info takes an optional keyrings argument.
   * deb822: Don't interpret lines starting with '#'. (Closes: #632306)
 
- -- John Wright <jsw at debian.org>  Sat, 02 Jul 2011 23:20:27 -0700
+  [ Colin Watson ]
+  * Use dh_python2 instead of python-support. (Closes: #631392)
+
+ -- John Wright <jsw at debian.org>  Sat, 09 Jul 2011 23:20:11 -0700
 
 python-debian (0.1.20) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e8ad071..9132d4a 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
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
-- 
1.7.2.5