Package: gimp
Version: 2.6.11-2
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu oneiric ubuntu-patch



*** /tmp/tmpl3AkFZ
In Ubuntu, the attached patch was applied to achieve the following:

python-support has been deprecated, but the MBF hasn't happened yet, see 
http://article.gmane.org/gmane.linux.debian.devel.python/6948 for more 
information

Feel free to use X-Python-Version: >= 2.3 if you feel it appropriate

  * Convert to dh_python2 (LP: #847514)
    - update debian/control
    - update debian/rules 


Thanks for considering the patch.


-- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 
'oneiric-proposed'), (500, 'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-10-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gimp-2.6.11/debian/changelog gimp-2.6.11/debian/changelog
diff -Nru gimp-2.6.11/debian/control gimp-2.6.11/debian/control
--- gimp-2.6.11/debian/control	2011-05-17 11:27:03.000000000 -0500
+++ gimp-2.6.11/debian/control	2011-09-11 22:31:27.000000000 -0500
@@ -4,14 +4,14 @@
 Maintainer: Ubuntu Desktop Team <[email protected]>
 XSBC-Original-Maintainer: Ari Pollak <[email protected]>
 Standards-Version: 3.8.2
-Build-Depends: debhelper (>= 5.0.53), cdbs (>= 0.4.37), autotools-dev,
+Build-Depends: debhelper (>= 5.0.53), cdbs (>= 0.4.90~), autotools-dev,
  patchutils, gettext, intltool (>= 0.36.3), libx11-dev, libice-dev, libsm-dev,
  libxmu-dev, libxpm-dev, libxt-dev,
  libaa1-dev, libgtk2.0-dev (>= 2.19.1), libglib2.0-dev (>= 2.16.0),
  libpango1.0-dev (>= 1.12.2), libwebkitgtk-dev, libjpeg-dev,
  libart-2.0-dev, libpng12-dev | libpng-dev,
- zlib1g-dev, libtiff4-dev, python-dev (>= 2.3.5), python-gtk2-dev (>= 2.10.4),
- python-support (>= 0.4), libexif-dev (>= 0.6.15), libmng-dev,
+ zlib1g-dev, libtiff4-dev, python-dev (>= 2.6.6-3~), python-gtk2-dev (>= 2.10.4),
+ libexif-dev (>= 0.6.15), libmng-dev,
  librsvg2-dev (>= 2.7.2-2), libfontconfig1-dev (>= 2.2.0),
  libwmf-dev (>= 0.2.8-1.1), libfreetype6-dev (>= 2.2),
  libpoppler-glib-dev (>= 0.3.1),
@@ -19,6 +19,7 @@
  libdbus-glib-1-dev (>= 0.70),
  liblcms1-dev | liblcms-dev, libgegl-0.0-dev, libbabl-0.0-0-dev
 #Build-Conflicts: libgimp2.0
+X-Python-Version: >=2.6
 XS-Vcs-Git: git://git.debian.org/git/collab-maint/gimp.git
 XS-Vcs-Browser: http://git.debian.org/?p=collab-maint/gimp.git
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gimp/ubuntu
diff -Nru gimp-2.6.11/debian/rules gimp-2.6.11/debian/rules
--- gimp-2.6.11/debian/rules	2011-05-17 11:27:03.000000000 -0500
+++ gimp-2.6.11/debian/rules	2011-09-11 22:32:09.000000000 -0500
@@ -51,4 +51,4 @@
 	dh_movefiles
 
 binary-install/gimp::
-	dh_pysupport -pgimp /usr/lib/gimp/2.0/python
+	dh_python2 -pgimp /usr/lib/gimp/2.0/python

Reply via email to