Hi,

I tried to clean this patch and tested it on mips64el and amd64, both build
success.
Here is the new patch:

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 20:28:47.000000000 +0800
+++ g-wrap-1.9.14/debian/control    2014-07-14 10:22:37.000000000 +0800
@@ -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
08:00:00.000000000 +0800
+++ g-wrap-1.9.14/debian/patches/delete_aclocal_flags.patch    2014-07-14
09:57:05.000000000 +0800
@@ -0,0 +1,14 @@
+Author: Hideki Yamane <henr...@debian.org>
+Forwarded: no
+Last-Update: 2013-10-22
+Index: g-wrap-1.9.14/Makefile.am
+===================================================================
+--- g-wrap-1.9.14.orig/Makefile.am    2010-09-25 20:20:13.000000000 +0800
++++ g-wrap-1.9.14/Makefile.am    2014-07-14 09:56:24.685012483 +0800
+@@ -16,5 +16,5 @@
+          $(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 20:28:47.000000000
+0800
+++ g-wrap-1.9.14/debian/patches/series    2014-07-14 09:55:39.000000000
+0800
@@ -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 20:28:47.000000000 +0800
+++ g-wrap-1.9.14/debian/rules    2014-07-14 10:22:58.000000000 +0800
@@ -4,14 +4,11 @@

 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_MAKE_CHECK_TARGET = check

 DEB_DH_MAKESHLIBS_ARGS_ALL := -V -X"libgw-guile-"

Reply via email to