r2062 - in /experimental/evolution/debian: changelog patches/04_gettext_intltool.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Nov 24 19:39:57 2011
New Revision: 2062

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2062
Log:
04_gettext_intltool.patch: new patch. Remove gettext from the 
configure script, we already use intltool and they step on each 
other’s toe.

Added:
    experimental/evolution/debian/patches/04_gettext_intltool.patch
Modified:
    experimental/evolution/debian/changelog
    experimental/evolution/debian/patches/series

Modified: experimental/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/changelog?rev=2062&op=diff
==============================================================================
--- experimental/evolution/debian/changelog (original)
+++ experimental/evolution/debian/changelog Thu Nov 24 19:39:57 2011
@@ -13,6 +13,9 @@
   * Use dh-autoreconf.
   * 03_deprecated.patch: new patch. Remove *_DISABLE_DEPRECATED.
     Closes: #649645.
+  * 04_gettext_intltool.patch: new patch. Remove gettext from the 
+    configure script, we already use intltool and they step on each 
+    other’s toe.
 
  -- Jordi Mallach <jordi at debian.org>  Thu, 24 Nov 2011 14:36:16 +0100
 

Added: experimental/evolution/debian/patches/04_gettext_intltool.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/04_gettext_intltool.patch?rev=2062&op=file
==============================================================================
--- experimental/evolution/debian/patches/04_gettext_intltool.patch (added)
+++ experimental/evolution/debian/patches/04_gettext_intltool.patch Thu Nov 24 19:39:57 2011
@@ -1,0 +1,14 @@
+Index: evolution-3.2.2/configure.ac
+===================================================================
+--- evolution-3.2.2.orig/configure.ac	2011-11-24 20:36:56.204898254 +0100
++++ evolution-3.2.2/configure.ac	2011-11-24 20:38:45.049430365 +0100
+@@ -158,9 +158,6 @@ dnl I18N stuff
+ dnl ******************************
+ IT_PROG_INTLTOOL([0.40.0])
+ 
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=evolution-$BASE_VERSION
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])

Modified: experimental/evolution/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/experimental/evolution/debian/patches/series?rev=2062&op=diff
==============================================================================
--- experimental/evolution/debian/patches/series (original)
+++ experimental/evolution/debian/patches/series Thu Nov 24 19:39:57 2011
@@ -1,2 +1,3 @@
 01_requires_private.patch
 03_deprecated.patch
+04_gettext_intltool.patch