diff -u gimp-2.6.5/debian/control gimp-2.6.5/debian/control --- gimp-2.6.5/debian/control +++ gimp-2.6.5/debian/control @@ -1,13 +1,14 @@ Source: gimp Priority: optional Section: graphics -Maintainer: Ari Pollak +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Ari Pollak Standards-Version: 3.7.3 Build-Depends: debhelper (>= 5.0.53), cdbs (>= 0.4.37), autotools-dev, patchutils, gettext, intltool, libx11-dev, libice-dev, libsm-dev, libxmu-dev, libxpm-dev, libxt-dev, libaa1-dev, libgtk2.0-dev (>= 2.10.13), libglib2.0-dev (>= 2.16.0), - libpango1.0-dev (>= 1.12.2), libwebkit-dev, libjpeg62-dev, + libpango1.0-dev (>= 1.12.2), libjpeg62-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, diff -u gimp-2.6.5/debian/rules gimp-2.6.5/debian/rules --- gimp-2.6.5/debian/rules +++ gimp-2.6.5/debian/rules @@ -26,6 +26,18 @@ rm -rf build common-install-impl:: + # 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 '{}' ';' diff -u gimp-2.6.5/debian/changelog gimp-2.6.5/debian/changelog --- gimp-2.6.5/debian/changelog +++ gimp-2.6.5/debian/changelog @@ -1,3 +1,19 @@ +gimp (2.6.5-1ubuntu1) jaunty; urgency=low + + * Merge from Debian unstable (LP: #330098), Ubuntu remaining changes: + - debian/patches/02_help-message.patch, + debian/patches/03_gimp.desktop.in.in.patch: + + updated some strings for ubuntu + - debian/rules: + + updated translation templates + - debian/control: + + Drop webkit build dependency. gimp is the only thing pulling + in webkit for the desktop CDs, and makes them explode + Without the webkit help browser + plugin, help will just be displayed in the default browser. + + -- Pedro Fragoso Mon, 16 Feb 2009 12:46:59 +0000 + gimp (2.6.5-1) unstable; urgency=low * New upstream release @@ -10,6 +26,23 @@ -- Ari Pollak Sun, 15 Feb 2009 05:42:45 -0500 +gimp (2.6.4-1ubuntu1) jaunty; urgency=low + + * Merge with Debian Experimental (LP: #313354) + * Ubuntu remaining changes: + * debian/patches/02_help-message.patch, + debian/patches/03_gimp.desktop.in.in.patch: + - updated some strings for ubuntu + * debian/rules: + - updated translation templates + * debian/control: + - Drop webkit build dependency. gimp is the only thing pulling + in webkit for the desktop CDs, and makes them explode + Without the webkit help browser + plugin, help will just be displayed in the default browser. + + -- Pedro Fragoso Tue, 10 Feb 2009 16:46:38 +0000 + gimp (2.6.4-1) experimental; urgency=low * New upstream release (Closes: #514530) @@ -17,6 +50,29 @@ -- Ari Pollak Sun, 08 Feb 2009 13:48:49 -0500 +gimp (2.6.3-1ubuntu2) jaunty; urgency=low + + * No-change rebuild for libpoppler-glib3 -> libpoppler-glib4 + transition. + + -- Steve Kowalik Sun, 08 Feb 2009 04:32:45 +1100 + +gimp (2.6.3-1ubuntu1) jaunty; urgency=low + + * Sync with Debian experimental (LP: #301724) + * debian/patches/02_help-message.patch, + debian/patches/03_gimp.desktop.in.in.patch: + - updated some strings for ubuntu + * debian/rules: + - updated translation templates + * debian/control: + - Drop webkit build dependency. gimp is the only thing pulling + in webkit for the desktop CDs, and makes them explode + Without the webkit help browser + plugin, help will just be displayed in the default browser. + + -- Pedro Fragoso Mon, 24 Nov 2008 14:16:39 +0000 + gimp (2.6.3-1) experimental; urgency=low * New upstream release @@ -30,6 +86,38 @@ -- Ari Pollak Thu, 30 Oct 2008 18:22:51 -0400 +gimp (2.6.1-1ubuntu3) intrepid; urgency=low + + * debian/patches/03_gimp.desktop.in.in.patch: + - don't duplicate the gettext domain information (lp: #283919) + + -- Sebastien Bacher Thu, 16 Oct 2008 09:41:19 +0200 + +gimp (2.6.1-1ubuntu2) intrepid; urgency=low + + * Drop webkit build dependency. gimp is the only thing pulling in webkit for + the desktop CDs, and makes them explode. Without the webkit help browser + plugin, help will just be displayed in the default browser. + + -- Martin Pitt Fri, 10 Oct 2008 18:54:50 +0200 + +gimp (2.6.1-1ubuntu1) intrepid; urgency=low + + * Sync new bugfix version on debian (lp: #280345, #280848) + * debian/patches/02_help-message.patch, + debian/patches/03_gimp.desktop.in.in.patch: + - updated some strings for ubuntu + * debian/rules: + - updated translation templates + + -- Sebastien Bacher Fri, 10 Oct 2008 00:13:42 +0200 + +gimp (2.6.2-1) experimental; urgency=low + + * New upstream release + + -- Ari Pollak Thu, 30 Oct 2008 18:22:51 -0400 + gimp (2.6.1-1) experimental; urgency=low * New upstream release @@ -1720,7 +1808,7 @@ so I'm satisfied. Closes: #52634 -- Ben Gertzfield 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 only in patch2: unchanged: --- gimp-2.6.5.orig/debian/patches/03_gimp.desktop.in.in.patch +++ gimp-2.6.5/debian/patches/03_gimp.desktop.in.in.patch @@ -0,0 +1,16 @@ +# +# 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 + only in patch2: unchanged: --- gimp-2.6.5.orig/debian/patches/02_help-message.patch +++ gimp-2.6.5/debian/patches/02_help-message.patch @@ -0,0 +1,16 @@ +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; +