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

« back to all changes in this revision

Viewing changes to app/widgets/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:
316
316
MAIL = @MAIL@
317
317
MAINT = @MAINT@
318
318
MAKEINFO = @MAKEINFO@
 
319
MANIFEST_TOOL = @MANIFEST_TOOL@
319
320
MIME_TYPES = @MIME_TYPES@
320
321
MKDIR_P = @MKDIR_P@
321
322
MKINSTALLDIRS = @MKINSTALLDIRS@
407
408
abs_srcdir = @abs_srcdir@
408
409
abs_top_builddir = @abs_top_builddir@
409
410
abs_top_srcdir = @abs_top_srcdir@
 
411
ac_ct_AR = @ac_ct_AR@
410
412
ac_ct_CC = @ac_ct_CC@
411
413
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
412
414
am__include = @am__include@
444
446
libexecdir = @libexecdir@
445
447
localedir = @localedir@
446
448
localstatedir = @localstatedir@
447
 
lt_ECHO = @lt_ECHO@
448
449
mandir = @mandir@
449
450
mkdir_p = @mkdir_p@
450
451
ms_librarian = @ms_librarian@