r30977 - in /desktop/unstable/gnome-system-tools/debian: changelog patches/62_no_gettext.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sat Oct 22 17:40:05 2011
New Revision: 30977

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30977
Log:
* debian/patches/62_no_gettext.patch:
  - Don't use both intltool and gettext since newer versions of intltool
    conflict with gettext.

Added:
    desktop/unstable/gnome-system-tools/debian/patches/62_no_gettext.patch
Modified:
    desktop/unstable/gnome-system-tools/debian/changelog
    desktop/unstable/gnome-system-tools/debian/patches/series

Modified: desktop/unstable/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/changelog?rev=30977&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/changelog [utf-8] Sat Oct 22 17:40:05 2011
@@ -18,6 +18,9 @@
     - Add Build-Depends on dh-autoreconf.
     - Drop debian/patches/90_relibtoolize.patch.
     - Add autoreconf.mk include to debian/rules.
+  * debian/patches/62_no_gettext.patch:
+    - Don't use both intltool and gettext since newer versions of intltool
+      conflict with gettext.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 22 Oct 2011 17:59:33 +0200
 

Added: desktop/unstable/gnome-system-tools/debian/patches/62_no_gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/62_no_gettext.patch?rev=30977&op=file
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/62_no_gettext.patch (added)
+++ desktop/unstable/gnome-system-tools/debian/patches/62_no_gettext.patch [utf-8] Sat Oct 22 17:40:05 2011
@@ -1,0 +1,15 @@
+# Don't use both gettext and intltool since newer versions of intltool
+# conflict with gettext
+Index: gnome-system-tools-3.0.0/configure.in
+===================================================================
+--- gnome-system-tools-3.0.0.orig/configure.in	2011-04-03 19:32:51.000000000 +0200
++++ gnome-system-tools-3.0.0/configure.in	2011-10-22 18:34:53.617908854 +0200
+@@ -158,8 +158,6 @@
+ dnl Translations
+ dnl ========================================================
+ 
+-AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.17])
+ GETTEXT_PACKAGE=gnome-system-tools
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package name])
+ AC_SUBST([GETTEXT_PACKAGE], GETTEXT_PACKAGE)

Modified: desktop/unstable/gnome-system-tools/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/series?rev=30977&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/series [utf-8] Sat Oct 22 17:40:05 2011
@@ -1,4 +1,5 @@
 01_wait_for_backends.patch
-10_disable_interfaces.patch
+#10_disable_interfaces.patch
 11_dont_show_shares.patch
 61_outdated_docs.patch
+62_no_gettext.patch