Merge lp:~barry/gedit/bug-788514 into lp:~ubuntu-desktop/gedit/ubuntu

[Barry Warsaw]

[Barry Warsaw (barry)]

Matches uploaded version to switch to dh_python2. LP: #788514

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-27 13:11:09 +0000
+++ debian/changelog	2011-07-06 18:11:20 +0000
@@ -1,3 +1,18 @@
+gedit (3.1.1-0ubuntu4) oneiric; urgency=low
+
+  * debian/rules
+    - Call dh_python2 twice to build for both public and private
+      modules.
+
+ -- Barry Warsaw <[e-mail]>  Tue, 28 Jun 2011 04:36:52 +0100
+
+gedit (3.1.1-0ubuntu3) oneiric; urgency=low
+
+  * debian/control.in, debian/rules
+    - Convert to dh_python2.  (LP: #788514)
+
+ -- Barry Warsaw <[e-mail]>  Mon, 27 Jun 2011 16:30:43 +0100
+
 gedit (3.1.1-0ubuntu2) oneiric; urgency=low
 
   * debian/patches/07_unity_quicklist.patch: Add Unity static quicklist
 
=== modified file 'debian/control'
--- debian/control	2011-06-27 09:32:21 +0000
+++ debian/control	2011-07-06 18:11:20 +0000
@@ -8,13 +8,12 @@
 Priority: optional
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
-Uploaders: Debian GNOME Maintainers <[e-mail]>, Josselin Mouette <[e-mail]>
-Build-Depends: cdbs (>= 0.4.41),
+Uploaders: Debian GNOME Maintainers <[e-mail]>
+Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                gnome-common,
-               python-support (>= 0.3),
                intltool (>= 0.40.0),
                gnome-doc-utils (>= 0.9.0),
                gsettings-desktop-schemas-dev,
@@ -28,7 +27,7 @@
                libgtksourceview-3.0-dev (>= 3.0.0),
                libpeas-dev (>= 0.7.3),
                libx11-dev,
-               python-dev (>= 2.5),
+               python-dev (>= 2.6.6-3~),
                python-gobject-dev (>= 2.28),
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
@@ -38,7 +37,7 @@
                      libgtk-3-doc,
                      libgtksourceview-3.0-doc
 Standards-Version: 3.9.0
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gedit/ubuntu
 Homepage: http://www.gnome.org/projects/gedit/
 
@@ -60,7 +59,6 @@
 Recommends: gir1.2-gtksource-3.0,
             zenity,
             yelp
-XB-Python-Version: ${python:Versions}
 Description: official text editor of the GNOME desktop environment
  gedit is a text editor which supports most standard editor features,
  extending this basic functionality with other features not usually
 
=== modified file 'debian/control.in'
--- debian/control.in	2011-06-27 09:32:21 +0000
+++ debian/control.in	2011-07-06 18:11:20 +0000
@@ -4,12 +4,11 @@
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs (>= 0.4.41),
+Build-Depends: cdbs (>= 0.4.90~),
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
                gnome-common,
-               python-support (>= 0.3),
                intltool (>= 0.40.0),
                gnome-doc-utils (>= 0.9.0),
                gsettings-desktop-schemas-dev,
@@ -23,7 +22,7 @@
                libgtksourceview-3.0-dev (>= 3.0.0),
                libpeas-dev (>= 0.7.3),
                libx11-dev,
-               python-dev (>= 2.5),
+               python-dev (>= 2.6.6-3~),
                python-gobject-dev (>= 2.28),
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
@@ -33,7 +32,7 @@
                      libgtk-3-doc,
                      libgtksourceview-3.0-doc
 Standards-Version: 3.9.0
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gedit/ubuntu
 Homepage: http://www.gnome.org/projects/gedit/
 
@@ -55,7 +54,6 @@
 Recommends: gir1.2-gtksource-3.0,
             zenity,
             yelp
-XB-Python-Version: ${python:Versions}
 Description: official text editor of the GNOME desktop environment
  gedit is a text editor which supports most standard editor features,
  extending this basic functionality with other features not usually
 
=== modified file 'debian/rules'
--- debian/rules	2011-05-04 10:36:14 +0000
+++ debian/rules	2011-07-06 18:11:20 +0000
@@ -8,10 +8,13 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+DEB_PYTHON2_MODULE_PACKAGES = gedit
+
 binary-install/gedit::
 	cd debian/gedit/usr/share/gedit && mv gedit-bugreport.sh gedit-bugreport
 	chmod 755 debian/gedit/usr/share/bug/gedit/script
-	dh_pysupport -pgedit /usr/lib/gedit/plugins
+	dh_python2
+	dh_python2 -pgedit /usr/lib/gedit/plugins
 
 binary-predeb/gedit::
 	dh_girepository -ldebian/tmp/usr/share/gedit/gir-1.0 /usr/lib/gedit/girepository-1.0