r32022 - in /desktop/unstable/gedit/debian: changelog control control.in rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Dec 11 19:38:30 2011
New Revision: 32022

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32022
Log:
Switch to dh_python2.

Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/control
    desktop/unstable/gedit/debian/control.in
    desktop/unstable/gedit/debian/rules

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=32022&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog [utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog [utf-8] Sun Dec 11 19:38:30 2011
@@ -6,8 +6,9 @@
   [ Michael Biebl ]
   * New upstream release.
   * Fix lintian override for menu-icon-missing.
-
- -- Michael Biebl <biebl at debian.org>  Sun, 11 Dec 2011 19:34:13 +0100
+  * Switch to dh_python2.
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 11 Dec 2011 20:28:05 +0100
 
 gedit (3.2.3-1) unstable; urgency=low
 

Modified: desktop/unstable/gedit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control?rev=32022&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control [utf-8] (original)
+++ desktop/unstable/gedit/debian/control [utf-8] Sun Dec 11 19:38:30 2011
@@ -7,12 +7,11 @@
 Section: gnome
 Priority: optional
 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>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs (>= 0.4.90),
                debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
-               python-support (>= 0.3),
                intltool (>= 0.40.0),
                gnome-doc-utils (>= 0.9.0),
                gsettings-desktop-schemas-dev,
@@ -27,7 +26,7 @@
                libgtksourceview-3.0-dev (>= 3.0.0),
                libpeas-dev (>= 1.1.0),
                libx11-dev,
-               python-dev (>= 2.5),
+               python-dev (>= 2.6.6-3~),
                python-gi-dev (>= 3.0.0),
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
@@ -36,7 +35,7 @@
                      libgtk-3-doc,
                      libgtksourceview-3.0-doc
 Standards-Version: 3.9.2
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gedit/
 Homepage: http://www.gnome.org/projects/gedit/
@@ -56,7 +55,6 @@
 Recommends: zenity,
             yelp
 Breaks: gedit-plugins (<< 2.91)
-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: desktop/unstable/gedit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/control.in?rev=32022&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/control.in [utf-8] (original)
+++ desktop/unstable/gedit/debian/control.in [utf-8] Sun Dec 11 19:38:30 2011
@@ -7,7 +7,6 @@
                debhelper (>= 8),
                gnome-pkg-tools (>= 0.10),
                autotools-dev,
-               python-support (>= 0.3),
                intltool (>= 0.40.0),
                gnome-doc-utils (>= 0.9.0),
                gsettings-desktop-schemas-dev,
@@ -22,7 +21,7 @@
                libgtksourceview-3.0-dev (>= 3.0.0),
                libpeas-dev (>= 1.1.0),
                libx11-dev,
-               python-dev (>= 2.5),
+               python-dev (>= 2.6.6-3~),
                python-gi-dev (>= 3.0.0),
                gobject-introspection,
                libgirepository1.0-dev (>= 0.9.3),
@@ -31,7 +30,7 @@
                      libgtk-3-doc,
                      libgtksourceview-3.0-doc
 Standards-Version: 3.9.2
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/gedit/
 Homepage: http://www.gnome.org/projects/gedit/
@@ -51,7 +50,6 @@
 Recommends: zenity,
             yelp
 Breaks: gedit-plugins (<< 2.91)
-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: desktop/unstable/gedit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/rules?rev=32022&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/rules [utf-8] (original)
+++ desktop/unstable/gedit/debian/rules [utf-8] Sun Dec 11 19:38:30 2011
@@ -7,10 +7,12 @@
 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 -pgedit /usr/lib/gedit/plugins
 
 LDFLAGS += -Wl,-O1 -Wl,--as-needed