~ubuntu-branches/ubuntu/saucy/gimp/saucy-updates

« back to all changes in this revision

Viewing changes to menus/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-02-22 23:47:53 UTC
  • mfrom: (1.1.25) (0.4.15 sid)
  • Revision ID: package-import@ubuntu.com-20120222234753-2a4wqdkb2bbx4mjb
Tags: 2.6.12-1ubuntu1
* Merge from Debian unstable (LP: #925674). Remaining Changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + Update some strings for Ubuntu
  - debian/patches/ghost-cursor.patch: fix Wacom tablet cursor events
  - debian/control:
    + Update description
  - debian/rules:
    + Set gettext domain and update translation templates

* Drop poppler patch as it's been applied upstream
  - drop debian/patches/poppler0.18.patch
  - update debian/patches/series
* fix LP: #680521 - Embed page setup dialog functionality in the print dialog
  - add debian/patches/embed-page-setup-dialog.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
228
228
MAIL = @MAIL@
229
229
MAINT = @MAINT@
230
230
MAKEINFO = @MAKEINFO@
 
231
MANIFEST_TOOL = @MANIFEST_TOOL@
231
232
MIME_TYPES = @MIME_TYPES@
232
233
MKDIR_P = @MKDIR_P@
233
234
MKINSTALLDIRS = @MKINSTALLDIRS@
319
320
abs_srcdir = @abs_srcdir@
320
321
abs_top_builddir = @abs_top_builddir@
321
322
abs_top_srcdir = @abs_top_srcdir@
 
323
ac_ct_AR = @ac_ct_AR@
322
324
ac_ct_CC = @ac_ct_CC@
323
325
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
324
326
am__include = @am__include@
356
358
libexecdir = @libexecdir@
357
359
localedir = @localedir@
358
360
localstatedir = @localstatedir@
359
 
lt_ECHO = @lt_ECHO@
360
361
mandir = @mandir@
361
362
mkdir_p = @mkdir_p@
362
363
ms_librarian = @ms_librarian@