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 11:11:15.000000000 +0000 +++ g-wrap-1.9.14/debian/changelog 2014-02-08 01:30:05.000000000 +0000 @@ -1,3 +1,21 @@ +g-wrap (1.9.14-2+rpi1) jessie-staging; urgency=low + + [Andreas Tille via 1.1 NMU] + * Non-maintainer upload. + * Add missing Breaks+Replaces + Closes: #694272 + + [Hideki Yamane via bug 713203] + * 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 Sat, 08 Feb 2014 01:29:52 +0000 + 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 11:11:15.000000000 +0000 +++ g-wrap-1.9.14/debian/control 2014-02-08 01:27:45.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-2.0-dev (>= 2.0.5), guile-library (>= 0.1.1), libglib2.0-dev, libffi-dev Package: g-wrap @@ -51,6 +51,8 @@ Package: guile-g-wrap Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Breaks: g-wrap (<< 1.9.14) +Replaces: g-wrap (<< 1.9.14) Conflicts: g-wrap (<< 1.9.9-1) Description: scripting interface generator for C - Guile runtime G-Wrap is a tool (and Guile library) for generating function wrappers 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-08 01:27:10.000000000 +0000 @@ -0,0 +1,14 @@ +Description: +Author: Hideki Yamane +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 11:11:15.000000000 +0000 +++ g-wrap-1.9.14/debian/patches/series 2014-02-08 01:27:10.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-06-08 11:11:15.000000000 +0000 +++ g-wrap-1.9.14/debian/rules 2014-02-08 01:27:10.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-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