Bug#619719: Bug#708781: fix for non-free files in autoconf packages
On Sat, 08 Nov 2014 at 13:34:59 +0000, Simon McVittie wrote:
> On Sat, 01 Nov 2014 at 18:55:58 -0400, Michael Gilbert wrote:
> > A patch for the autoconf rc issues is available in bug #695704 for
> > autoconf2.59.
>
> Thanks, I've made a similar change to autoconf2.64. I will upload a
> package with the attached nmudiff to DELAYED/2 when I have confirmed that
> gcc-4.9 can compile successfully in an sbuild chroot with my autoconf2.64
> injected into it.
I noticed that #619719 is also open with a patch, severity:important,
so I combined the two patches and uploaded to DELAYED/5 instead.
The BTS might reject or delay the above email because the attachment is
rather huge. Sorry about that, I hand't realised just how large it was.
I attach a filtered version here; the diffstat is accurate
but the deletion of the non-free files is not shown in the actual diff.
I forgot to mention for anyone interested in these bugs that my version
of the source and binary packages, including the repacked orig.tar.gz,
can be obtained here:
https://www.pseudorandom.co.uk/~smcv/20141108autoconf/
Regards,
S
diffstat for autoconf2.64-2.64 autoconf2.64-2.64+dfsg
debian/changelog | 14
debian/patches/03_no_autoconf.info.diff | 92
debian/patches/series | 1
debian/rules | 3
doc/autoconf.info |23225 ------------------------------
doc/autoconf.texi |24121 --------------------------------
6 files changed, 109 insertions(+), 47347 deletions(-)
[The diff for doc/autoconf.info and doc/autoconf.texi consists of
deleting the entire files -smcv]
diff -Nru autoconf2.64-2.64/debian/changelog autoconf2.64-2.64+dfsg/debian/changelog
--- autoconf2.64-2.64/debian/changelog 2014-11-08 14:26:20.000000000 +0000
+++ autoconf2.64-2.64+dfsg/debian/changelog 2014-11-08 14:26:20.000000000 +0000
@@ -1,3 +1,17 @@
+autoconf2.64 (2.64+dfsg-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Jonathan Nieder ]
+ * debian/rules: CONFIG_SHELL=/bin/bash, fixing FTBFS with future dash
+ versions (Closes: #619719)
+
+ [ Simon McVittie ]
+ * Remove unused and non-DFSG-Free doc/autoconf.* (Closes: #708781)
+ * Add patch to not try to compile them
+
+ -- Simon McVittie <smcv@debian.org> Fri, 07 Nov 2014 19:08:03 +0000
+
autoconf2.64 (2.64-3) unstable; urgency=low
* Update local patch for 2.64.
diff -Nru autoconf2.64-2.64/debian/patches/03_no_autoconf.info.diff autoconf2.64-2.64+dfsg/debian/patches/03_no_autoconf.info.diff
--- autoconf2.64-2.64/debian/patches/03_no_autoconf.info.diff 1970-01-01 01:00:00.000000000 +0100
+++ autoconf2.64-2.64+dfsg/debian/patches/03_no_autoconf.info.diff 2014-11-08 14:26:20.000000000 +0000
@@ -0,0 +1,92 @@
+From: Simon McVittie <smcv@debian.org>
+Subject: Do not build autoconf.info any more
+
+Based on a patch by David Prévot <taffit@debian.org> for autoconf2.59.
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=708781
+Forwarded: not-needed
+
+--- autoconf2.64-2.64/doc/Makefile.am 2009-03-16 14:37:04.000000000 +0000
++++ autoconf2.64-2.64+dfsg/doc/Makefile.am 2014-11-07 18:50:35.180407944 +0000
+@@ -20,7 +20,7 @@
+ TEXI2HTML_FLAGS = -split_chapter
+ TEXINFO_TEX = ../build-aux/texinfo.tex
+
+-info_TEXINFOS = autoconf.texi standards.texi
++info_TEXINFOS = standards.texi
+ autoconf_TEXINFOS = fdl.texi install.texi
+ standards_TEXINFOS = fdl.texi gnu-oids.texi make-stds.texi
+
+--- autoconf2.64-2.64/doc/Makefile.in 2009-07-27 04:28:44.000000000 +0100
++++ autoconf2.64-2.64+dfsg/doc/Makefile.in 2014-11-07 18:52:06.345226181 +0000
+@@ -50,9 +67,8 @@
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ subdir = doc
+-DIST_COMMON = $(autoconf_TEXINFOS) $(srcdir)/Makefile.am \
+- $(srcdir)/Makefile.in $(srcdir)/stamp-vti \
+- $(srcdir)/version.texi $(standards_TEXINFOS)
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++ $(standards_TEXINFOS)
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/m4.m4 \
+ $(top_srcdir)/m4/make-case.m4 $(top_srcdir)/configure.ac
+@@ -63,13 +79,13 @@
+ CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
+-INFO_DEPS = $(srcdir)/autoconf.info $(srcdir)/standards.info
++INFO_DEPS = $(srcdir)/standards.info
+ am__TEXINFO_TEX_DIR = $(srcdir)/../build-aux
+-DVIS = autoconf.dvi standards.dvi
+-PDFS = autoconf.pdf standards.pdf
+-PSS = autoconf.ps standards.ps
+-HTMLS = autoconf.html standards.html
+-TEXINFOS = autoconf.texi standards.texi
++DVIS = standards.dvi
++PDFS = standards.pdf
++PSS = standards.ps
++HTMLS = standards.html
++TEXINFOS = standards.texi
+ TEXI2DVI = texi2dvi
+ TEXI2PDF = $(TEXI2DVI) --pdf --batch
+ MAKEINFOHTML = $(MAKEINFO) --html
+@@ -189,7 +216,7 @@
+ AM_MAKEINFOFLAGS = --no-split
+ TEXI2HTML_FLAGS = -split_chapter
+ TEXINFO_TEX = ../build-aux/texinfo.tex
+-info_TEXINFOS = autoconf.texi standards.texi
++info_TEXINFOS = standards.texi
+ autoconf_TEXINFOS = fdl.texi install.texi
+ standards_TEXINFOS = fdl.texi gnu-oids.texi make-stds.texi
+ EXTRA_DIST = gendocs_template
+@@ -280,29 +307,6 @@
+ rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
+ exit 1; \
+ fi
+-$(srcdir)/autoconf.info: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
+-autoconf.dvi: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
+-autoconf.pdf: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
+-autoconf.html: autoconf.texi $(srcdir)/version.texi $(autoconf_TEXINFOS)
+-$(srcdir)/version.texi: $(srcdir)/stamp-vti
+-$(srcdir)/stamp-vti: autoconf.texi $(top_srcdir)/configure
+- @(dir=.; test -f ./autoconf.texi || dir=$(srcdir); \
+- set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/autoconf.texi`; \
+- echo "@set UPDATED $$1 $$2 $$3"; \
+- echo "@set UPDATED-MONTH $$2 $$3"; \
+- echo "@set EDITION $(VERSION)"; \
+- echo "@set VERSION $(VERSION)") > vti.tmp
+- @cmp -s vti.tmp $(srcdir)/version.texi \
+- || (echo "Updating $(srcdir)/version.texi"; \
+- cp vti.tmp $(srcdir)/version.texi)
+- -@rm -f vti.tmp
+- @cp $(srcdir)/version.texi $@
+-
+-mostlyclean-vti:
+- -rm -f vti.tmp
+-
+-maintainer-clean-vti:
+- -rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
+ $(srcdir)/standards.info: standards.texi $(standards_TEXINFOS)
+ standards.dvi: standards.texi $(standards_TEXINFOS)
+ standards.pdf: standards.texi $(standards_TEXINFOS)
diff -Nru autoconf2.64-2.64/debian/patches/series autoconf2.64-2.64+dfsg/debian/patches/series
--- autoconf2.64-2.64/debian/patches/series 2014-11-08 14:26:20.000000000 +0000
+++ autoconf2.64-2.64+dfsg/debian/patches/series 2014-11-08 14:26:20.000000000 +0000
@@ -1 +1,2 @@
02_autoreconf-aclocal.diff
+03_no_autoconf.info.diff
diff -Nru autoconf2.64-2.64/debian/rules autoconf2.64-2.64+dfsg/debian/rules
--- autoconf2.64-2.64/debian/rules 2014-11-08 14:26:20.000000000 +0000
+++ autoconf2.64-2.64+dfsg/debian/rules 2014-11-08 14:26:20.000000000 +0000
@@ -5,7 +5,8 @@
configure: configure-stamp
configure-stamp: $(QUILT_STAMPFN)
dh_testdir
- ./configure --prefix=/usr --datadir=/usr/share \
+ CONFIG_SHELL=/bin/bash \
+ bash ./configure --prefix=/usr --datadir=/usr/share \
--mandir=/usr/share/man --infodir=/usr/share/info \
--program-suffix=2.64
touch $@
Reply to: