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-14 02:01:44.000000000 +0000 @@ -1,9 +1,31 @@ -g-wrap (1.9.14-2) experimental; urgency=low +g-wrap (1.9.14-2+rpi2) jessie-staging; urgency=low - * Build against guile-2.0: - - Build-Depends, Depends and 'configure' invocation adapted. + [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 - -- Andreas Rottmann Tue, 05 Jun 2012 22:44:57 +0200 + [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 Fri, 14 Feb 2014 01:53:05 +0000 + +g-wrap (1.9.14-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Add missing Breaks+Replaces + Closes: #694272 + + -- Andreas Tille Thu, 06 Dec 2012 13:26:39 +0100 g-wrap (1.9.14-1) unstable; urgency=low 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-14 01:58:20.000000000 +0000 @@ -6,12 +6,12 @@ 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, - guile-2.0-dev (>= 2.0.5), guile-library (>= 0.1.1), libglib2.0-dev, libffi-dev +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 Architecture: all -Depends: guile-2.0, guile-library (>= 0.1.1), ${misc:Depends}, +Depends: guile-1.8, guile-library (>= 0.1.1), ${misc:Depends}, dpkg (>= 1.15.4) | install-info Recommends: indent, libgwrap-runtime-dev (>= ${source:Version}) Conflicts: libgwrapguile-dev, guile-g-wrap (<< 1.9.9-1) @@ -26,7 +26,7 @@ Package: libgwrap-runtime-dev Section: libdevel Architecture: any -Depends: libgwrap-runtime2 (= ${binary:Version}), guile-2.0-dev, libffi-dev, libc6-dev, ${misc:Depends} +Depends: libgwrap-runtime2 (= ${binary:Version}), guile-1.8-dev, libffi-dev, libc6-dev, ${misc:Depends} Conflicts: libgwrapguile-dev, libgwrap-runtime0-dev Replaces: libgwrapguile1 (<< 1.3.4-13) Description: scripting interface generator for C - development files @@ -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/gbp.conf g-wrap-1.9.14/debian/gbp.conf --- g-wrap-1.9.14/debian/gbp.conf 2012-06-08 11:11:15.000000000 +0000 +++ g-wrap-1.9.14/debian/gbp.conf 2012-12-06 12:28:47.000000000 +0000 @@ -3,5 +3,4 @@ [git-buildpackage] sign-tags = True -debian-branch = experimental 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: +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-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/README.source g-wrap-1.9.14/debian/README.source --- g-wrap-1.9.14/debian/README.source 2012-06-08 11:11:15.000000000 +0000 +++ g-wrap-1.9.14/debian/README.source 2012-12-06 12:28:47.000000000 +0000 @@ -1,69 +1,17 @@ -General Maintenance -------------------- +Building g-wrap for Debian +-------------------------- -This package is maintained in Git in the collab-maint on Alioth (for -URLs see debian/control). +The g-wrap source package uses quilt to apply and remove its +patches. Please refer to /usr/share/doc/quilt/README.source for +information about how to use quilt for source packages. -The maintainer uses git-buildpackage with the "--git-export-dir" -option to build the package from the Git working copy, although -"debuild" and "dpkg-buildpackage" should also work (but will leave the -checkout in a modified state). +The quilt series is generated from the Git repository, using TopGit. +This process is documented in /usr/share/doc/topgit/HOWTO-tg2quilt.gz. -Importing a New Upstream Release --------------------------------- +The g-wrap package uses the branch layout described in the +aforementioned document. -We want to be able to use Git to cherry-pick fixes from upstream, but -we want to base the Debian packages on the upstream tarball releases. -The slightly complicated method outlined below also creates a more -useful git history, including upstream changes in the ancestry of the -Debian version. The method has been adapted from the openafs' -debian/README.source. +You can find the Git repository at +. -Follow the following procedure to import a new upstream release: - -1. Ensure that you have the g-wrap upstream Git repository available - as a remote in the Git repository where you're doing the packaging - work and it's up to date: - - git remote add savannah git://git.sv.gnu.org/g-wrap.git - git fetch savannah - - This will be required to locate the tag for the new upstream - release. - -5. Determine the release tag corresponding to this tarball. At the - time of this writing, upstream uses tags in the form: - - v - - , where is the version number. This convention might - change, so double-check with "git tag -l". - -6. Import the upstream source from the tarball with: - - debian/import-upstream

- - where is the tarball release downloaded from upstream, - is the corresponding tag from the upstream Git - repository, and is of the form upstream/ where - is the non-Debian portion of the package version number. - (In other words, not the dash and the Debian revision.) - -7. Commit the tarball to the repository with pristine-tar, using the - new local tag as the reference: - - pristine-tar commit

- -8. Merge the new upstream source into the master branch: - - git checkout master - git merge - - where is the tag you used above. You can also just - merge with the upstream branch; either is equivalent. - -9. Flesh out the changelog entry for the new version with a summary of - what changed in that release, and continue as normal with Debian - packaging. - - -- Andreas Rottmann , Fri, 8 Jun 2012 13:04:40 +0200 + -- Andreas Rottmann , Sun, 25 Oct 2009 16:51:32 +0100 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-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-2.0 +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