r39860 - in /desktop/unstable/libpeas/debian: changelog patches/0002-Fix-autogen-with-latest-gnome-common.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Oct 14 09:30:10 2013
New Revision: 39860

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39860
Log:
debian/patches/0002-Fix-autogen-with-latest-gnome-common.patch:
Cherry-pick patch from upstream to drop usage of AM_GNU_GETTEXT as this is
not working in combination with IT_PROG_INTLTOOL. This fixes a FTBFS with
latest gnome-common which uses autoreconf now. (Closes: #724555)

Added:
    desktop/unstable/libpeas/debian/patches/0002-Fix-autogen-with-latest-gnome-common.patch
Modified:
    desktop/unstable/libpeas/debian/changelog
    desktop/unstable/libpeas/debian/patches/series

Modified: desktop/unstable/libpeas/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/changelog?rev=39860&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/changelog	[utf-8] (original)
+++ desktop/unstable/libpeas/debian/changelog	[utf-8] Mon Oct 14 09:30:10 2013
@@ -1,3 +1,12 @@
+libpeas (1.8.1-2) UNRELEASED; urgency=low
+
+  * debian/patches/0002-Fix-autogen-with-latest-gnome-common.patch:
+    Cherry-pick patch from upstream to drop usage of AM_GNU_GETTEXT as this is
+    not working in combination with IT_PROG_INTLTOOL. This fixes a FTBFS with
+    latest gnome-common which uses autoreconf now. (Closes: #724555)
+
+ -- Michael Biebl <biebl at debian.org>  Mon, 14 Oct 2013 11:26:36 +0200
+
 libpeas (1.8.1-1) unstable; urgency=low
 
   [ Michael Biebl ]

Added: desktop/unstable/libpeas/debian/patches/0002-Fix-autogen-with-latest-gnome-common.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/patches/0002-Fix-autogen-with-latest-gnome-common.patch?rev=39860&op=file
==============================================================================
--- desktop/unstable/libpeas/debian/patches/0002-Fix-autogen-with-latest-gnome-common.patch	(added)
+++ desktop/unstable/libpeas/debian/patches/0002-Fix-autogen-with-latest-gnome-common.patch	[utf-8] Mon Oct 14 09:30:10 2013
@@ -0,0 +1,24 @@
+commit 596db299943eaee7ef696c6b16137fd27a106b38
+Author: Seán de Búrca <leftmostcat at gmail.com>
+Date:   Mon Aug 26 15:22:13 2013 -0600
+
+    Fix autogen with latest gnome-common
+    
+    Side-by-side use of IT_PROG_INTLTOOL and AM_GNU_GETTEXT is not supported.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=706835
+
+diff --git a/configure.ac b/configure.ac
+index d57c5d2..3ca64db 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,9 +71,6 @@ dnl ================================================================
+ 
+ IT_PROG_INTLTOOL([0.40.0])
+ 
+-AM_GNU_GETTEXT_VERSION([0.17])
+-AM_GNU_GETTEXT([external])
+-
+ GETTEXT_PACKAGE=libpeas
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])

Modified: desktop/unstable/libpeas/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libpeas/debian/patches/series?rev=39860&op=diff
==============================================================================
--- desktop/unstable/libpeas/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/libpeas/debian/patches/series	[utf-8] Mon Oct 14 09:30:10 2013
@@ -1 +1,2 @@
 0001-Fix-tests-after-glib-string-change.patch
+0002-Fix-autogen-with-latest-gnome-common.patch