Merge lp:~laney/gimp/gimp-2.6.11-2-merge into lp:~ubuntu-desktop/gimp/ubuntu

[Iain Lane]

Merge.

I opted to drop some unnecessary changes to minimise the delta to Debian — just the wrapping of control fields and adding of ${misc:Depends}.

[Daniel Holbach (dholbach)]

Could it be that you forgot to 'bzr add' the gold patch?

[Iain Lane (laney)]

Looks like it. I just pushed an update but I don't have time to test build. I'll confirm later if you don't review it.

[lp:~laney/gimp/gimp-2.6.11-2-merge]

25. By Iain Lane on 2011-05-17

Add forgotten 07_binutils-gold.patch

[Daniel Holbach (dholbach)]

It might be worth to use dh-translations at some stage, but apart from that it looks good. I'll wait for my build to succeed before I upload it though.

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-07 20:17:48 +0000
+++ debian/changelog	2011-05-17 16:24:30 +0000
@@ -1,3 +1,31 @@
+gimp (2.6.11-2ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian unstable, remaining changes:
+    - debian/patches/02_help-message.patch,
+      debian/patches/03_gimp.desktop.in.in.patch:
+      + Update some strings for Ubuntu
+    - debian/control:
+      + Update description
+      + Change build-depends from libwebkit-dev to libwebkitgtk-dev
+    - debian/rules:
+      + Set gettext domain and update translation templates
+
+ -- Iain Lane <[e-mail]>  Tue, 03 May 2011 21:54:00 +0100
+
+gimp (2.6.11-2) unstable; urgency=high
+
+  * Fix security issues when reading plugin configuration files and PSP files
+    (CVE-2010-4540, CVE-2010-4541, CVE-2010-4542, CVE-2010-4543)
+    (Closes: #608497)
+    - patches imported from Ubuntu
+  * Drop libgimp2.0's recommendation on gimp (Closes: #600226)
+  * remove .la files, even from python modules (Closes: #621230)
+  * Remove HAL support (Closes: #613201)
+  * 07_binutils-gold.patch:
+    - Allow package to build with binutils-gold
+
+ -- Ari Pollak <[e-mail]>  Tue, 12 Apr 2011 19:04:28 -0400
+
 gimp (2.6.11-1ubuntu6) natty; urgency=low
 
   * SECURITY UPDATE: denial of service and possible code execution via
@@ -1871,7 +1899,7 @@
     so I'm satisfied. Closes: #52634
 
  -- Ben Gertzfield <[e-mail]>  Thu, 10 Aug 2000 11:15:10 -0700
-  
+
 gimp1.1 (1.1.19-1) unstable; urgency=low
 
   * New upstream version. Please don't let there be any i18n breakage
@@ -2371,4 +2399,3 @@
 
  -- Rob Browning <[e-mail]>  Mon, 27 Jan 1997 01:04:31 -0600
 
-

=== modified file 'debian/control'
--- debian/control	2011-01-27 08:29:24 +0000
+++ debian/control	2011-05-17 16:24:30 +0000
@@ -3,59 +3,32 @@
 Section: graphics
 Maintainer: Ubuntu Desktop Team <[e-mail]>
 XSBC-Original-Maintainer: Ari Pollak <[e-mail]>
-Standards-Version: 3.9.1
-Build-Depends: debhelper (>= 5.0.53),
-               dh-autoreconf,
-               cdbs (>= 0.4.37),
-               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,
-               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),
-               libasound2-dev (>= 1.0.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
-               libdbus-glib-1-dev (>= 0.70),
-               liblcms1-dev | liblcms-dev,
-               libgegl-0.0-dev,
-               libbabl-0.0-0-dev
+Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 5.0.53), cdbs (>= 0.4.37), 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,
+ 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),
+ libasound2-dev (>= 1.0.0) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdbus-glib-1-dev (>= 0.70),
+ liblcms1-dev | liblcms-dev, libgegl-0.0-dev, libbabl-0.0-0-dev
 #Build-Conflicts: libgimp2.0
-XS-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/gimp/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/gimp/
+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
 Homepage: http://www.gimp.org
 
 Package: libgimp2.0
 Architecture: any
 Section: libs
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: gimp,
-            gimp-data (>= ${source:Upstream-Version}),
-            gimp-data (<= ${source:Upstream-Version}-z)
+Depends: ${shlibs:Depends}
+Recommends: gimp-data (>= ${source:Upstream-Version}), gimp-data (<= ${source:Upstream-Version}-z)
 Description: Libraries for the GNU Image Manipulation Program
  This package includes the libgimp libraries, which are
  necessary to run GIMP and third-party GIMP plugins.
@@ -64,38 +37,10 @@
 Architecture: any
 Section: graphics
 Provides: gimp-helpbrowser, gimp-python
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${python:Depends},
-         libgimp2.0 (>= ${source:Upstream-Version}),
-         libgimp2.0 (<= ${source:Upstream-Version}-z),
-         gimp-data (>= ${source:Upstream-Version}),
-         gimp-data (<= ${source:Upstream-Version}-z),
-         python-gtk2 (>= 2.8.0)
-Conflicts: gimp-data (<< 2.3.17-2),
-           gimp-wget (<< 2.3.12-1),
-           libgimp-perl (<= 2.0.dfsg+2.2pre1.dfsg-2),
-           gimp-svg,
-           gimp-print (<= 5.0.1-3),
-           gimp-help (<< 2+0.13-1),
-           gimp-helpbrowser,
-           gimp-python (<< 2.6.0),
-           gimp-gnomevfs (<< 2.6.0),
-           gimp-libcurl (<< 2.6.0)
-Replaces: gimp-data (<< 2.3.17-2),
-          gimp-wget (<< 2.3.12-1),
-          libgimp-perl (<= 2.0.dfsg+2.2pre1.dfsg-2),
-          gimp-svg,
-          gimp-print (<= 5.0.1-3),
-          gimp-helpbrowser,
-          gimp-python (<< 2.6.0),
-          gimp-gnomevfs (<< 2.6.0),
-          gimp-libcurl (<< 2.6.0)
-Suggests: gimp-help-en | gimp-help,
-          gimp-data-extras,
-          gvfs-backends,
-          libasound2,
-          ghostscript
+Depends: libgimp2.0 (>= ${source:Upstream-Version}), libgimp2.0 (<= ${source:Upstream-Version}-z), gimp-data (>= ${source:Upstream-Version}), gimp-data (<= ${source:Upstream-Version}-z), python-gtk2 (>= 2.8.0), ${shlibs:Depends}, ${python:Depends}
+Conflicts: gimp-data (<< 2.3.17-2), gimp-wget (<< 2.3.12-1), libgimp-perl (<= 2.0.dfsg+2.2pre1.dfsg-2), gimp-svg, gimp-print (<= 5.0.1-3), gimp-help (<< 2+0.13-1), gimp-helpbrowser, gimp-python (<< 2.6.0), gimp-gnomevfs (<< 2.6.0), gimp-libcurl (<< 2.6.0)
+Replaces: gimp-data (<< 2.3.17-2), gimp-wget (<< 2.3.12-1), libgimp-perl (<= 2.0.dfsg+2.2pre1.dfsg-2), gimp-svg, gimp-print (<= 5.0.1-3), gimp-helpbrowser, gimp-python (<< 2.6.0), gimp-gnomevfs (<< 2.6.0), gimp-libcurl (<< 2.6.0)
+Suggests: gimp-help-en | gimp-help, gimp-data-extras, gvfs-backends, libasound2, ghostscript
 Description: The GNU Image Manipulation Program
  GIMP is an advanced picture editor. You can use it to edit, enhance,
  and retouch photos and scans, create drawings, and make your own
@@ -114,12 +59,9 @@
 Package: gimp-data
 Architecture: all
 Section: graphics
-Depends: ${misc:Depends}
 Recommends: gimp
-Conflicts: gimp (<< 2.4.0~rc2-2),
-           gimp-python (<< 2.6.0)
-Replaces: gimp (<< 2.4.0~rc2-2),
-          gimp-python (<< 2.6.0)
+Conflicts: gimp (<< 2.4.0~rc2-2), gimp-python (<< 2.6.0)
+Replaces: gimp (<< 2.4.0~rc2-2), gimp-python (<< 2.6.0)
 Description: Data files for GIMP
  This package contains architecture-independent supporting data files
  for use with GIMP.
@@ -127,11 +69,7 @@
 Package: libgimp2.0-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libgimp2.0 (= ${binary:Version}),
-         libgtk2.0-dev (>= 2.12.5),
-         pkg-config
+Depends: ${shlibs:Depends}, libgimp2.0 (= ${binary:Version}), libgtk2.0-dev (>= 2.12.5), pkg-config
 Suggests: libgimp2.0-doc
 Description: Headers and other files for compiling plugins for GIMP
  This package contains the header files for the GNU Image Manipulation
@@ -144,8 +82,7 @@
 Package: libgimp2.0-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends},
-         lynx | www-browser
+Depends: lynx | www-browser
 Description: Developers' Documentation for the GIMP library
  This package contains the HTML documentation for the GIMP library in
  /usr/share/gtk-doc/html/ .
@@ -154,9 +91,7 @@
 Priority: extra
 Architecture: any
 Section: debug
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         gimp (= ${binary:Version}) | libgimp2.0 (= ${binary:Version})
+Depends: gimp (= ${binary:Version}) | libgimp2.0 (= ${binary:Version}), ${shlibs:Depends}
 Description: Debugging symbols for GIMP
  This package includes the debugging symbols useful for debugging
  GIMP and its libraries, contained in the gimp and libgimp2.0 packages.

=== removed file 'debian/patches/04_gold_linker.patch'
--- debian/patches/04_gold_linker.patch	2010-12-06 05:41:27 +0000
+++ debian/patches/04_gold_linker.patch	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-From 582cb0f14eb9f145bd2a2f5c9fda12309ae0229f Mon Sep 17 00:00:00 2001
-From: Manish Singh <[e-mail]>
-Date: Sun, 24 May 2009 17:42:39 +0000
-Subject: Explicitly specify library dependencies at link time, so we can use gold.
-
----
-diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am
-index a78a83a..98acd24 100644
---- a/libgimpthumb/Makefile.am
-+++ b/libgimpthumb/Makefile.am
-@@ -86,7 +86,10 @@ noinst_PROGRAMS = gimp-thumbnail-list
- 
- gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c
- 
--gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la
-+gimp_thumbnail_list_LDADD = \
-+	libgimpthumb-$(GIMP_API_VERSION).la \
-+	$(GDK_PIXBUF_LIBS) \
-+	$(GLIB_LIBS)
- 
- 
- install-data-local: install-ms-lib install-libtool-import-lib
-diff --git a/plug-ins/common/Makefile.am b/plug-ins/common/Makefile.am
-index 66dc6dd..d58ecee 100644
---- a/plug-ins/common/Makefile.am
-+++ b/plug-ins/common/Makefile.am
-@@ -7,21 +7,22 @@
- ## Modify those two files instead of this one; for most
- ## plug-ins you should only need to modify plugin-defs.pl.
- 
-+if OS_WIN32
-+mwindows = -mwindows
-+else
-+libm = -lm
-+endif
- 
- libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
- libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
- libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
- libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
--libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
-+libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm)
- libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
- libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
- libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
- 
- 
--if OS_WIN32
--mwindows = -mwindows
--endif
--
- AM_LDFLAGS = $(mwindows)
- 
- libexecdir = $(gimpplugindir)/plug-ins
-diff --git a/plug-ins/common/mkgen.pl b/plug-ins/common/mkgen.pl
-index 40b4b74..b0cd786 100755
---- a/plug-ins/common/mkgen.pl
-+++ b/plug-ins/common/mkgen.pl
-@@ -51,21 +51,22 @@ print MK <<EOT;
- ## Modify those two files instead of this one; for most
- ## plug-ins you should only need to modify plugin-defs.pl.
- 
-+if OS_WIN32
-+mwindows = -mwindows
-+else
-+libm = -lm
-+endif
- 
- libgimp = \$(top_builddir)/libgimp/libgimp-\$(GIMP_API_VERSION).la
- libgimpbase = \$(top_builddir)/libgimpbase/libgimpbase-\$(GIMP_API_VERSION).la
- libgimpcolor = \$(top_builddir)/libgimpcolor/libgimpcolor-\$(GIMP_API_VERSION).la
- libgimpconfig = \$(top_builddir)/libgimpconfig/libgimpconfig-\$(GIMP_API_VERSION).la
--libgimpmath = \$(top_builddir)/libgimpmath/libgimpmath-\$(GIMP_API_VERSION).la
-+libgimpmath = \$(top_builddir)/libgimpmath/libgimpmath-\$(GIMP_API_VERSION).la \$(libm)
- libgimpmodule = \$(top_builddir)/libgimpmodule/libgimpmodule-\$(GIMP_API_VERSION).la
- libgimpui = \$(top_builddir)/libgimp/libgimpui-\$(GIMP_API_VERSION).la
- libgimpwidgets = \$(top_builddir)/libgimpwidgets/libgimpwidgets-\$(GIMP_API_VERSION).la
- 
- 
--if OS_WIN32
--mwindows = -mwindows
--endif
--
- AM_LDFLAGS = \$(mwindows)
- 
- libexecdir = \$(gimpplugindir)/plug-ins
-diff --git a/plug-ins/help-browser/Makefile.am b/plug-ins/help-browser/Makefile.am
-index 14fbe02..7360433 100644
---- a/plug-ins/help-browser/Makefile.am
-+++ b/plug-ins/help-browser/Makefile.am
-@@ -36,6 +36,7 @@ LDADD = \
- 	$(libgimpbase)		\
- 	$(WEBKIT_LIBS)		\
- 	$(GIO_LIBS)		\
-+	$(GLIB_LIBS)		\
- 	$(RT_LIBS)		\
- 	$(INTLLIBS)
- 
---
-cgit v0.8.3.1

=== added file 'debian/patches/07_binutils-gold.patch'
--- debian/patches/07_binutils-gold.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/07_binutils-gold.patch	2011-05-17 16:24:30 +0000
@@ -0,0 +1,42 @@
+Description: Allows package to build with binutils-gold.
+ Already fixed upstream in Makefile.ams, but changes Makefile.ins so we don't
+ have to autoreconf.
+Index: gimp/libgimpthumb/Makefile.in
+===================================================================
+--- gimp.orig/libgimpthumb/Makefile.in
++++ gimp/libgimpthumb/Makefile.in
+@@ -462,7 +462,8 @@ libgimpthumb_2_0_la_LDFLAGS = \
+ 
+ libgimpthumb_2_0_la_LIBADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) 
+ gimp_thumbnail_list_SOURCES = gimp-thumbnail-list.c
+-gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la
++gimp_thumbnail_list_LDADD = libgimpthumb-$(GIMP_API_VERSION).la \
++			    $(GDK_PIXBUF_LIBS) $(GLIB_LIBS)
+ 
+ #
+ # rules to generate built sources
+Index: gimp/plug-ins/common/Makefile.in
+===================================================================
+--- gimp.orig/plug-ins/common/Makefile.in
++++ gimp/plug-ins/common/Makefile.in
+@@ -1440,7 +1440,7 @@ libgimp = $(top_builddir)/libgimp/libgim
+ libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+ libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+ libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+-libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
++libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la -lm
+ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
+ libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
+ libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+Index: gimp/plug-ins/help-browser/Makefile.in
+===================================================================
+--- gimp.orig/plug-ins/help-browser/Makefile.in
++++ gimp/plug-ins/help-browser/Makefile.in
+@@ -409,6 +409,7 @@ LDADD = \
+ 	$(libgimpbase)		\
+ 	$(WEBKIT_LIBS)		\
+ 	$(GIO_LIBS)		\
++	$(GLIB_LIBS)		\
+ 	$(RT_LIBS)		\
+ 	$(INTLLIBS)
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-07 20:17:48 +0000
+++ debian/patches/series	2011-05-17 16:24:30 +0000
@@ -1,6 +1,6 @@
 01_debian-gimprc.patch
 02_help-message.patch
 03_gimp.desktop.in.in.patch
-04_gold_linker.patch
+06_CVE-2010-4543.patch
 05_CVE-2010-454x.patch
-06_CVE-2010-4543.patch
+07_binutils-gold.patch

=== modified file 'debian/rules'
--- debian/rules	2010-12-06 05:41:27 +0000
+++ debian/rules	2011-05-17 16:24:30 +0000
@@ -11,13 +11,12 @@
 ## undesired effects, especially when scaling JPEG images
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
 
 
 LDFLAGS = -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-python --enable-default-binary
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-python --enable-default-binary --without-hal
 DEB_BUILDDIR := $(DEB_SRCDIR)/build
 
 DEB_DH_SHLIBDEPS_ARGS_ALL := -Llibgimp2.0 -l$(CURDIR)/debian/libgimp2.0/usr/lib
@@ -27,6 +26,9 @@
 	rm -rf build
 
 common-install-impl::
+	# Remove compiled python files from the distribution, they're compiled
+	# in postrm by dh_python
+	find $(CURDIR)/debian/tmp -name "*.py[co]" -delete
 	# Add translation domain to .desktop and .server files
 	DOMAIN=$$(grep --max-count 1 '^GETTEXT_PACKAGE[[:space:]]*=' $(DEB_BUILDDIR)/po/Makefile | sed 's/^.*=[[:space:]]\([^[:space:]]\)/\1/'); \
 	for d in $$(find debian/tmp -type f -name "*.desktop" ); do \
@@ -43,7 +45,8 @@
 	# postrm by dh_python
 	find $(CURDIR)/debian/tmp -name "*.py[co]" -exec rm '{}' ';'
 
-	rm debian/tmp/usr/lib/*.la
+	# Remove all libtool .la files
+	find $(CURDIR)/debian/tmp/usr/lib -name "*.la" -delete
 
 	dh_movefiles