diff -Nru automake1.11-1.11.6/debian/automake.dirs automake1.11-1.11.6/debian/automake.dirs --- automake1.11-1.11.6/debian/automake.dirs 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/automake.dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/share/aclocal \ No newline at end of file diff -Nru automake1.11-1.11.6/debian/automake.doc-base automake1.11-1.11.6/debian/automake.doc-base --- automake1.11-1.11.6/debian/automake.doc-base 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/automake.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Document: automake-1.11 -Title: automake-1.11 -Abstract: Automake is a tool for automatically generating `Makefile.in's from - files called `Makefile.am'. - . - The goal of Automake is to remove the burden of Makefile maintenance - from the back of the individual GNU maintainer (and put it on the back - of the Automake maintainer). - . - The `Makefile.am' is basically a series of `make' macro definitions - (with rules being thrown in occasionally). The generated - `Makefile.in's are compliant with the GNU Makefile standards. -Section: Programming - -Format: info -Index: /usr/share/info/automake-1.11.info.gz -Files: /usr/share/info/automake-1.11.info* diff -Nru automake1.11-1.11.6/debian/automake.docs automake1.11-1.11.6/debian/automake.docs --- automake1.11-1.11.6/debian/automake.docs 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/automake.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -README -AUTHORS -NEWS diff -Nru automake1.11-1.11.6/debian/automake.info automake1.11-1.11.6/debian/automake.info --- automake1.11-1.11.6/debian/automake.info 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/automake.info 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -doc/automake-1.11.info* diff -Nru automake1.11-1.11.6/debian/automake.install automake1.11-1.11.6/debian/automake.install --- automake1.11-1.11.6/debian/automake.install 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/automake.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -debian/tmp/usr/bin/*-1.11 usr/bin/ -debian/tmp/usr/share/*-1.11 usr/share/ -debian/tmp/usr/share/man/man1/*-1.11.1 usr/share/man/man1 \ No newline at end of file diff -Nru automake1.11-1.11.6/debian/automake.links automake1.11-1.11.6/debian/automake.links --- automake1.11-1.11.6/debian/automake.links 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/automake.links 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/share/misc/config.sub usr/share/automake-1.11/config.sub -usr/share/misc/config.guess usr/share/automake-1.11/config.guess diff -Nru automake1.11-1.11.6/debian/automake.lintian-overrides automake1.11-1.11.6/debian/automake.lintian-overrides --- automake1.11-1.11.6/debian/automake.lintian-overrides 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/automake.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -automake: extra-license-file usr/share/automake-1.11/COPYING diff -Nru automake1.11-1.11.6/debian/automake.postinst automake1.11-1.11.6/debian/automake.postinst --- automake1.11-1.11.6/debian/automake.postinst 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/automake.postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -#!/bin/sh -e - -ver=1.11 -prio=29 - -update-alternatives --install /usr/bin/automake automake \ - /usr/bin/automake-$ver $prio \ - --slave /usr/bin/aclocal aclocal /usr/bin/aclocal-$ver \ - --slave /usr/share/man/man1/automake.1.gz automake.1.gz \ - /usr/share/man/man1/automake-$ver.1.gz \ - --slave /usr/share/man/man1/aclocal.1.gz aclocal.1.gz \ - /usr/share/man/man1/aclocal-$ver.1.gz - -#DEBHELPER# diff -Nru automake1.11-1.11.6/debian/automake.prerm automake1.11-1.11.6/debian/automake.prerm --- automake1.11-1.11.6/debian/automake.prerm 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/automake.prerm 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -#!/bin/sh -e - -ver=1.11 - -if [ "$1" = "remove" ]; then - update-alternatives --remove automake /usr/bin/automake-$ver -fi - -#DEBHELPER# diff -Nru automake1.11-1.11.6/debian/automake1.11.dirs automake1.11-1.11.6/debian/automake1.11.dirs --- automake1.11-1.11.6/debian/automake1.11.dirs 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/automake1.11.dirs 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1 @@ +/usr/share/aclocal \ No newline at end of file diff -Nru automake1.11-1.11.6/debian/automake1.11.doc-base automake1.11-1.11.6/debian/automake1.11.doc-base --- automake1.11-1.11.6/debian/automake1.11.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/automake1.11.doc-base 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1,17 @@ +Document: automake-1.11 +Title: automake-1.11 +Abstract: Automake is a tool for automatically generating `Makefile.in's from + files called `Makefile.am'. + . + The goal of Automake is to remove the burden of Makefile maintenance + from the back of the individual GNU maintainer (and put it on the back + of the Automake maintainer). + . + The `Makefile.am' is basically a series of `make' macro definitions + (with rules being thrown in occasionally). The generated + `Makefile.in's are compliant with the GNU Makefile standards. +Section: Programming + +Format: info +Index: /usr/share/info/automake-1.11.info.gz +Files: /usr/share/info/automake-1.11.info* diff -Nru automake1.11-1.11.6/debian/automake1.11.docs automake1.11-1.11.6/debian/automake1.11.docs --- automake1.11-1.11.6/debian/automake1.11.docs 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/automake1.11.docs 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1,3 @@ +README +AUTHORS +NEWS diff -Nru automake1.11-1.11.6/debian/automake1.11.info automake1.11-1.11.6/debian/automake1.11.info --- automake1.11-1.11.6/debian/automake1.11.info 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/automake1.11.info 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1 @@ +doc/automake-1.11.info* diff -Nru automake1.11-1.11.6/debian/automake1.11.install automake1.11-1.11.6/debian/automake1.11.install --- automake1.11-1.11.6/debian/automake1.11.install 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/automake1.11.install 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1,3 @@ +debian/tmp/usr/bin/*-1.11 usr/bin/ +debian/tmp/usr/share/*-1.11 usr/share/ +debian/tmp/usr/share/man/man1/*-1.11.1 usr/share/man/man1 \ No newline at end of file diff -Nru automake1.11-1.11.6/debian/automake1.11.links automake1.11-1.11.6/debian/automake1.11.links --- automake1.11-1.11.6/debian/automake1.11.links 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/automake1.11.links 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1,2 @@ +usr/share/misc/config.sub usr/share/automake-1.11/config.sub +usr/share/misc/config.guess usr/share/automake-1.11/config.guess diff -Nru automake1.11-1.11.6/debian/automake1.11.lintian-overrides automake1.11-1.11.6/debian/automake1.11.lintian-overrides --- automake1.11-1.11.6/debian/automake1.11.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/automake1.11.lintian-overrides 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1 @@ +automake1.11: extra-license-file usr/share/automake-1.11/COPYING diff -Nru automake1.11-1.11.6/debian/automake1.11.postinst automake1.11-1.11.6/debian/automake1.11.postinst --- automake1.11-1.11.6/debian/automake1.11.postinst 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/automake1.11.postinst 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1,14 @@ +#!/bin/sh -e + +ver=1.11 +prio=29 + +update-alternatives --install /usr/bin/automake automake \ + /usr/bin/automake-$ver $prio \ + --slave /usr/bin/aclocal aclocal /usr/bin/aclocal-$ver \ + --slave /usr/share/man/man1/automake.1.gz automake.1.gz \ + /usr/share/man/man1/automake-$ver.1.gz \ + --slave /usr/share/man/man1/aclocal.1.gz aclocal.1.gz \ + /usr/share/man/man1/aclocal-$ver.1.gz + +#DEBHELPER# diff -Nru automake1.11-1.11.6/debian/automake1.11.prerm automake1.11-1.11.6/debian/automake1.11.prerm --- automake1.11-1.11.6/debian/automake1.11.prerm 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/automake1.11.prerm 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh -e + +ver=1.11 + +if [ "$1" = "remove" ]; then + update-alternatives --remove automake /usr/bin/automake-$ver +fi + +#DEBHELPER# diff -Nru automake1.11-1.11.6/debian/changelog automake1.11-1.11.6/debian/changelog --- automake1.11-1.11.6/debian/changelog 2012-09-19 15:45:43.000000000 +0000 +++ automake1.11-1.11.6/debian/changelog 2013-06-24 17:35:57.000000000 +0000 @@ -1,13 +1,14 @@ -automake1.11 (1:1.11.6-1ubuntu1) quantal; urgency=low +automake1.11 (1:1.11.6-2) unstable; urgency=low - * Resynchronise with Debian. Remaining changes: - - Fix make install (and thus distcheck) for Python - only call - py-compile with a --destdir parameter if it is indeed set. (This has - been rejected upstream, because the real fix is to update py-compile - in the affected build systems; but I don't want to cause build - regressions in quantal at this point by dropping this patch.) + * Reupload to unstable with binary package renamed to automake1.11. + (Closes: #711865) + * debian/compat, debian/control: Upgrade to debhelper v9. + * debian/control: Standards-Version to 3.9.4. + * debian/patches/03-texinfo-fix-itemx.diff: Fix for the texinfo file + broken use of @itemx. (Closes: #709903) + * debian/rules: Disable the test suite, it's broken. - -- Colin Watson Wed, 19 Sep 2012 16:45:39 +0100 + -- Eric Dorland Mon, 24 Jun 2013 13:35:48 -0400 automake1.11 (1:1.11.6-1) unstable; urgency=low @@ -16,13 +17,6 @@ -- Eric Dorland Tue, 10 Jul 2012 16:24:23 -0400 -automake1.11 (1:1.11.5-2ubuntu1) quantal; urgency=low - - * Fix make install (and thus distcheck) for Python - only call py-compile - with a --destdir parameter if it is indeed set. (LP: #997456) - - -- Robert Collins Thu, 10 May 2012 16:59:23 +1200 - automake1.11 (1:1.11.5-2) unstable; urgency=low * debian/watch: Update to include on automake1.11 versions. diff -Nru automake1.11-1.11.6/debian/compat automake1.11-1.11.6/debian/compat --- automake1.11-1.11.6/debian/compat 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/compat 2013-06-24 17:35:57.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru automake1.11-1.11.6/debian/control automake1.11-1.11.6/debian/control --- automake1.11-1.11.6/debian/control 2012-09-19 15:44:19.000000000 +0000 +++ automake1.11-1.11.6/debian/control 2013-06-24 17:35:57.000000000 +0000 @@ -1,22 +1,22 @@ Source: automake1.11 Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Eric Dorland -Standards-Version: 3.9.3 -Build-Depends: debhelper (>= 7.0.50) +Maintainer: Eric Dorland +Standards-Version: 3.9.4 +Build-Depends: debhelper (>= 9) Build-Depends-Indep: autoconf (>= 2.62), autotools-dev (>= 20020320.1), autopoint, texinfo (>= 4.3), install-info Homepage: http://www.gnu.org/software/automake/ Vcs-Git: git://git.debian.org/~eric/automake1.11.git Vcs-Browser: http://git.debian.org/?p=users/eric/automake1.11.git -Package: automake +Package: automake1.11 Architecture: all Multi-Arch: foreign -Provides: automaken, automake1.11 +Provides: automaken Depends: autoconf (>= 2.62), autotools-dev (>= 20020320.1), ${misc:Depends} -Conflicts: automake1.6 (<< 1.6.1-4), automake (<< 1:1.4-p5-1), automake1.5 (<< 1.5-2), automake1.10-doc +Conflicts: automake1.6 (<< 1.6.1-4), automake (<< 1:1.11.6-2~), automake1.5 (<< 1.5-2), automake1.10-doc +Replaces: automake (<< 1:1.11.6-2~) Description: Tool for generating GNU Standards-compliant Makefiles Automake is a tool for automatically generating `Makefile.in's from files called `Makefile.am'. diff -Nru automake1.11-1.11.6/debian/patches/03-AM_PATH_PYTHON-destdir-support.diff automake1.11-1.11.6/debian/patches/03-AM_PATH_PYTHON-destdir-support.diff --- automake1.11-1.11.6/debian/patches/03-AM_PATH_PYTHON-destdir-support.diff 2012-09-19 15:45:37.000000000 +0000 +++ automake1.11-1.11.6/debian/patches/03-AM_PATH_PYTHON-destdir-support.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -Index: b/lib/am/python.am -=================================================================== ---- a/lib/am/python.am -+++ b/lib/am/python.am -@@ -56,8 +56,12 @@ - ## Byte-compile must be done at install time, since file times are - ## encoded in the actual files. - if test -n "$$dlist"; then \ -- $(am__py_compile) --destdir "$(DESTDIR)" \ -- --basedir "$(%NDIR%dir)" $$dlist; \ -+ if test -z "$(DESTDIR)"; then \ -+ $(am__py_compile) --basedir "$(%NDIR%dir)" $$dlist; \ -+ else \ -+ $(am__py_compile) --destdir "$(DESTDIR)" \ -+ --basedir "$(%NDIR%dir)" $$dlist; \ -+ fi; \ - else :; fi - else !%?BASE% - @list='$(%DIR%_PYTHON)'; test -n "$(%NDIR%dir)" || list=; \ -@@ -81,8 +85,12 @@ - ## Byte-compile must be done at install time, since file times are - ## encoded in the actual files. - if test -n "$$dlist"; then \ -- $(am__py_compile) --destdir "$(DESTDIR)" \ -- --basedir "$(%NDIR%dir)" $$dlist; \ -+ if test -z "$(DESTDIR)"; then \ -+ $(am__py_compile) --basedir "$(%NDIR%dir)" $$dlist; \ -+ else \ -+ $(am__py_compile) --destdir "$(DESTDIR)" \ -+ --basedir "$(%NDIR%dir)" $$dlist; \ -+ fi; \ - else :; fi \ - done - endif !%?BASE% diff -Nru automake1.11-1.11.6/debian/patches/03-texinfo-fix-itemx.diff automake1.11-1.11.6/debian/patches/03-texinfo-fix-itemx.diff --- automake1.11-1.11.6/debian/patches/03-texinfo-fix-itemx.diff 1970-01-01 00:00:00.000000000 +0000 +++ automake1.11-1.11.6/debian/patches/03-texinfo-fix-itemx.diff 2013-06-24 17:35:57.000000000 +0000 @@ -0,0 +1,29 @@ +diff --git a/doc/automake.texi b/doc/automake.texi +index 1059fc1..a553772 100644 +--- a/doc/automake.texi ++++ b/doc/automake.texi +@@ -13089,7 +13089,7 @@ nicely. Conditionals, Locations, Variable and Rule definitions, + Options: these items on which Automake works have been rewritten as + separate Perl modules, and documented. + +-@itemx 2004-01-11 Automake 1.8.1 ++@item 2004-01-11 Automake 1.8.1 + @itemx 2004-01-12 Automake 1.8.2 + @itemx 2004-03-07 Automake 1.8.3 + @itemx 2004-04-25 Automake 1.8.4 +@@ -13106,13 +13106,13 @@ down to 1.2MB@. + + Aside from this it contains mainly minor changes and bug-fixes. + +-@itemx 2004-08-11 Automake 1.9.1 ++@item 2004-08-11 Automake 1.9.1 + @itemx 2004-09-19 Automake 1.9.2 + + Automake has ten years. This chapter of the manual was initially + written for this occasion. + +-@itemx 2007-10-29 Automake repository moves to @code{savannah.gnu.org} and uses ++@item 2007-10-29 Automake repository moves to @code{savannah.gnu.org} and uses + git as primary repository. + + @end table diff -Nru automake1.11-1.11.6/debian/patches/series automake1.11-1.11.6/debian/patches/series --- automake1.11-1.11.6/debian/patches/series 2012-09-19 15:44:19.000000000 +0000 +++ automake1.11-1.11.6/debian/patches/series 2013-06-24 17:35:57.000000000 +0000 @@ -1,3 +1,3 @@ 01-texi-rename.diff 02-compile_f90_c_cxx-fix.diff -03-AM_PATH_PYTHON-destdir-support.diff +03-texinfo-fix-itemx.diff diff -Nru automake1.11-1.11.6/debian/rules automake1.11-1.11.6/debian/rules --- automake1.11-1.11.6/debian/rules 2012-07-10 20:24:36.000000000 +0000 +++ automake1.11-1.11.6/debian/rules 2013-06-24 17:35:57.000000000 +0000 @@ -1,12 +1,15 @@ #!/usr/bin/make -f -package=automake +package=automake1.11 version=1.11 infodir=doc %: dh $@ +override_dh_auto_test: +# Don't run the test suite, it's old and fails. + override_dh_auto_install: dh_auto_install --destdir=$(CURDIR)/debian/tmp # remove automake's versions