Last commit made on 2010-01-07
Get this branch:
git clone -b ubuntu/intrepid-devel https://git.launchpad.net/ubuntu/+source/gimp
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

ec9e349... by Marc Deslauriers on 2010-01-04

Import patches-unapplied version 2.6.1-1ubuntu3.1 to ubuntu/intrepid-security

Imported using git-ubuntu import.

Changelog parent: d2519dde5e59e50590e392b700ff4ad777931987

New changelog entries:
  * SECURITY UPDATE: arbitrary code execution via crafted BMP file
    - debian/patches/04_security_CVE-2009-1570.patch: validate bit depths,
      width and height in plug-ins/file-bmp/bmp-read.c.
    - CVE-2009-1570
  * SECURITY UPDATE: arbitrary code execution via crafted PSD file
    - debian/patches/05_security_CVE-2009-3909.patch: protect against
      integer overflows in plug-ins/file-psd/{psd.h,psd-load.c}.
    - CVE-2009-3909

d2519dd... by Sebastien Bacher on 2008-10-16

Import patches-unapplied version 2.6.1-1ubuntu3 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: fa32066ff34d910b77f61383f9d767f7eb9df7c5

New changelog entries:
  * debian/patches/03_gimp.desktop.in.in.patch:
    - don't duplicate the gettext domain information (lp: #283919)

fa32066... by Martin Pitt on 2008-10-10

Import patches-unapplied version 2.6.1-1ubuntu2 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 21ac063279e7fb789b063cc03aaf61973d30bbe6

New changelog entries:
  * 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.

21ac063... by Sebastien Bacher on 2008-10-09

Import patches-unapplied version 2.6.1-1ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: d0ead50cfc90f38277ace2671acec105467f8056

New changelog entries:
  * Sync new bugfix version on debian (lp: #280345, #280848)
  * debian/patches/02_help-message.patch,
    - updated some strings for ubuntu
  * debian/rules:
    - updated translation templates
  * New upstream release
  * Fix watch file
  * Fix typoed gimp-gnomevfs in Replaces (thanks to Michael Biebl for pointing
    it out)
  * New upstream release to experimental so we don't break any transitions
    - Fixes Image Tile error message (Closes: #373184)
    - Fixes crash in Frosty script (Closes: #405200)
    - Uses webkit for help browser (Closes: #275605)
    - Optionally includes pointer in screenshots (Closes: #292471)
  * Merge gimp-python into main gimp package
  * Remove gimp-libcurl and gimp-gnomevfs since we now build with
    GIO support instead; gvfs-backends should provide the same functionality
  * 02_help-crash.patch:
    - Apply patch from upstream to fix crash when opening Help with
      gimp-plugin-registry installed

d0ead50... by Ari Pollak on 2008-08-22

Import patches-unapplied version 2.4.7-1 to debian/lenny

Imported using git-ubuntu import.