Hideki Yamane wrote:
Attached patch would fix this FTBFS, could you check and consider to
apply it, please?
I notice your patch is based on the experimental version of the package.
Afaict (note: i'm not the maintainer of this package) uploading a
package based on the experimental version to unstable would be a bad
idea without further coordination/planning as it would cause a
build-dependency conflict in guile-gnome-platform (I found this out the
hard way in raspbian).
I have ported the changes to the unstable version of the package and
used that in an upload to raspbian. A debdiff of what I uploaded to
raspbian is attatched, I have no intent to NMU this in debian as I have
no clue what the package does or how to test it.
diff -Nru g-wrap-1.9.14/debian/changelog g-wrap-1.9.14/debian/changelog
--- g-wrap-1.9.14/debian/changelog 2012-12-06 12:28:47.000000000 +0000
+++ g-wrap-1.9.14/debian/changelog 2014-02-14 02:01:44.000000000 +0000
@@ -1,3 +1,24 @@
+g-wrap (1.9.14-2+rpi2) jessie-staging; urgency=low
+
+ [Hideki Yamane]
+ * 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
+
+ [Peter Michael Green]
+ * Adjust changes so they apply to the Unstable version of package
+ rather than the experimental version.
+ * Use a version number of 1.9.14-2+rpi2 (rather than the more logical
+ 1.9.14-1.1+rpi1) for Raspbian upload because I previously uploaded
+ A version based on the experimental package to raspbian without
+ realising that doing so was a bad idea.
+
+ -- Peter Michael Green <[email protected]> Fri, 14 Feb 2014 01:53:05
+0000
+
g-wrap (1.9.14-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -Nru g-wrap-1.9.14/debian/control g-wrap-1.9.14/debian/control
--- g-wrap-1.9.14/debian/control 2012-12-06 12:28:47.000000000 +0000
+++ g-wrap-1.9.14/debian/control 2014-02-14 01:58:20.000000000 +0000
@@ -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-1.8-dev (>= 1.8.3+1), 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
00:00:00.000000000 +0000
+++ g-wrap-1.9.14/debian/patches/delete_aclocal_flags.patch 2014-02-14
01:52:25.000000000 +0000
@@ -0,0 +1,14 @@
+Description: <short summary of the patch>
+Author: Hideki Yamane <[email protected]>
+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-12-06 12:28:47.000000000 +0000
+++ g-wrap-1.9.14/debian/patches/series 2014-02-14 01:52:25.000000000 +0000
@@ -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-12-06 12:28:47.000000000 +0000
+++ g-wrap-1.9.14/debian/rules 2014-02-14 01:57:07.000000000 +0000
@@ -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-1.8
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
