diff -u gimp-2.4.3/debian/control gimp-2.4.3/debian/control --- gimp-2.4.3/debian/control +++ gimp-2.4.3/debian/control @@ -1,7 +1,8 @@ Source: gimp Priority: optional Section: graphics -Maintainer: Ari Pollak +Maintainer: Ubuntu Core Developers +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, diff -u gimp-2.4.3/debian/gimp.preinst gimp-2.4.3/debian/gimp.preinst --- gimp-2.4.3/debian/gimp.preinst +++ gimp-2.4.3/debian/gimp.preinst @@ -11 +11,7 @@ +# doc dir used to be a symlink, and now isn't +if [ "$1" = upgrade ] && [ -L /usr/share/doc/gimp ]; then + rm /usr/share/doc/gimp +fi + #DEBHELPER# + diff -u gimp-2.4.3/debian/rules gimp-2.4.3/debian/rules --- gimp-2.4.3/debian/rules +++ gimp-2.4.3/debian/rules @@ -43,6 +43,18 @@ debian/gimp.substvars 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 '{}' ';' @@ -82,0 +95,4 @@ + +common-binary-fixup-indep:: + # gimp-data is recommended only, just remove the upstream changelog + rm -f debian/gimp-data/usr/share/doc/gimp-data/changelog.gz diff -u gimp-2.4.3/debian/libgimp2.0-dev.preinst gimp-2.4.3/debian/libgimp2.0-dev.preinst --- gimp-2.4.3/debian/libgimp2.0-dev.preinst +++ gimp-2.4.3/debian/libgimp2.0-dev.preinst @@ -8,4 +8,9 @@ fi +# doc dir used to be a symlink, and now isn't +if [ "$1" = upgrade ] && [ -L /usr/share/doc/libgimp2.0-dev ]; then + rm /usr/share/doc/libgimp2.0-dev +fi + #DEBHELPER# diff -u gimp-2.4.3/debian/patches/02_help-message.patch gimp-2.4.3/debian/patches/02_help-message.patch --- gimp-2.4.3/debian/patches/02_help-message.patch +++ gimp-2.4.3/debian/patches/02_help-message.patch @@ -1,13 +1,15 @@ -diff -Nur gimp-2.4.0~rc2/plug-ins/help/gimphelpdomain.c gimp-2.4.0~rc2.new/plug-ins/help/gimphelpdomain.c ---- gimp-2.4.0~rc2/plug-ins/help/gimphelpdomain.c 2007-08-31 09:39:09.000000000 -0400 -+++ gimp-2.4.0~rc2.new/plug-ins/help/gimphelpdomain.c 2007-09-15 11:51:19.000000000 -0400 -@@ -176,7 +176,8 @@ +diff -Nur gimp-2.3.16/plug-ins/help/gimphelpdomain.c gimp-2.3.16.new/plug-ins/help/gimphelpdomain.c +--- gimp-2.3.16/plug-ins/help/gimphelpdomain.c 2007-01-23 11:16:01.000000000 +0100 ++++ gimp-2.3.16.new/plug-ins/help/gimphelpdomain.c 2007-05-02 17:30:48.000000000 +0200 +@@ -175,8 +175,9 @@ { g_message ("%s\n\n%s", _("The GIMP help files are not found."), - _("Please install the additional help package or use " -+ _("Please install the gimp-help-en package or a " -+ "gimp-help-XX package for your language, or use " - "the online user manual at http://docs.gimp.org/.")); +- "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.")); } else + { diff -u gimp-2.4.3/debian/changelog gimp-2.4.3/debian/changelog --- gimp-2.4.3/debian/changelog +++ gimp-2.4.3/debian/changelog @@ -1,3 +1,16 @@ +gimp (2.4.3-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. (LP: #177821) + * Ubuntu remaining changes: + - 02_help-message.patch, 03_gimp.desktop.in.in.patch: Distro changes. + - Weave i18n magic in the rules file. + - Remove the doc directory symlink in the preinst, and replace it with a + directory. + - Added NEWS, README and README.Debian to gimp.docs. + - Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Pedro Fragoso Tue, 18 Dec 2007 10:44:11 +0000 + gimp (2.4.3-1) unstable; urgency=low * New upstream version @@ -16,6 +29,29 @@ -- Ari Pollak Sat, 15 Dec 2007 19:25:55 -0500 +gimp (2.4.2-1ubuntu2) hardy; urgency=low + + * Fix syntax of preinst symlink checks. + + -- Colin Watson Thu, 29 Nov 2007 12:45:54 +0000 + +gimp (2.4.2-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - 02_help-message.patch, 03_gimp.desktop.in.in.patch: Distro changes. + - Weave i18n magic in the rules file. + - Remove the doc directory symlink in the preinst, and replace it with a + directory. + - Munge Maintainer field as per spec. + * Ubuntu changes dropped: + - Since we aren't in a freeze, and we can make this change now, restore + the Conflicts and Replaces against gimp-print and stop building with + --without-print. + - Re-add NEWS, README and README.Debian to gimp.docs. + + -- Steve Kowalik Tue, 27 Nov 2007 22:16:06 +1100 + gimp (2.4.2-1) unstable; urgency=low * New upstream version @@ -25,6 +61,28 @@ -- Ari Pollak Wed, 21 Nov 2007 12:07:09 -0500 +gimp (2.4.1-1ubuntu2) hardy; urgency=low + + * Remove the doc directory symlink in the preinst, and replace it with a + directory. + + -- Steve Kowalik Wed, 21 Nov 2007 22:34:52 +1100 + +gimp (2.4.1-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. + * Remaining Ubuntu changes: + - 02_help-message.patch, 03_gimp.desktop.in.in.patch: Distro changes. + - Weave i18n magic in the rules file. + - Munge Maintainer field as per spec. + * Ubuntu changes dropped: + - Apply patch from upstream (SVN r23659) that corrects the image + disappearing for large images at 150% zoom. + - Symlink doc directories to avoid duplicate files, CDBS does this for + us. + + -- Steve Kowalik Wed, 21 Nov 2007 17:39:07 +1100 + gimp (2.4.1-1) unstable; urgency=low * New upstream version @@ -47,6 +105,61 @@ -- Ari Pollak Tue, 23 Oct 2007 19:31:40 -0400 +gimp (2.4.0~rc3-1ubuntu7) gutsy; urgency=low + + * Explicitely remove the doc directories on upgrade for the now symlinked + doc directories. + + -- Matthias Klose Fri, 05 Oct 2007 16:51:15 +0000 + +gimp (2.4.0~rc3-1ubuntu6) gutsy; urgency=low + + * debian/gimp.docs: Remove duplicate doc files. LP: #148985. + + -- Matthias Klose Thu, 04 Oct 2007 17:11:12 +0200 + +gimp (2.4.0~rc3-1ubuntu5) gutsy; urgency=low + + * Symlink doc directories to avoid duplicate files. + + -- Matthias Klose Thu, 04 Oct 2007 12:21:58 +0000 + +gimp (2.4.0~rc3-1ubuntu4) gutsy; urgency=low + + * Apply patch from upstream (SVN r23659) that corrects the image + disappearing for large images at 150% zoom. (LP: #148380) + + -- Steve Kowalik Wed, 3 Oct 2007 22:49:35 +1000 + +gimp (2.4.0~rc3-1ubuntu3) gutsy; urgency=low + + * It seems the bad usage hadn't completly gone. Correct a variable name + that was causing the gettext domain to not be put into the .desktop + file. (LP: #148049) + + -- Steve Kowalik Tue, 2 Oct 2007 22:54:24 +1000 + +gimp (2.4.0~rc3-1ubuntu2) gutsy; urgency=low + + * Correct bad usage of cut n' waste in debian/rules. + + -- Steve Kowalik Sun, 30 Sep 2007 21:02:46 +1000 + +gimp (2.4.0~rc3-1ubuntu1) gutsy; urgency=low + + * Resynchronized with Debian. + * Remaining Ubuntu changes: + - 02_help-message.patch, 03_gimp.desktop.in.in.patch: Distro changes. + - Weave i18n magic in the rules file. + - Munge Maintainer field as per spec. + * Ubuntu changes dropped: + - 10_dont_show_wizard.patch: Unused, upstream doesn't call it anymore. + - Use dh_icons. + * Disabled the print plugin, and removed the Conflicts/Replaces on + gimp-print. + + -- Steve Kowalik Sun, 30 Sep 2007 18:06:49 +1000 + gimp (2.4.0~rc3-1) unstable; urgency=low * New upstream release @@ -76,6 +189,20 @@ -- Ari Pollak Mon, 17 Sep 2007 21:26:10 -0400 +gimp (2.4.0~rc2-1ubuntu1) gutsy; urgency=low + + * Resynchronized with Debian. + * Remaining Ubuntu changes: + - 02_help-message.patch, 03_gimp.desktop.in.in.patch, + 10_dont_show_wizard.patch: Distro patches. + - Use dh_icons, and weave i18n magic in the rules file. + - Munge Maintainer field as per spec. + * Ubuntu changes dropped: + - 90_psd_heap_overflow.patch, it has been applied upstream. + * 03_gimp.desktop.in.in.patch: Exec gimp, not gimp-2.4 + + -- Steve Kowalik Fri, 7 Sep 2007 18:01:08 +1000 + gimp (2.4.0~rc2-1) unstable; urgency=low * New upstream version @@ -145,6 +272,30 @@ -- Ari Pollak Mon, 25 Jun 2007 11:45:41 -0400 +gimp (2.3.18-1ubuntu2) gutsy; urgency=low + + * SECURITY UPDATE: arbitrary code execution via heap overflow in PSD. + * Add 90_psd_heap_overflow.patch: upstream fixes. + * References + http://svn.gnome.org/viewcvs/gimp/trunk/plug-ins/common/psd-load.c?r1=22796& +r2=22863 + CVE-2007-2949 + + -- Kees Cook Wed, 04 Jul 2007 17:02:04 -0700 + +gimp (2.3.18-1ubuntu1) gutsy; urgency=low + + * Resynchronized with Debian, remaining Ubuntu changes: + - debian/control: Maintainer change. + - debian/patches/02_help-message.patch, + debian/patches/03_gimp.desktop.in.in.patch, + debian/patches/10_dont_show_wizard.patch: Distro patches. + - debian/rules: + - use dh_iconcache, + - i18n magic. + + -- Daniel Holbach Fri, 22 Jun 2007 17:33:56 +0200 + gimp (2.3.18-1) experimental; urgency=low * New upstream release @@ -1633,7 +1784,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