Last commit made on 2012-09-19
Get this branch:
git clone -b ubuntu/quantal 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

175e771... by Robert Ancell on 2012-09-19

Import patches-unapplied version 2.8.2-1ubuntu1 to ubuntu/quantal

Imported using git-ubuntu import.

Changelog parent: 2d3e2683c5769a54f5087bacadad5481af963411

New changelog entries:
  * Merge from Debian unstable (LP: #1050831). Remaining Ubuntu changes:
  * debian/control:
    - Update description
    - Build-depend on libtiff-dev instead of libtiff4-dev.
  * debian/rules:
    - Set gettext domain and update translation templates
  * debian/patches/02_help-message.patch:
  * debian/patches/03_gimp.desktop.in.in.patch:
    - Update some strings for Ubuntu

2d3e268... by Ari Pollak on 2012-09-10

Import patches-unapplied version 2.8.2-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 965340f762a03941e95c054467b518f900abf36e

New changelog entries:
  * Imported Upstream version 2.8.2
    - Fixes a security hole in the CEL plugin (Closes: #685397) (CVE-2012-3403)
    - Fixes a security hole in the GIF plugin (CVE-2012-3481)
    - Fixes link failures on on hurd-i386 (Closes: #677342)
    - Fixes incorrect window title after exporting (Closes: #673898)
  * Don't overwrite LDFLAGS from dpkg-buildflags

965340f... by Jordi Mallach on 2012-05-13

Import patches-unapplied version 2.8.0-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: cc7ea723eeee297830335c55fb32988c7547e2b6

New changelog entries:
  [ Jordi Mallach ]
  * Use a shlibs.local file to force a dependency on libbabl >= 0.1.10.
    GIMP has an internal check for this version and will refuse to start
    otherwise, as it relies on some optimisations made to babl in
    0.1.8 → 0.1.10 (closes: #672247).
  [ Ari Pollak ]
  * Add Breaks/Replaces on old gimp-plugin-registry because of conflicting
    file-xmc plugin.

cc7ea72... by Jordi Mallach on 2012-05-08

Import patches-unapplied version 2.8.0-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 87893cb96a85eeeee344a563551920e8082b0076

New changelog entries:
  * New upstream stable release (closes: #644182, #671399).
    - “Create” menu item is now accessible via a mnemonic (closes: #610579).
    - fixes build error with GEGL 0.2 (closes: #671982).
  * Massive update of Build-Depends, to ensure all new features are
    enabled (bzip2 compression, JPEG 2000, Ghostscript, PDF export, GUdev,
    X Mourse Cursor and others), as per configure.ac.
  * Build depend on unversioned libpng-dev (closes: #662347).
  * Don't pass --without-hal to configure, it's obsolete.
  * Build-Depend on gnome-pkg-tools and include check-dist.mk.
  * Update Vcs-* URLs.
  * Remove duplicate Section fields.
  * Remove gimp.preinst, it only handled upgrades from pre-lenny.
  * Use an explicit "set -e" in other maint scripts, instead of using the
  * Drop 01_debian_gimprc.patch, obsolete. The web-browser config option
    is now gone and by default gimp will open help internally.
  * Rename fix_gimp4hurd.patch to 01_hurd_ftbfs.patch.
  * Drop part of 01_hurd_ftbfs.patch which has been applied upstream, and
    add a patch header.
  * Update watch file so it works for any new stable release directories.
  * Rewrite copyright file in machine-readable format 1.0. The GIMP is now
    licensed under the (L)GPLv3+.
  * Pass -- -V -c4 to dh_makeshlibs.
  * Rename all .files files to .install, and stop calling dh_movefiles.
  * Rename BUILDDIR to “builddir”, as “build” is now a real directory in
    the distribution.
  * Add myself to Uploaders.
  * Configure with --disable-static and stop distributing .a files.
  * Update libgimp2.0.symbols.
  * Build-Depend on GTK-2.0, GDK-Pixbuf and GLib -doc packages to ensure
    proper cross-reference links in generated gtk-doc API documentation.
  * Bump Standards-Version to 3.9.3, with no further changes.

87893cb... by Ari Pollak on 2012-02-18

Import patches-unapplied version 2.6.12-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: cbe029b6f620d5eedee4a255e2ac00871041ff3b

New changelog entries:
  * Imported Upstream version 2.6.12
  * Add ${misc:Depends} variables to packages that were missing it
  * Call default versioned python binary instead of just /usr/bin/python

cbe029b... by Ari Pollak on 2011-12-22

Import patches-unapplied version 2.6.11-8 to debian/sid

Imported using git-ubuntu import.

Changelog parent: d21634c692cf523e76cfdece723a3fc3cce550dd

New changelog entries:
  * Really add the patch this time (Closes: #651387)

d21634c... by Ari Pollak on 2011-12-10

Import patches-unapplied version 2.6.11-7 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 441d9907ecc4e2df9b164987044be2db1f6a39f2

New changelog entries:
  * poppler0.18.patch: Port file-pdf plugin to poppler 0.18 API. Patch taken from Fedora via Ubuntu.
    (Closes: #651387)

441d990... by Ari Pollak on 2011-11-30

Import patches-unapplied version 2.6.11-6 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8d20203638b2555272ac167052a44f31fdeb0ccf

New changelog entries:
  * libpng_compile.patch:
      - Apply patch from upstream to fix compilation with libpng 1.5
        (Closes: #649972)

8d20203... by Ari Pollak on 2011-10-07

Import patches-unapplied version 2.6.11-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c6b62f3d742b17e79f3245cfbb371580cd78dbe8

New changelog entries:
  * pyslice.patch: upstream patch to fix slice filter crashing (Closes: #644025)
  * Apply fix for GIF buffer overflow (CVE-2011-2896) (Closes: #643753)

c6b62f3... by Ari Pollak on 2011-09-28

Import patches-unapplied version 2.6.11-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 57e3572a05f60e3bd9b52f0f6c73f7f4c1eae2e5

New changelog entries:
  * string-format.patch: fix from upstream for build failures with
    -Werror=format-security, which is now the default with dpkg 1.16.1 and
    (Closes: #643388)
  * Improve gimp package description (Closes: #588898)
  * Move ghostscript to Recommends since it doesn't have many dependencies
  * Update README.MIDI for gimp 2.6 (it's about time).
  * Switch to using dh_python2 (Closes: #641579)
  * fix_ftbfs4hurd.patch: fix compilation on GNU/Hurd until the real fix is in
    place for gimp 2.8
    (Closes: #601906)
  * Change build-dependency from libwebkit-dev to libwebkitgtk-dev
    (Closes: #635409)
  * Use [linux-any] instead of hardcoded list of non-Linux architectures
    (Closes: #634662)
  * Bump standards-version and debhelper version
  * Add xsltproc to build-depends so the menus will build again