Bug#632755: gnome-doc-utils: python-support is now officially deprecated, use dh_python2 instead

[Barry Warsaw]

Package: gnome-doc-utils
Version: 0.20.6-1
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://lists.debian.org/debian-python/2011/06/msg00136.html

As part of Ubuntu bug 788514, we have already started to transition packages
on our CD to dh_python2.

https://bugs.launchpad.net/debian/+source/argparse/+bug/788514

We hope you will consider this patch to switch the gnome-doc-utils package to
use dh_python2.

Thank you!


*** /tmp/tmpzF7Mrr
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: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-8-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)

iQIcBAEBCAAGBQJOE1nWAAoJEBJutWOnSwa/fS4QAJtc3SL8SDl7AXfxxu5pd+l6
w3rX/Onhub/FjwjFDxtm9fhCGXus6P/WffZSUL05W1FN0UQD4wJV0oAi8j8efrJ/
0lkBGnRTzEUE3x0lQjMTvFib60HQjXkKu8o5kHhyK2LRLDNb174ei30nd6MTigBC
avSd01xvapo8UsLPEgHdk9kZ7iSefikcuFIdBZJFFDMlFCLKIclP3Z9RGvWcYOzR
GxVmd3qMzAaMj30m3EBLw5hnjGgEzCVF6AoZoONj10KKqzYrsfdN2D52kD0q7CAt
b9SaL69L17ZW4KPYS4J4TfcdPVb9r50DDCkEmz+dB7aLZ8f5REnGtufnlBxUmKyy
Lws56wdYjs2xyl5tYq66bIqsZfk8zY6EjLR/wz3INuncDeR9/PiARDPzJY5HP8hw
YP3TUCAkGQHibkAuv7FC04G8s1WgQ8ipQBMmBilxQI2DohtLAAaxCc5nfni8Gn8o
M8JokD6u7HWTl9Y9MklWszHvdFrgJX1XTtsild37ZChDUf6kVlF3u0fsUMwykwEH
ahMi9Br8YgzLIohmVPitSAxMLEIvdlg2U0lkqBjwbS7ccND3arJnppkLfy6cRCLH
7fnKmC5957ukmbvBNnB9Z0nKDiDIvS3pFh0QjuvR/1FRWiafs3kKGYpRKcjRGk4z
HYUB0PcBJDO95+L6upTh
=ND6Y
-----END PGP SIGNATURE-----
-------------- next part --------------
=== modified file 'debian/changelog'

=== modified file 'debian/control'
--- debian/control	2011-06-23 22:23:59 +0000
+++ debian/control	2011-07-05 18:27:35 +0000
@@ -6,7 +6,8 @@
 Source: gnome-doc-utils
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dr?ge <slomo at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 8),

=== modified file 'debian/control.in'
--- debian/control.in	2011-06-23 22:23:59 +0000
+++ debian/control.in	2011-07-05 18:27:35 +0000
@@ -1,23 +1,23 @@
 Source: gnome-doc-utils
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
+Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 8),
                gnome-pkg-tools (>= 0.10)
 Build-Depends-Indep: libxml2-dev (>= 2.6.12),
                      libxslt1-dev (>= 1.1.8),
                      intltool (>= 0.35.0),
-                     python,
+                     python (>= 2.6.6-3~),
                      xsltproc,
                      libxml2-utils,
                      pkg-config,
-                     python-support (>= 0.3),
                      python-libxml2,
                      scrollkeeper
 Standards-Version: 3.9.2
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-doc-utils
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-doc-utils
 
@@ -28,7 +28,6 @@
          python-libxml2,
          libxml2-utils,
          xsltproc
-XB-Python-Version: ${python:Versions}
 Description: collection of documentation utilities for the GNOME project
  gnome-doc-utils is a collection of documentation utilities for the GNOME
  project.  Notably, it contains utilities for building documentation and

=== modified file 'debian/rules'
--- debian/rules	2011-06-23 22:23:59 +0000
+++ debian/rules	2011-07-05 18:27:35 +0000
@@ -9,5 +9,5 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper
 
 binary-post-install/gnome-doc-utils::
-	dh_pysupport -pgnome-doc-utils /usr/share/xml2po
+	dh_python2 -pgnome-doc-utils /usr/share/xml2po