-
Committer:
Bazaar Package Importer
-
Author(s):
Pedro Fragoso
-
Date:
2009-02-16 12:46:59 UTC
-
mfrom:
(1.1.19 upstream)
-
Revision ID:
james.westby@ubuntu.com-20090216124659-f5t9cchwya1iob6h
Tags: 2.6.5-1ubuntu1
* 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.