Bug#635140: libproxy: Switch to dh_python2

[Barry Warsaw]

Package: libproxy
Version: 0.3.1-2
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

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

python-support is now officially deprecated:

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

In Ubuntu, we are removing python-support from our CDs.  As part of this work
I have converted the libproxy package to use dh_python2, according to these
guidelines:

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

Please consider applying this change to Debian.  Thanks!

*** /tmp/tmpLvC7Yy
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-6-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)

iQIcBAEBCAAGBQJOKgNrAAoJEBJutWOnSwa/ldMP/3GhtL6a4WuuNyycYoHUX+j4
9zH4gObC4Sqb26kjd08TdJwKZtHAQzdUTMghnzH9r6ZTltO+bz8Jpx4dyILzwP/U
gdI1vL88U2+bUdN5vqD+P/jOZrNgeZfwJLAlQvOzJCK8pYpgsi/O0+iizv0ECn6V
kDXakl3YSo1NTrCng5qS5fClRcxq4h4dcyy20x/gknLstfL89/6uFSxGv+AI9abQ
QkHAJh/S2i+c9j3yy980jAmEaxSulr+uUC0HiR+wAem34eLSxwLmwqsItZLmbkPb
aWSLHyaJU7OoYgp2SOcFJBPkaSZHt0uwQU2MhM1H+0SMefQJrxQZK0Wz+hmHeE5X
P6m+Wsh98WicKh1aPo2k24DTHH/MN1nJ4Ph+sJkdd3veDLajzkLpPX4etZU2bska
YTgFk55DzECnDBAuQeeSX0RuSwzkAPCI/MpBhJ2yHEU2ikq6U8ymuawoaZr51XUe
Ig1LVRCyyC/xT6d8EBBVu7hb9q2V4ymB+aQ45k0//aAgNgY+ObRlxtl2E9mvf+dY
CI33dDjjZSRrdE+7vYZ+U4ieIxfa8I2Q1/kZZMrZcBL5QaL4NQiiuEfXngMV7zZj
kwr2lt88DBbB6gjWIdguC1jwu+fOmpIJl8Y1iuFos3Ksy1MEwpdHbnDj8+Dif2Ku
XfRzLR6+VwvW8ucFn++L
=ECXt
-----END PGP SIGNATURE-----
-------------- next part --------------
=== modified file 'debian/changelog'

=== modified file 'debian/control.in'
--- debian/control.in	2011-01-24 17:37:44 +0000
+++ debian/control.in	2011-07-22 23:09:02 +0000
@@ -4,12 +4,11 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 5),
                gnome-pkg-tools,
                autotools-dev,
-               python-all-dev,
-               python-support,
+               python-all-dev (>= 2.6.6-3~),
                network-manager-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
                libdbus-1-dev,
                kdelibs5-dev [!armel],
@@ -19,7 +18,7 @@
                gconf2,
                libxmu-dev
 Standards-Version: 3.8.3
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/libproxy
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-gnome/packages/unstable/libproxy
 Homepage: http://code.google.com/p/libproxy/
@@ -62,7 +61,6 @@
 Package: python-libproxy
 Architecture: all
 Section: python
-XB-Python-Version: ${python:Versions}
 Depends: ${python:Depends},
          ${misc:Depends},
          libproxy0 (>= ${source:Version})

=== modified file 'debian/rules'
--- debian/rules	2010-04-13 16:08:18 +0000
+++ debian/rules	2011-07-22 23:09:02 +0000
@@ -14,7 +14,7 @@
 DEB_DH_SHLIBDEPS_ARGS_$(libproxy) := -Xmodules
 
 binary-install/python-libproxy::
-	dh_pysupport -p$(cdbs_curpkg)
+	dh_python2 -p$(cdbs_curpkg)
 
 binary-install/$(libproxy)::
 	rm debian/$(libproxy)/usr/lib/libproxy/*/modules/wpad_dnsdevolution.so