← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libgweather/trusty

« back to all changes in this revision

Viewing changes to debian/patches/02_no_external_gettext.patch

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-05-27 11:58:15 UTC
  • mfrom: (13.1.4 experimental)
  • Revision ID: package-import@ubuntu.com-20130527115815-l51yffuy20gbv9q0
Tags: 3.8.0-1ubuntu1
https://launchpad.net/bugs/1184168
* Sync with Debian (LP: #1184168). Remaining changes: 
  - debian/control.in, debian/rules:
    + Run autoreconf
  - debian/rules:
    + Generate POT files on build
  - debian/patches/01_gettext_not_xml.patch: 
    + using gettext rather than add translations to the xml databases
  - debian/patches/02_no_external_gettext.patch:
    + Can't have both IT_PROG_INTLTOOL and AM_GNU_GETTEXT

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_no_external_gettext.patch
 
1
Index: libgweather-3.7.3/configure.ac
 
2
===================================================================
 
3
--- libgweather-3.7.3.orig/configure.ac 2013-01-07 13:08:04.058963680 +1300
 
4
+++ libgweather-3.7.3/configure.ac      2013-01-07 13:08:04.054963679 +1300
 
5
@@ -84,9 +84,6 @@
 
6
 dnl gettext
 
7
 IT_PROG_INTLTOOL([0.50.0])
 
8
 
 
9
-AM_GNU_GETTEXT_VERSION([0.18])
 
10
-AM_GNU_GETTEXT([external])
 
11
-
 
12
 GETTEXT_PACKAGE=libgweather-3.0
 
13
 AC_SUBST(GETTEXT_PACKAGE)
 
14
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])