diff -Nru gimp-2.8.14/debian/changelog gimp-2.8.14/debian/changelog --- gimp-2.8.14/debian/changelog 2014-09-19 14:38:29.000000000 +0000 +++ gimp-2.8.14/debian/changelog 2014-09-22 02:19:59.000000000 +0000 @@ -1,62 +1,58 @@ -gimp (2.8.14-0~ppa0) trusty; urgency=low +gimp (2.8.14-1~ppa1) trusty; urgency=low - * New upstream release - * Built using 2.8.10-0ubuntu1 Trusty config. - * Disable CVE-2013-1978.patch (appied upstream) & freetype-251.patch - * Refresh CVE-2013-1913.patch + * Backported from Debian unstable. - -- Nate Muench Fri, 19 Sep 2014 09:34:37 -0500 + -- Nate Muench Sun, 21 Sep 2014 21:19:42 -0500 -gimp (2.8.10-0ubuntu1) trusty; urgency=medium +gimp (2.8.14-1) unstable; urgency=medium - * New upstream version - * debian/patches/lcms2.patch: - - dropped, the new version has support for the new lcms - * debian/rules: - - use --with-lcms=lcms2 + * Imported Upstream version 2.8.14 + * Fixes segfault when removing tag from palette (Closes: #736625) + * Bump standards version to 3.9.6 - -- Sebastien Bacher Thu, 16 Jan 2014 10:52:27 +0100 + -- Ari Pollak Sat, 20 Sep 2014 21:10:52 -0400 -gimp (2.8.6-1ubuntu3) trusty; urgency=medium +gimp (2.8.10-3) unstable; urgency=low - * Build using lcms2. - * Build using dh-autoreconf. + * Fix missing backslash in debian/rules (Closes: #743596) - -- Matthias Klose Mon, 16 Dec 2013 15:51:04 +0100 + -- Ari Pollak Thu, 18 Sep 2014 21:32:46 -0400 -gimp (2.8.6-1ubuntu2) trusty; urgency=low +gimp (2.8.10-2) unstable; urgency=low - * SECURITY UPDATE: denial of service and possible code execution via - huge color maps in xwd plugin - - debian/patches/CVE-2013-1913.patch: limit number of color map entries - in plug-ins/common/file-xwd.c. - - CVE-2013-1913 - * SECURITY UPDATE: denial of service and possible code execution via - large number of color map entries in xwd plugin - - debian/patches/CVE-2013-1978.patch: validate number of color map - entries in plug-ins/common/file-xwd.c - - CVE-2013-1978 - * debian/patches/freetype-251.patch: fix FTBFS with newer freetype. + * Always build with lcms2 even if lcms1 is present (Closes: #743596) + * Enable parallel building (Closes: #750654) + * Add dh-autoreconf (Closes: #746713) - -- Marc Deslauriers Fri, 06 Dec 2013 13:17:01 -0500 + -- Ari Pollak Sat, 12 Jul 2014 14:55:16 -0400 -gimp (2.8.6-1ubuntu1) saucy; urgency=low +gimp (2.8.10-1) unstable; urgency=low - * Synchronize with Debian (LP: #1207734). 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 - - debian/rules: - + Set gettext domain and update translation templates + * Upgrade to lcms2 (Closes: #743596) + * Remove helpbrowser plugin; gimp will fall back to an external web + browser if present (Closes: #639761) - -- Sebastien Bacher Thu, 29 Aug 2013 12:48:19 +0200 + -- Ari Pollak Tue, 15 Apr 2014 12:55:30 -0400 + +gimp (2.8.10-0.1) unstable; urgency=high + + * Imported Upstream version 2.8.10 + * Build-depend on libtiff-dev instead of libtiff4-dev (Closes: #736006) + + [ Hideki Yamane ] + * debian/patches + - add adjust_freetype_header.patch to fix FTBFS (Closes: #732010) + - add CVE-2013-1913_and_gimp_CVE-2013-1978.patch to fix xwd security + vulnerabilities CVE-2013-1913 and CVE-2013-1978 + (Closes: #731305) + + -- Hideki Yamane Sat, 01 Mar 2014 22:35:16 +0900 gimp (2.8.6-1) unstable; urgency=low * Imported Upstream version 2.8.6 - Fixes some single window closing behavior (Closes: #686345) + - Fixes build error (Closes: #713674) * Tighten dependency on gdk-pixbuf (Closes: #712616) -- Ari Pollak Mon, 01 Jul 2013 20:28:12 -0400 diff -Nru gimp-2.8.14/debian/control gimp-2.8.14/debian/control --- gimp-2.8.14/debian/control 2014-01-16 09:51:15.000000000 +0000 +++ gimp-2.8.14/debian/control 2014-09-21 01:10:26.000000000 +0000 @@ -1,10 +1,9 @@ Source: gimp Priority: optional Section: graphics -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Ari Pollak +Maintainer: Ari Pollak Uploaders: Jordi Mallach -Standards-Version: 3.9.3 +Standards-Version: 3.9.6 Build-Depends: debhelper (>= 8), cdbs (>= 0.4.97), autotools-dev, @@ -38,7 +37,7 @@ libice-dev, libjasper-dev, libjpeg-dev, - liblcms2-dev (>= 2.3) | liblcms-dev, + liblcms2-dev (>= 2.2), libmng-dev, libpango1.0-dev (>= 1.29.4), libpng-dev, @@ -46,7 +45,6 @@ librsvg2-dev (>= 2.14.0), libsm-dev, libtiff-dev, - libwebkitgtk-dev (>= 1.6.1), libwmf-dev (>= 0.2.8), libx11-dev, libxcursor-dev, @@ -58,7 +56,6 @@ python-dev (>= 2.6.6-3), python-gtk2-dev (>= 2.10.4), xsltproc -#Build-Conflicts: libgimp2.0 Vcs-Git: git://anonscm.debian.org/collab-maint/gimp.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/gimp.git Homepage: http://www.gimp.org/ @@ -76,7 +73,7 @@ Package: gimp Architecture: any -Provides: gimp-helpbrowser, gimp-python +Provides: gimp-python Depends: libgimp2.0 (>= ${source:Upstream-Version}), libgimp2.0 (<= ${source:Upstream-Version}-z), gimp-data (>= ${source:Upstream-Version}), diff -Nru gimp-2.8.14/debian/copyright gimp-2.8.14/debian/copyright --- gimp-2.8.14/debian/copyright 2014-01-16 09:51:15.000000000 +0000 +++ gimp-2.8.14/debian/copyright 2014-05-29 01:33:46.000000000 +0000 @@ -1,6 +1,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gimp -Source: ftp://ftp.gimp.org/pub/gimp/ +Source: http://download.gimp.org/pub/gimp/ Files: * Copyright: 1995 Spencer Kimball diff -Nru gimp-2.8.14/debian/gimp-data.maintscript gimp-2.8.14/debian/gimp-data.maintscript --- gimp-2.8.14/debian/gimp-data.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.14/debian/gimp-data.maintscript 2014-02-01 18:22:58.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/gimp/2.0/ps-menurc 2.8.10-1 diff -Nru gimp-2.8.14/debian/libgimp2.0.symbols gimp-2.8.14/debian/libgimp2.0.symbols --- gimp-2.8.14/debian/libgimp2.0.symbols 2014-01-16 09:51:15.000000000 +0000 +++ gimp-2.8.14/debian/libgimp2.0.symbols 2014-09-20 17:33:29.000000000 +0000 @@ -1350,6 +1350,7 @@ _gimp_get_background_func@Base 2.4.0 _gimp_get_foreground_func@Base 2.4.0 _gimp_standard_help_func@Base 2.4.0 + _gimp_unit_store_sync_units@Base 2.8.14 _gimp_widgets_marshal_BOOLEAN__POINTER@Base 2.4.0 _gimp_widgets_marshal_VOID__DOUBLE_DOUBLE@Base 2.4.0 _gimp_widgets_marshal_VOID__INT_INT@Base 2.4.0 diff -Nru gimp-2.8.14/debian/patches/02_help-message.patch gimp-2.8.14/debian/patches/02_help-message.patch --- gimp-2.8.14/debian/patches/02_help-message.patch 2014-01-16 09:51:15.000000000 +0000 +++ gimp-2.8.14/debian/patches/02_help-message.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -diff -Nur -x '*.orig' -x '*~' gimp-2.6.1/plug-ins/help/gimphelpdomain.c gimp-2.6.1.new/plug-ins/help/gimphelpdomain.c ---- gimp-2.6.1/plug-ins/help/gimphelpdomain.c 2008-08-21 13:35:16.000000000 +0200 -+++ gimp-2.6.1.new/plug-ins/help/gimphelpdomain.c 2008-10-06 13:35:46.000000000 +0200 -@@ -185,9 +185,9 @@ - { - g_message ("%s\n\n%s", - _("The GIMP user manual is not available."), -- _("Please install the additional help package " -- "or use the online user manual at " -- "http://docs.gimp.org/.")); -+ _("Please make sure gimp-help-en is installed, or " -+ "the appropriate gimp-help package for your " -+ "language.")); - } - break; - diff -Nru gimp-2.8.14/debian/patches/03_gimp.desktop.in.in.patch gimp-2.8.14/debian/patches/03_gimp.desktop.in.in.patch --- gimp-2.8.14/debian/patches/03_gimp.desktop.in.in.patch 2014-01-16 09:51:15.000000000 +0000 +++ gimp-2.8.14/debian/patches/03_gimp.desktop.in.in.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -# -# Description: change the menu item label -# -diff -Nur -x '*.orig' -x '*~' gimp-2.6.1/desktop/gimp.desktop.in.in gimp-2.6.1.new/desktop/gimp.desktop.in.in ---- gimp-2.6.1/desktop/gimp.desktop.in.in 2008-08-21 13:34:07.000000000 +0200 -+++ gimp-2.6.1.new/desktop/gimp.desktop.in.in 2008-10-06 13:39:59.000000000 +0200 -@@ -1,7 +1,7 @@ - [Desktop Entry] - Version=1.0 - Type=Application --_Name=GNU Image Manipulation Program -+_Name=GIMP Image Editor - _GenericName=Image Editor - _Comment=Create images and edit photographs - Exec=@GIMP_COMMAND@ %U - diff -Nru gimp-2.8.14/debian/patches/CVE-2013-1913.patch gimp-2.8.14/debian/patches/CVE-2013-1913.patch --- gimp-2.8.14/debian/patches/CVE-2013-1913.patch 2014-09-19 14:38:04.000000000 +0000 +++ gimp-2.8.14/debian/patches/CVE-2013-1913.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -From 32ae0f83e5748299641cceaabe3f80f1b3afd03e Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Thu, 14 Nov 2013 13:29:01 +0000 -Subject: file-xwd: sanity check colormap size (CVE-2013-1913) - ---- -Index: gimp-2.8.14/plug-ins/common/file-xwd.c -=================================================================== ---- gimp-2.8.14.orig/plug-ins/common/file-xwd.c 2014-09-19 09:37:59.134490589 -0500 -+++ gimp-2.8.14/plug-ins/common/file-xwd.c 2014-09-19 09:37:59.126490552 -0500 -@@ -470,6 +470,17 @@ - goto out; - } - -+ /* Guard against insanely huge color maps -- gimp_image_set_colormap() only -+ * accepts colormaps with 0..256 colors anyway. */ -+ if (xwdhdr.l_colormap_entries > 256) -+ { -+ g_message (_("'%s':\nIllegal number of colormap entries: %ld"), -+ gimp_filename_to_utf8 (filename), -+ (long)xwdhdr.l_colormap_entries); -+ fclose (ifp); -+ return -1; -+ } -+ - if (xwdhdr.l_colormap_entries > 0) - { - if (xwdhdr.l_colormap_entries < xwdhdr.l_ncolors) diff -Nru gimp-2.8.14/debian/patches/CVE-2013-1978.patch gimp-2.8.14/debian/patches/CVE-2013-1978.patch --- gimp-2.8.14/debian/patches/CVE-2013-1978.patch 2014-01-16 09:55:20.000000000 +0000 +++ gimp-2.8.14/debian/patches/CVE-2013-1978.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ -From 23f685931e5f000dd033a45c60c1e60d7f78caf4 Mon Sep 17 00:00:00 2001 -From: Nils Philippsen -Date: Tue, 26 Nov 2013 09:49:42 +0000 -Subject: file-xwd: sanity check # of colors and map entries (CVE-2013-1978) - -The number of colors in an image shouldn't be higher than the number of -colormap entries. Additionally, consolidate post error cleanup in -load_image(). ---- -Index: gimp-2.8.10/plug-ins/common/file-xwd.c -=================================================================== ---- gimp-2.8.10.orig/plug-ins/common/file-xwd.c 2014-01-16 10:55:14.046341703 +0100 -+++ gimp-2.8.10/plug-ins/common/file-xwd.c 2014-01-16 10:55:14.042341703 +0100 -@@ -424,9 +424,9 @@ - load_image (const gchar *filename, - GError **error) - { -- FILE *ifp; -+ FILE *ifp = NULL; - gint depth, bpp; -- gint32 image_ID; -+ gint32 image_ID = -1; - L_XWDFILEHEADER xwdhdr; - L_XWDCOLOR *xwdcolmap = NULL; - -@@ -436,7 +436,7 @@ - g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), - _("Could not open '%s' for reading: %s"), - gimp_filename_to_utf8 (filename), g_strerror (errno)); -- return -1; -+ goto out; - } - - read_xwd_header (ifp, &xwdhdr); -@@ -445,8 +445,7 @@ - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("Could not read XWD header from '%s'"), - gimp_filename_to_utf8 (filename)); -- fclose (ifp); -- return -1; -+ goto out; - } - - #ifdef XWD_COL_WAIT_DEBUG -@@ -468,12 +467,18 @@ - g_message (_("'%s':\nIllegal number of colormap entries: %ld"), - gimp_filename_to_utf8 (filename), - (long)xwdhdr.l_colormap_entries); -- fclose (ifp); -- return -1; -+ goto out; - } - - if (xwdhdr.l_colormap_entries > 0) - { -+ if (xwdhdr.l_colormap_entries < xwdhdr.l_ncolors) -+ { -+ g_message (_("'%s':\nNumber of colormap entries < number of colors"), -+ gimp_filename_to_utf8 (filename)); -+ goto out; -+ } -+ - xwdcolmap = g_new (L_XWDCOLOR, xwdhdr.l_colormap_entries); - - read_xwd_cols (ifp, &xwdhdr, xwdcolmap); -@@ -493,9 +498,7 @@ - if (xwdhdr.l_file_version != 7) - { - g_message (_("Can't read color entries")); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - } - -@@ -503,9 +506,7 @@ - { - g_message (_("'%s':\nNo image width specified"), - gimp_filename_to_utf8 (filename)); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - - if (xwdhdr.l_pixmap_width > GIMP_MAX_IMAGE_SIZE -@@ -513,27 +514,21 @@ - { - g_message (_("'%s':\nImage width is larger than GIMP can handle"), - gimp_filename_to_utf8 (filename)); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - - if (xwdhdr.l_pixmap_height <= 0) - { - g_message (_("'%s':\nNo image height specified"), - gimp_filename_to_utf8 (filename)); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - - if (xwdhdr.l_pixmap_height > GIMP_MAX_IMAGE_SIZE) - { - g_message (_("'%s':\nImage height is larger than GIMP can handle"), - gimp_filename_to_utf8 (filename)); -- g_free (xwdcolmap); -- fclose (ifp); -- return (-1); -+ goto out; - } - - gimp_progress_init_printf (_("Opening '%s'"), -@@ -582,11 +577,6 @@ - } - gimp_progress_update (1.0); - -- fclose (ifp); -- -- if (xwdcolmap) -- g_free (xwdcolmap); -- - if (image_ID == -1 && ! (error && *error)) - g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, - _("XWD-file %s has format %d, depth %d and bits per pixel %d. " -@@ -594,6 +584,17 @@ - gimp_filename_to_utf8 (filename), - (gint) xwdhdr.l_pixmap_format, depth, bpp); - -+out: -+ if (ifp) -+ { -+ fclose (ifp); -+ } -+ -+ if (xwdcolmap) -+ { -+ g_free (xwdcolmap); -+ } -+ - return image_ID; - } - diff -Nru gimp-2.8.14/debian/patches/disable-internal-help-browser gimp-2.8.14/debian/patches/disable-internal-help-browser --- gimp-2.8.14/debian/patches/disable-internal-help-browser 1970-01-01 00:00:00.000000000 +0000 +++ gimp-2.8.14/debian/patches/disable-internal-help-browser 2014-04-15 17:13:06.000000000 +0000 @@ -0,0 +1,13 @@ +Index: gimp/etc/gimprc +=================================================================== +--- gimp.orig/etc/gimprc ++++ gimp/etc/gimprc +@@ -670,7 +670,7 @@ + # Sets the browser used by the help system. Possible values are gimp and + # web-browser. + # +-# (help-browser gimp) ++(help-browser web-browser) + + # When enabled, the online user manual will be used by the help system. + # Otherwise the locally installed copy is used. Possible values are yes and diff -Nru gimp-2.8.14/debian/patches/fix-python-multiarch-includes.patch gimp-2.8.14/debian/patches/fix-python-multiarch-includes.patch --- gimp-2.8.14/debian/patches/fix-python-multiarch-includes.patch 2014-01-16 09:51:15.000000000 +0000 +++ gimp-2.8.14/debian/patches/fix-python-multiarch-includes.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -Description: fix multi-arch python include issues - . - gimp (2.8.2-1ubuntu3) raring; urgency=low - . - * Fix multi-arch python includes issues. -Author: Chris J Arges - ---- a/m4macros/pythondev.m4 -+++ b/m4macros/pythondev.m4 -@@ -16,10 +16,7 @@ fi - dnl deduce PYTHON_INCLUDES - py_prefix=`$PYTHON -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` --PYTHON_INCLUDES="-I${py_prefix}/include${py_versiondir}" --if test "$py_prefix" != "$py_exec_prefix"; then -- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include${py_versiondir}" --fi -+PYTHON_INCLUDES="`$PYTHON-config --includes`" - AC_SUBST(PYTHON_INCLUDES) - dnl check if the headers exist: - save_CPPFLAGS="$CPPFLAGS" ---- a/configure -+++ b/configure -@@ -22353,10 +22353,7 @@ else - fi - py_prefix=`$PYTHON -c "import sys; print sys.prefix"` - py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` --PYTHON_INCLUDES="-I${py_prefix}/include${py_versiondir}" --if test "$py_prefix" != "$py_exec_prefix"; then -- PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include${py_versiondir}" --fi -+PYTHON_INCLUDES="`$PYTHON-config --includes`" - - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" diff -Nru gimp-2.8.14/debian/patches/freetype-251.patch gimp-2.8.14/debian/patches/freetype-251.patch --- gimp-2.8.14/debian/patches/freetype-251.patch 2014-01-16 09:51:15.000000000 +0000 +++ gimp-2.8.14/debian/patches/freetype-251.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -From 6c73f28b6d87a2afd11974552a075bffec52347f Mon Sep 17 00:00:00 2001 -From: Michael Natterer -Date: Fri, 29 Nov 2013 20:57:46 +0000 -Subject: Bug 719560 - Build failure with freetype 2.5.1 - -Apply patch from su-v that fixes the freetype include to -the madness devised and recommended by freetype. ---- -Index: gimp-2.8.6/app/text/gimpfont.c -=================================================================== ---- gimp-2.8.6.orig/app/text/gimpfont.c 2013-12-06 14:19:07.837388350 -0500 -+++ gimp-2.8.6/app/text/gimpfont.c 2013-12-06 14:19:07.813388231 -0500 -@@ -27,7 +27,9 @@ - - #define PANGO_ENABLE_ENGINE 1 /* Argh */ - #include --#include -+ -+#include -+#include FT_TRUETYPE_TABLES_H - - #include "text-types.h" - diff -Nru gimp-2.8.14/debian/patches/series gimp-2.8.14/debian/patches/series --- gimp-2.8.14/debian/patches/series 2014-09-19 14:34:07.000000000 +0000 +++ gimp-2.8.14/debian/patches/series 2014-09-20 17:32:54.000000000 +0000 @@ -1,6 +1,2 @@ +disable-internal-help-browser 01_hurd_ftbfs.patch -02_help-message.patch -03_gimp.desktop.in.in.patch -CVE-2013-1913.patch -#CVE-2013-1978.patch -#freetype-251.patch diff -Nru gimp-2.8.14/debian/rules gimp-2.8.14/debian/rules --- gimp-2.8.14/debian/rules 2014-01-16 10:00:58.000000000 +0000 +++ gimp-2.8.14/debian/rules 2014-09-19 01:32:05.000000000 +0000 @@ -7,12 +7,9 @@ # when installing, and create a dependency on the old version of libgimp. # TODO: maybe set LD_LIBRARY_PATH instead? -## WARNING: compiling without -O2 (DEB_BUILD_OPTIONS=noopt) may produce -## undesired effects, especially when scaling JPEG images - -include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/class/gnome.mk #include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk @@ -22,14 +19,17 @@ # modules. DEB_CONFIGURE_EXTRA_FLAGS := --disable-static \ --enable-python \ + PYTHON=/usr/bin/`pyversions -d` \ --enable-default-binary \ - --enable-gtk-doc PYTHON=/usr/bin/`pyversions -d` \ - --with-lcms=lcms2 + --enable-gtk-doc \ + --with-lcms=lcms2 \ + --without-webkit DEB_BUILDDIR := $(DEB_SRCDIR)/builddir +DEB_BUILD_PARALLEL := 1 DEB_DH_SHLIBDEPS_ARGS_ALL := -Llibgimp2.0 -l$(CURDIR)/debian/libgimp2.0/usr/lib -# exclude this since we manually add the Recommends in debian/control -DEB_DH_SHLIBDEPS_ARGS_gimp := -Xlibcontroller-midi.so +# exclude this since we manually add the Suggests in debian/control: +DEB_DH_SHLIBDEPS_ARGS_gimp := -Xusr/lib/gimp/2.0/modules/libcontroller-midi.so DEB_DH_MAKESHLIBS_ARGS_gimp := -X/usr/lib/gimp/2.0/modules/ DEB_DH_MAKESHLIBS_ARGS_libgimp2.0 += -V -- -c4 @@ -37,26 +37,6 @@ rm -rf $(DEB_BUILDDIR) common-install-impl:: - # Remove compiled python files from the distribution, they're compiled - # in postrm by dh_python2 - # TODO: is this still needed? - 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 \ - echo "Adding translation domain $$DOMAIN to $$d..."; \ - echo "X-Ubuntu-Gettext-Domain=$$DOMAIN" >> $$d; \ - done; - - cd po; intltool-update -p - cd po-libgimp; intltool-update -p - cd po-plug-ins; intltool-update -p - cd po-script-fu; intltool-update -p - - # Remove compiled python files from the distribution, they're compiled in - # postrm by dh_python - find $(CURDIR)/debian/tmp -name "*.py[co]" -exec rm '{}' ';' - # Remove all libtool .la files find $(CURDIR)/debian/tmp/usr/lib -name "*.la" -delete diff -Nru gimp-2.8.14/debian/watch gimp-2.8.14/debian/watch --- gimp-2.8.14/debian/watch 2014-01-16 09:51:15.000000000 +0000 +++ gimp-2.8.14/debian/watch 2014-05-29 01:31:59.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -opts="dversionmangle=s/~/-/" \ - ftp://ftp.gimp.org/pub/gimp/v([\d.]+[02468])/gimp-([\d\.]+)\.tar\.bz2 +http://download.gimp.org/pub/gimp/v2.8/gimp-([\d.]+)\.tar\.bz2