← Back to branch summary

~ubuntu-branches/ubuntu/maverick/gimp/maverick-proposed

« back to all changes in this revision

Viewing changes to debian/patches/01_debian-gimprc.patch

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-02-26 19:10:31 UTC
  • mfrom: (1.1.22 upstream) (0.4.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100226191031-d11l96bebdllen1n
Tags: 2.6.8-2ubuntu1
* Merge with debian, 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:
    - set Vcs-Bzr url

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_debian-gimprc.patch
1
 
diff -Nur -x '*.orig' -x '*~' gimp-2.6.7/etc/gimprc gimp-2.6.7.new/etc/gimprc
2
 
--- gimp-2.6.7/etc/gimprc       2009-08-14 05:36:18.000000000 +1000
3
 
+++ gimp-2.6.7.new/etc/gimprc   2009-08-27 11:37:46.000000000 +1000
 
1
Index: gimp-2.6.7/etc/gimprc
 
2
===================================================================
 
3
--- gimp-2.6.7.orig/etc/gimprc
 
4
+++ gimp-2.6.7/etc/gimprc
4
5
@@ -625,7 +625,7 @@
5
6
 # appended to the command with a space separating the two.  This is a single
6
7
 # filename.