Bug#630540: Convert alacarte to dh_python2

[Barry Warsaw]

Package: alacarte
Version: 0.13.2-2
Severity: wishlist
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

In Ubuntu 11.10, we are eliminating python-support and python-central from the
Python packages on our CDs:

    https://wiki.ubuntu.com/BarryWarsaw/PythonHelpers

As part of the process of proofreading the instructions for converting
python-support packages:

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

I tested these instructions with alacarte in Ubuntu.  Since we'd always prefer
to push these changes upstream, I am providing this patch to alacarte.  I hope
as the package maintainer, you decide to accept the change.  We have not yet
gained consensus to deprecate python-support in Debian, but we're getting
closer.

    http://lists.debian.org/debian-python/2011/06/msg00074.html

Thanks for your consideration.

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


  * debian/control.in, debian/rules:
    - 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
-------------- next part --------------
=== modified file 'debian/control.in'
--- debian/control.in	2011-05-18 11:43:31 +0000
+++ debian/control.in	2011-06-14 22:12:56 +0000
@@ -4,18 +4,17 @@
 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 (>= 0.4.41),
+Build-Depends: cdbs (>= 0.4.90~),
                autotools-dev,
                debhelper (>= 5.0.37.1),
-               python-support (>= 0.7),
-               python (>= 2.4),
+               python (>= 2.6.6-3~),
                gnome-pkg-tools
 Build-Depends-Indep: intltool (>= 0.40.0),
                      gettext,
                      libgnome-menu-dev (>= 2.27.92),
                      python-gtk2 (>= 2.13.0),
                      python-gobject (>= 2.15.1)
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 Standards-Version: 3.8.1
 
 Package: alacarte
@@ -30,7 +29,6 @@
 Replaces: smeg
 Provides: smeg
 Conflicts: smeg (<< 0.8-0ubuntu1)
-XB-Python-Version: ${python:Versions}
 Description: easy GNOME menu editing tool
  Alacarte is an easy-to-use menu editor for GNOME that can add 
  and edit new entries and menus. It works with the freedesktop.org 

=== modified file 'debian/rules'
--- debian/rules	2011-05-18 11:43:31 +0000
+++ debian/rules	2011-06-14 22:12:56 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 DEB_INSTALL_MANPAGES_alacarte := debian/alacarte.1
+DEB_PYTHON2_MODULE_PACKAGES = alacarte
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
@@ -12,6 +13,6 @@
 DEB_MAKE_EXTRA_ARGS += pythondir=/usr/share/alacarte
 
 install/alacarte::
-	dh_pysupport
+	dh_python2
 	echo 'X-Ubuntu-Gettext-Domain=alacarte' >> debian/alacarte/usr/share/applications/alacarte.desktop
 	cd po; intltool-update -p --gettext-package=alacarte