~ubuntu-branches/ubuntu/trusty/gnome-shell/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/11-no-gettext.patch

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-03-14 13:47:20 UTC
  • mfrom: (1.1.36) (18.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20120314134720-202sbjbu4a3z1fru
Tags: 3.3.90-0ubuntu1
* Sync with Debian experimental svn packaging (LP: #941755, #937709).
  Remaining changes:
  - debian/gnome-shell.gsettings-override: Update for Ubuntu defaults
  - debian/control.in: Recommend cups-pk-helper
  - debian/patches/10-make-NetworkManager-optional.patch: Disabled
  - Don't run dh-autoreconf

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From: Michael Biebl <biebl@debian.org>
 
2
Description: Don't mix intltool and gettext macros.
 
3
Forwarded: no
 
4
 
 
5
diff --git a/configure.ac b/configure.ac
 
6
index 13cd42b..cd579e2 100644
 
7
--- a/configure.ac
 
8
+++ b/configure.ac
 
9
@@ -26,9 +26,6 @@ LT_INIT([disable-static])
 
10
 # i18n
 
11
 IT_PROG_INTLTOOL([0.40])
 
12
 
 
13
-AM_GNU_GETTEXT([external])
 
14
-AM_GNU_GETTEXT_VERSION([0.17])
 
15
-
 
16
 GETTEXT_PACKAGE=gnome-shell
 
17
 AC_SUBST(GETTEXT_PACKAGE)
 
18
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",