Merge lp:~jbicha/ubuntu/oneiric/pygoocanvas/dhpython2 into lp:ubuntu/oneiric/pygoocanvas

[Jeremy Bícha]

Trying to get python-support off my computer (this is a PiTiVi dependency)

[Didier Roche-Tolomelli (didrocks)]

Thanks Jeremy, the dh_python2 change looks good, however, it's a little bit late for this cycle for such changes I guess. I'll then track this and push into Precise.

Do have you any plan to push that to debian?
Oh also, it seems you have a leftover:
+lp_640630.patch but no patch? forgot a bzr add and to comment the chagne in debian/changelog? ;)

Can you fix this, please? Thanks again!

review: Needs Fixing

Unmerged revisions

18. By Jeremy Bícha on 2011-09-29

* Port to dh_python2
* Set X-Python-Version to 2.7

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-31 12:29:41 +0000
+++ debian/changelog	2011-09-29 06:37:55 +0000
@@ -1,3 +1,10 @@
+pygoocanvas (0.14.1-1ubuntu6) oneiric; urgency=low
+
+  * Port to dh_python2
+  * Set X-Python-Version to 2.7
+
+ -- Jeremy Bicha <[e-mail]>  Thu, 29 Sep 2011 02:11:36 -0400
+
 pygoocanvas (0.14.1-1ubuntu5) natty; urgency=low
 
   * Drop build dependency on python-gobject-doc.

=== modified file 'debian/control'
--- debian/control	2011-03-31 12:29:41 +0000
+++ debian/control	2011-09-29 06:37:55 +0000
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <[e-mail]>
 XSBC-Original-Maintainer: Jose Carlos Garcia Sogo <[e-mail]>
-Build-Depends: debhelper (>= 5), cdbs, python-all-dev (>= 2.3.5-11), python-support (>= 0.4), python-gtk2-dev (>= 2.8.4), python-gobject-dev (>= 2.11.3), libgoocanvas-dev (>= 0.14), python-cairo-dev (>= 1.8.0), xsltproc, docbook-xsl
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.90~), python-all-dev (>= 2.6.6-3~), python-gtk2-dev (>= 2.8.4), python-gobject-dev (>= 2.11.3), libgoocanvas-dev (>= 0.14), python-cairo-dev (>= 1.8.0), xsltproc, docbook-xsl, quilt
+X-Python-Version: 2.7
 Standards-Version: 3.8.4
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/pygoocanvas/ubuntu
 

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-09-29 06:37:55 +0000
@@ -0,0 +1,1 @@
+lp_640630.patch

=== removed file 'debian/pycompat'
--- debian/pycompat	2007-05-14 22:57:46 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2.4-

=== modified file 'debian/rules'
--- debian/rules	2007-05-14 22:57:46 +0000
+++ debian/rules	2011-09-29 06:37:55 +0000
@@ -1,12 +1,10 @@
 #!/usr/bin/make -f
 
 DEB_AUTO_CLEANUP_RCS            := yes
-DEB_PYTHON_SYSTEM 		:= pysupport
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 binary-install/python-pygoocanvas::
 	find debian -name "*.la" -exec rm -f {} \;
-	dh_pysupport -ppython-pygoocanvas
+	dh_python2 -ppython-pygoocanvas

=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2011-09-29 06:37:55 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)