Merge lp:~mvo/python-distutils-extra/mvo into lp:python-distutils-extra

[Michael Vogt]

Update to use dh_python2, dh7 and a more current dep5 format.

Note that this will break compatbility with lucid targets but should work from maverick onwards.

[Martin Pitt (pitti)]

Thanks! Fine for me, pysupport dropped the /opt stuff anyway, so dh_python2 needs to grow support for this. Didier ack'ed this.

This needs to add back the conditional support for "--with langpack", presumably with a file test.

review: Needs Fixing

=== modified file 'debian/local/python-mkdebian'
--- debian/local/python-mkdebian	2011-11-08 15:51:04 +0000
+++ debian/local/python-mkdebian	2012-01-03 14:01:26 +0000
@@ -55,28 +55,26 @@
 
     if not os.path.exists('debian/compat'):
         f = open('debian/compat', 'w')
-        f.write('6\n')
+        f.write('8\n')
         f.close()
 
     prefix_string = ''
     if prefix:
-        prefix_string = "DEB_PYTHON_PREFIX_ARG := %s" % prefix
+        prefix_string = '''override_dh_auto_install:
+	dh_auto_install -- --install-scripts=%s \
+                --install-lib=%s
+
+override_dh_python2:
+	dh_python2 %s
+''' % (prefix, prefix, prefix)
+
     if not os.path.exists('debian/rules') or force_rules:
         f = open('debian/rules', 'w')
         f.write('''#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM := pysupport
+%%:
+	dh $@ --with python2
+
 %s
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-# langpack.mk is relevant on Ubuntu only, not Debian; it does not matter if it's missing
--include /usr/share/cdbs/1/rules/langpack.mk
-
-common-binary-post-install-arch::
-	-dh_icons -a
-
-common-binary-post-install-indep::
-	-dh_icons -i
 ''' % prefix_string)
         f.close()
         os.chmod('debian/rules', 0755)
@@ -158,8 +156,7 @@
         'Source': egg['Name'],
         'Build-Depends': '''cdbs (>= 0.4.43),
  debhelper (>= 6),
- python,
- python-support (>= 0.6.4),
+ python (>= 2.6.6-3~),
  python-distutils-extra (>= 2.10)%s''' % bdeps,
         'Maintainer': author,
         'Package': egg['Name'],