~ubuntu-branches/ubuntu/intrepid/gimp/intrepid-updates

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-11-21 17:39:07 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20071121173907-od54p9hdtvn5frl0
Tags: 2.4.1-1ubuntu1
* Merge from Debian unstable.
* Remaining Ubuntu changes:
  - 02_help-message.patch, 03_gimp.desktop.in.in.patch: Distro changes.
  - Weave i18n magic in the rules file.
  - Munge Maintainer field as per spec.
* Ubuntu changes dropped:
  - Apply patch from upstream (SVN r23659) that corrects the image
    disappearing for large images at 150% zoom.
  - Symlink doc directories to avoid duplicate files, CDBS does this for
    us.

Show diffs side-by-side

added added

removed removed

Lines of Context:
54
54
        ChangeLog.pre-1-0       \
55
55
        ChangeLog.pre-1-2       \
56
56
        ChangeLog.pre-2-0       \
 
57
        ChangeLog.pre-2-2       \
 
58
        ChangeLog.pre-2-4       \
57
59
        HACKING                 \
58
60
        INSTALL                 \
59
61
        LICENSE                 \
60
62
        NEWS                    \
61
63
        NEWS.pre-2-0            \
62
64
        NEWS.pre-2-2            \
 
65
        NEWS.pre-2-4            \
63
66
        README                  \
64
67
        README.i18n             \
65
68
        README.win32            \