[Pkg-utopia-maintainers] Bug#634346: dbus-python: Switch to dh_python2

[Barry Warsaw]

Package: dbus-python
Version: 0.84.0-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Hello.

python-support has now been officially deprecated:

http://article.gmane.org/gmane.linux.debian.devel.python/6948

In Ubuntu, we want to remove python-central and python-support from our CDs.
As part of that work, I have converted dbus-python to use dh_python2 according
to these instructions:

http://wiki.debian.org/Python/TransitionToDHPython2

I would rather not carry a delta in Ubuntu, so I'm hoping you will consider
applying the patch contained here to finish the switch in Debian.  Then we can
sync the package to Ubuntu to get rid of this dependency.

Thank you.


*** /tmp/tmpEPJN5x
In Ubuntu, the attached patch was applied to achieve the following:


  * Switch to dh_python2. (LP: #788514)


Thanks for considering the patch.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-5-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJOJIDeAAoJEBJutWOnSwa/yO8P/0stjNrJRJlk34m9yLRFgrVP
48w6QYp1RyUm7ixK0d5RjodOj7T+9seAaz1fDQff9xRNxl7pqqK8gdyje3s/7cvo
SDdvuUX08S65r+zNP2S0lbJ3lqfbtvM82CUDhwc0pmH1D50rDvXau2N576tc6OlV
JvdyWdoX9kyhN6e9IyEZ6oBWRu630ZQxzYy2BHb2KRJOVx8unF5X6uEabA8vdqmG
Try1WiVn28rgwRS/gLgvn3Qmoi9rzlpUDnAwV+MwUfCi+RIqgYC83vUTJzMMVDtE
YDFkqIBiytNnuiwf8ayNr+2LWTAYIiMjlh1KvFzq/x0Wi78DoIGN50vO93DbgOR2
lYre/a4dH4v8mKI1bsfO78q6M7ihDtC6Ko7XM3tPrhrLoMZXv/7G60+vuEKhQOEZ
2fGDEyNFAkOmkujVhKryqMzSG5XRKxMVMAvTyop4/E4bCIuaBk46LnVdWn92DHh9
cOjB5esIHCAb+8uBF+nK3xYzb0Qd7yHz0M5JiClo/g3W1cMXrP6t/R7BnZm9+I/b
5Za4srFNpTLT6chwwG4GuuiXMxSnsgPOoPOuQB4hc1LAYRVm0EkdQWhlEokgQSEl
ouLmu4ug681o51lNirQfQVWIm7GWVXC4pN6240WwZPrqHQsFeTwCr2xo2BHOV+Mp
QrouSL7XgxjVJ42ovRPP
=9TY/
-----END PGP SIGNATURE-----
-------------- next part --------------
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2011-05-25 13:06:47 +0000
+++ debian/control	2011-07-18 17:48:17 +0000
@@ -8,16 +8,15 @@
            Loic Minier <lool at dooz.org>
 Build-Depends: debhelper (>= 8),
                xmlto,
-               python-all-dev (>= 2.3.5-11),
-               python-all-dbg,
-               python-support (>= 0.3),
+               python-all-dev (>= 2.6.6-3~),
+               python-all-dbg (>= 2.6.6-3~),
                libdbus-1-dev (>= 1.4),
                libdbus-glib-1-dev (>= 0.71),
                autotools-dev
 Build-Depends-Indep: python-docutils,
                      python-epydoc (>= 3.0~beta1)
 Standards-Version: 3.9.2
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 XS-Dm-Upload-Allowed: yes
 Homepage: http://www.freedesktop.org/wiki/Software/DBusBindings#Python
 Vcs-Git: git://anonscm.debian.org/git/pkg-utopia/dbus-python.git
@@ -36,7 +35,6 @@
 Breaks: gnome-osd (<< 0.12.0),
         gajim (<< 0.11.1)
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: simple interprocess messaging system (Python interface)
  D-Bus is a message bus, used for sending messages between applications.
  Conceptually, it fits somewhere in between raw sockets and CORBA in

=== modified file 'debian/rules'
--- debian/rules	2011-05-25 13:06:47 +0000
+++ debian/rules	2011-07-18 18:33:53 +0000
@@ -3,8 +3,6 @@
 # Copyright ? 2003 Daniel Stone <daniels at debian.org>
 # Copyright ? 2006 Sjoerd Simons <sjoerd at debian.org>
 
-DEB_PYTHON_SYSTEM := pysupport
-
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -75,8 +73,10 @@
 	find debian/python-dbus-dbg -depth -empty -exec rmdir {} \;
 
 install: build install-clean $(PYVERS:%=install-%) $(PYVERS:%=dbg-install-%)
-	rm -f debian/python-dbus/usr/lib/python*/site-packages/*.la
+	rm -f debian/python-dbus/usr/lib/python*/*-packages/*.la
 	rm -rf debian/python-dbus/usr/share/doc/deleteme
+	rm -f debian/python-dbus-dbg/usr/lib/python*/*-packages/*.la
+	rm -rf debian/python-dbus-dbg/usr/share/doc/deleteme
 	# compare installed .pc and .h, asserting that the ones all versions
 	# wanted are the same as what we ended up with
 	for v in $(PYVERS); do \
@@ -133,7 +133,7 @@
 	dh_link -s
 	dh_compress -s -X.py -X.js
 	dh_fixperms -s
-	dh_pysupport -s
+	dh_python2 -s
 	dh_installdeb -s
 	dh_shlibdeps -s
 	dh_gencontrol -s