r35264 - in /packages/unstable/alacarte/debian: changelog control control.in rules

[laney at users.alioth.debian.org]

Author: laney
Date: Mon Jun  4 12:05:41 2012
New Revision: 35264

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

Modified:
    packages/unstable/alacarte/debian/changelog
    packages/unstable/alacarte/debian/control
    packages/unstable/alacarte/debian/control.in
    packages/unstable/alacarte/debian/rules

Modified: packages/unstable/alacarte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/changelog?rev=35264&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/changelog [utf-8] (original)
+++ packages/unstable/alacarte/debian/changelog [utf-8] Mon Jun  4 12:05:41 2012
@@ -1,7 +1,11 @@
 alacarte (0.13.2-4) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Replace python-gobject by python-gobject-2.
   * Update repository URL.
+
+  [ Iain Lane ]
+  * Switch to dh_python2
 
  -- Josselin Mouette <joss at debian.org>  Thu, 24 Nov 2011 21:20:52 +0100
 

Modified: packages/unstable/alacarte/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/control?rev=35264&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/control [utf-8] (original)
+++ packages/unstable/alacarte/debian/control [utf-8] Mon Jun  4 12:05:41 2012
@@ -8,18 +8,18 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs (>= 0.4.41),
+Build-Depends: cdbs (>= 0.4.90~),
                autotools-dev,
                debhelper (>= 8),
                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 (>= 2.15.1)
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 Standards-Version: 3.9.2
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/alacarte
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/alacarte
@@ -33,7 +33,6 @@
          gnome-menus (>= 2.27.92),
          python-gobject-2 (>= 2.15.1)
 Recommends: gnome-panel
-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: packages/unstable/alacarte/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/control.in?rev=35264&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/control.in [utf-8] (original)
+++ packages/unstable/alacarte/debian/control.in [utf-8] Mon Jun  4 12:05:41 2012
@@ -3,18 +3,18 @@
 Priority: optional
 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 (>= 8),
                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 (>= 2.15.1)
-XS-Python-Version: >= 2.4
+X-Python-Version: >= 2.4
 Standards-Version: 3.9.2
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/packages/unstable/alacarte
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/alacarte
@@ -28,7 +28,6 @@
          gnome-menus (>= 2.27.92),
          python-gobject-2 (>= 2.15.1)
 Recommends: gnome-panel
-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: packages/unstable/alacarte/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/alacarte/debian/rules?rev=35264&op=diff
==============================================================================
--- packages/unstable/alacarte/debian/rules [utf-8] (original)
+++ packages/unstable/alacarte/debian/rules [utf-8] Mon Jun  4 12:05:41 2012
@@ -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,4 +13,4 @@
 DEB_MAKE_EXTRA_ARGS += pythondir=/usr/share/alacarte
 
 install/alacarte::
-	dh_pysupport
+	dh_python2 -p$(cdbs_curpkg)