Package: meld
Version: 1.5.1-1
Severity: normal
Tags: patch

python-support is now officially deprecated in Debian:

http://article.gmane.org/gmane.linux.debian.devel.python/6948

Attached is a patch which converts meld to use the recommended dh_python2.
It is based on 1.5.1 in experimental.
diff -ru meld-1.5.1/debian//control.in meld-1.5.2/debian//control.in
--- meld-1.5.1/debian//control.in	2011-02-26 17:10:37.000000000 +0100
+++ meld-1.5.2/debian//control.in	2011-07-29 18:46:13.228183797 +0200
@@ -3,17 +3,16 @@
 Priority: optional
 Maintainer: Ross Burton <r...@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@
 Standards-Version: 3.9.1
 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.5
 
 Package: meld
 Architecture: all
@@ -26,7 +25,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.
diff -ru meld-1.5.1/debian//rules meld-1.5.2/debian//rules
--- meld-1.5.1/debian//rules	2010-04-21 19:17:44.000000000 +0200
+++ meld-1.5.2/debian//rules	2011-07-29 18:31:54.808183502 +0200
@@ -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

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to