[Python-modules-team] Bug#637408: pycairo: please replace deprecated python-support with dh_python2

[Steve Langasek]

Package: pycairo
Version: 1.8.8-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

Hi folks,

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 for the Ubuntu 11.10
release.  As part of that work, we have converted pycairo to dh_python2
according to these guidelines:

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

Please consider applying the attached patch in Debian, to complete the
migration there as well.

Note that an additional line is needed in debian/rules to work around cdbs
wrongly passing --install-purelib=/usr/lib/python$buildver/dist-packages to
setup.py.  From the Ubuntu changelog:

  * set DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL to work around a cdbs bug that
    went unnoticed with python-support.

I will be submitting a bug against cdbs for this issue soon.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
=== modified file 'debian/control'
--- debian/control	2010-01-24 15:39:31 +0000
+++ debian/control	2011-08-10 23:56:27 +0000
@@ -3,15 +3,15 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Dave Beckett <dajobe at debian.org>, Torsten Marek <shlomme at debian.org>
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.49), python-all-dev (>= 2.5.4-1~), python-all-dbg (>= 2.5.4-1~), python-support (>= 0.9.0), libcairo2-dev (>= 1.8.6), python-sphinx
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.90~), python-all-dev (>= 2.6.6-3~), python-all-dbg (>= 2.5.4-1~), libcairo2-dev (>= 1.8.6), python-sphinx
 Standards-Version: 3.8.3
 Homepage: http://cairographics.org/pycairo/
+X-Python-Version: >= 2.5
 
 Package: python-cairo
 Architecture: any
 Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: Python bindings for the Cairo vector graphics library
  This package contains modules that allow you to use the Cairo vector
  graphics library in Python programs.
@@ -22,7 +23,6 @@
 Architecture: any
 Depends: python-cairo (= ${binary:Version}), python-dbg, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: Python bindings for the Cairo vector graphics library (debug extension)
  This package contains modules that allow you to use the cairo vector
  graphics library in Python programs.

=== removed file 'debian/pyversions'
--- debian/pyversions	2009-03-22 13:37:43 +0000
+++ debian/pyversions	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
-2.5-

=== modified file 'debian/rules'
--- debian/rules	2010-01-24 15:39:31 +0000
+++ debian/rules	2011-08-10 23:43:39 +0000
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
-DEB_PYTHON_SYSTEM=pysupport
 DEB_COMPRESS_EXCLUDE= .js .inv
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-DEB_PYTHON_INSTALL_ARGS_ALL += --install-layout=deb
+DEB_PYTHON_DISTUTILS_INSTALLDIR_SKEL = /usr/lib/@PYTHONBINARY@/dist-packages/
 
 install/python-cairo-dev::
 	python setup.py install_data --install-dir=$(CURDIR)/debian/tmp/usr