Control: tags -1 +patch

Hi,

 Attached patch would fix this FTBFS, could you check and consider to 
 apply it, please?

-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane
diff -Nru g-wrap-1.9.14/debian/changelog g-wrap-1.9.14/debian/changelog
--- g-wrap-1.9.14/debian/changelog	2012-06-08 20:11:15.000000000 +0900
+++ g-wrap-1.9.14/debian/changelog	2013-10-22 23:22:59.000000000 +0900
@@ -1,3 +1,16 @@
+g-wrap (1.9.14-2.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * debian/rules
+    - automatically use aclocal/autoconf/automake version (Closes: #713203)
+    - include autoreconf.mk
+  * debian/control
+    - add "Build-Depends: dh-autoreconf" to use above autoreconf.mk
+  * debian/patches
+    - add delete_aclocal_flags.patch to avoid define loop in Makefile.am
+
+ -- Hideki Yamane <henr...@debian.org>  Tue, 22 Oct 2013 22:52:11 +0900
+
 g-wrap (1.9.14-2) experimental; urgency=low
 
   * Build against guile-2.0:
diff -Nru g-wrap-1.9.14/debian/control g-wrap-1.9.14/debian/control
--- g-wrap-1.9.14/debian/control	2012-06-08 20:11:15.000000000 +0900
+++ g-wrap-1.9.14/debian/control	2013-10-22 22:51:13.000000000 +0900
@@ -6,7 +6,7 @@
 Vcs-Git: git://git.debian.org/git/collab-maint/g-wrap.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/g-wrap.git
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>> 8), cdbs, texinfo, automake, autoconf,
+Build-Depends: debhelper (>> 8), cdbs, texinfo, automake, autoconf, dh-autoreconf,
  guile-2.0-dev (>= 2.0.5), guile-library (>= 0.1.1), libglib2.0-dev, libffi-dev
 
 Package: g-wrap
diff -Nru g-wrap-1.9.14/debian/patches/delete_aclocal_flags.patch g-wrap-1.9.14/debian/patches/delete_aclocal_flags.patch
--- g-wrap-1.9.14/debian/patches/delete_aclocal_flags.patch	1970-01-01 09:00:00.000000000 +0900
+++ g-wrap-1.9.14/debian/patches/delete_aclocal_flags.patch	2013-10-22 23:15:41.000000000 +0900
@@ -0,0 +1,14 @@
+Description: <short summary of the patch>
+Author: Hideki Yamane <henr...@debian.org>
+Forwarded: no
+Last-Update: 2013-10-22
+
+--- g-wrap-1.9.14.orig/Makefile.am
++++ g-wrap-1.9.14/Makefile.am
+@@ -16,5 +16,5 @@ EXTRA_DIST = g-wrap.scm \
+ 	     $(wildcard $(srcdir)/m4/*.m4) \
+ 	     $(wildcard $(srcdir)/m4/*.m4-in)
+ 
+-ACLOCAL_AMFLAGS = -I m4 @ACLOCAL_FLAGS@
++ACLOCAL_AMFLAGS = -I m4 
+ 
diff -Nru g-wrap-1.9.14/debian/patches/series g-wrap-1.9.14/debian/patches/series
--- g-wrap-1.9.14/debian/patches/series	2012-06-08 20:11:15.000000000 +0900
+++ g-wrap-1.9.14/debian/patches/series	2013-10-22 23:11:22.000000000 +0900
@@ -1 +1,2 @@
 0001-Use-GUILE-instead-of-hardcoding-guile-binary-name.patch
+delete_aclocal_flags.patch
diff -Nru g-wrap-1.9.14/debian/rules g-wrap-1.9.14/debian/rules
--- g-wrap-1.9.14/debian/rules	2012-06-08 20:11:15.000000000 +0900
+++ g-wrap-1.9.14/debian/rules	2013-10-22 23:03:20.000000000 +0900
@@ -4,13 +4,14 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror GUILE=/usr/bin/guile-2.0
 DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR)
 
-DEB_AUTO_UPDATE_AUTOMAKE = 1.11
-DEB_AUTO_UPDATE_ACLOCAL = 1.11
-DEB_AUTO_UPDATE_AUTOCONF = 2.69
+DEB_AUTO_UPDATE_ACLOCAL = $(shell dpkg -s automake | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
+DEB_AUTO_UPDATE_AUTOCONF = $(shell dpkg -s autoconf | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
+DEB_AUTO_UPDATE_AUTOMAKE = $(shell dpkg -s automake | perl -nle '/^Version: (?:\d:)?(\d+\.\d+)?/ and print $$1')
 
 DEB_MAKE_CHECK_TARGET = check
 

Reply via email to