~ubuntu-branches/ubuntu/oneiric/gimp/oneiric-updates

Viewing all changes in revision 63.

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2011-05-03 21:54:00 UTC
  • mfrom: (0.4.8 sid)
  • Revision ID: package-import@ubuntu.com-20110503215400-ldvej6dknqq6o8bk
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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: