r28773 - in /packages/experimental/meld/debian: changelog control control.in rules

[rbalint-guest at users.alioth.debian.org]

Author: rbalint-guest
Date: Thu Jul  7 23:43:26 2011
New Revision: 28773

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28773
Log:
transition from dh_pysupport to dh_python2

Modified:
    packages/experimental/meld/debian/changelog
    packages/experimental/meld/debian/control
    packages/experimental/meld/debian/control.in
    packages/experimental/meld/debian/rules

Modified: packages/experimental/meld/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/changelog?rev=28773&op=diff
==============================================================================
--- packages/experimental/meld/debian/changelog [utf-8] (original)
+++ packages/experimental/meld/debian/changelog [utf-8] Thu Jul  7 23:43:26 2011
@@ -4,6 +4,7 @@
   * debian/control.in:
     - Standards-Version is 3.9.2, no changes needed.
     - Allow DM uploads
+  * transition from dh_pysupport to dh_python2
 
   [ Josselin Mouette ]
   * Add missing dependency on patch. Closes: #629824.

Modified: packages/experimental/meld/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/control?rev=28773&op=diff
==============================================================================
--- packages/experimental/meld/debian/control [utf-8] (original)
+++ packages/experimental/meld/debian/control [utf-8] Thu Jul  7 23:43:26 2011
@@ -8,10 +8,9 @@
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
 Build-Depends: debhelper (>= 5),
-               cdbs,
+               cdbs (>= 0.4.90~),
                gnome-pkg-tools
-Build-Depends-Indep: python,
-                     python-support (>= 0.4.0),
+Build-Depends-Indep: python (>=2.6.6-3~),
                      intltool,
                      scrollkeeper
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Balint Reczey <balint at balintreczey.hu>
@@ -19,7 +18,7 @@
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/meld
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
 
 Package: meld
 Architecture: all
@@ -33,7 +32,6 @@
             python-gnome2,
             python-gconf,
             python-gtksourceview2 (>= 2.4)
-XB-Python-Version: ${python:Versions}
 Description: graphical tool to diff and merge files
  Meld is a tool which allows the user to see the changes in, and merge between,
  either two files, two directories, or two files with a common ancestor.

Modified: packages/experimental/meld/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/control.in?rev=28773&op=diff
==============================================================================
--- packages/experimental/meld/debian/control.in [utf-8] (original)
+++ packages/experimental/meld/debian/control.in [utf-8] Thu Jul  7 23:43:26 2011
@@ -3,10 +3,9 @@
 Priority: optional
 Maintainer: Ross Burton <ross at debian.org>
 Build-Depends: debhelper (>= 5),
-               cdbs,
+               cdbs (>= 0.4.90~),
                gnome-pkg-tools
-Build-Depends-Indep: python,
-                     python-support (>= 0.4.0),
+Build-Depends-Indep: python (>=2.6.6-3~),
                      intltool,
                      scrollkeeper
 Uploaders: @GNOME_TEAM@, Balint Reczey <balint at balintreczey.hu>
@@ -14,7 +13,7 @@
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/meld
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/meld/
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.6
 
 Package: meld
 Architecture: all
@@ -28,7 +27,6 @@
             python-gnome2,
             python-gconf,
             python-gtksourceview2 (>= 2.4)
-XB-Python-Version: ${python:Versions}
 Description: graphical tool to diff and merge files
  Meld is a tool which allows the user to see the changes in, and merge between,
  either two files, two directories, or two files with a common ancestor.

Modified: packages/experimental/meld/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/meld/debian/rules?rev=28773&op=diff
==============================================================================
--- packages/experimental/meld/debian/rules [utf-8] (original)
+++ packages/experimental/meld/debian/rules [utf-8] Thu Jul  7 23:43:26 2011
@@ -13,7 +13,7 @@
 DEB_MAKE_INSTALL_TARGET := DESTDIR=$(CURDIR)/debian/meld install
 
 binary-install/meld::
-	dh_pysupport -p$(cdbs_curpkg)
+	dh_python2 -p$(cdbs_curpkg)
 
 binary-post-install/meld::
 	rm -rf debian/$(cdbs_curpkg)/usr/share/application-registry