-
Committer:
Daniel Holbach
-
Date:
2011-05-17 17:30:56 UTC
-
mfrom:
(23.1.2 gimp)
-
Revision ID:
daniel.holbach@canonical.com-20110517173056-auqzuub04ktbahh1
Tags: 2.6.11-2ubuntu1
* Merge with Debian unstable, 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
+ Change build-depends from libwebkit-dev to libwebkitgtk-dev
- debian/rules:
+ Set gettext domain and update translation templates
* Fix security issues when reading plugin configuration files and PSP files
(CVE-2010-4540, CVE-2010-4541, CVE-2010-4542, CVE-2010-4543)
(Closes: #608497)
- patches imported from Ubuntu
* Drop libgimp2.0's recommendation on gimp (Closes: #600226)
* remove .la files, even from python modules (Closes: #621230)
* Remove HAL support (Closes: #613201)
* 07_binutils-gold.patch:
- Allow package to build with binutils-gold