tags 695710 + patch tags 695710 + pending thanks Dear maintainer,
I've prepared an NMU for adplug (versioned as 2.2.1+dfsg2-1.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru adplug-2.2.1+dfsg1/debian/changelog adplug-2.2.1+dfsg2/debian/changelog
--- adplug-2.2.1+dfsg1/debian/changelog 2011-05-25 17:37:59.000000000 +0200
+++ adplug-2.2.1+dfsg2/debian/changelog 2012-12-16 14:31:32.000000000 +0100
@@ -1,3 +1,13 @@
+adplug (2.2.1+dfsg2-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Repack upstream tarball to exclude GFDL documentation
+ (doc/{fdl.texi,libadplug.texi,libadplug.info} with
+ unmodifiable sections. Closes: #695710
+ + Add 04-no-gfdl-docs.diff to skip building of GFDL docs.
+
+ -- Jelmer Vernooij <jel...@debian.org> Sun, 16 Dec 2012 14:08:10 +0100
+
adplug (2.2.1+dfsg1-1) unstable; urgency=low
* New maintainer (closes: #454268).
diff -Nru adplug-2.2.1+dfsg1/debian/patches/04-no-gfdl-docs.diff adplug-2.2.1+dfsg2/debian/patches/04-no-gfdl-docs.diff
--- adplug-2.2.1+dfsg1/debian/patches/04-no-gfdl-docs.diff 1970-01-01 01:00:00.000000000 +0100
+++ adplug-2.2.1+dfsg2/debian/patches/04-no-gfdl-docs.diff 2012-12-16 14:15:38.000000000 +0100
@@ -0,0 +1,62 @@
+Description: Don't build libadplug.texi as that file has been stripped from the tarball.
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/695710
+Author: Jelmer Vernooij <jel...@debian.org>
+Last-Update: 2012-12-16
+
+--- a/doc/Makefile.in 2012-12-16 14:14:36.454319112 +0100
++++ b/doc/Makefile.in 2010-04-06 05:12:22.000000000 +0200
+@@ -48,9 +48,9 @@ SOURCES =
+ DIST_SOURCES =
+-INFO_DEPS =
++INFO_DEPS = $(srcdir)/libadplug.info
+ am__TEXINFO_TEX_DIR = $(srcdir)
+-DVIS =
+-PDFS =
+-PSS =
+-HTMLS =
+-TEXINFOS =
++DVIS = libadplug.dvi
++PDFS = libadplug.pdf
++PSS = libadplug.ps
++HTMLS = libadplug.html
++TEXINFOS = libadplug.texi
+ TEXI2DVI = texi2dvi
+@@ -207,9 +207,10 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-info_TEXINFOS =
+-libadplug_TEXINFOS =
++info_TEXINFOS = libadplug.texi
++libadplug_TEXINFOS = fdl.texi
+ man_MANS = adplugdb.1
+ EXTRA_DIST = adplugdb.1.in
+-MOSTLYCLEANFILES = stamp-vti
++MOSTLYCLEANFILES = stamp-vti libadplug.info libadplug.info-1 \
++ libadplug.info-2
+
+-CLEANFILES =
++CLEANFILES = libadplug.cps libadplug.fns libadplug.vrs
+ DISTCLEANFILES = adplugdb.1
+@@ -306,4 +307,10 @@ clean-libtool:
+ fi
++$(srcdir)/libadplug.info: libadplug.texi $(srcdir)/version.texi $(libadplug_TEXINFOS)
++libadplug.dvi: libadplug.texi $(srcdir)/version.texi $(libadplug_TEXINFOS)
++libadplug.pdf: libadplug.texi $(srcdir)/version.texi $(libadplug_TEXINFOS)
++libadplug.html: libadplug.texi $(srcdir)/version.texi $(libadplug_TEXINFOS)
+ $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
+-$(srcdir)/stamp-vti: $(top_srcdir)/configure
++$(srcdir)/stamp-vti: libadplug.texi $(top_srcdir)/configure
++ @(dir=.; test -f ./libadplug.texi || dir=$(srcdir); \
++ set `$(SHELL) $(srcdir)/mdate-sh $$dir/libadplug.texi`; \
+ echo "@set UPDATED $$1 $$2 $$3"; \
+@@ -406,4 +413,10 @@ dist-info: $(INFO_DEPS)
+ mostlyclean-aminfo:
++ -rm -rf libadplug.aux libadplug.cp libadplug.cps libadplug.fn libadplug.fns \
++ libadplug.ky libadplug.kys libadplug.log libadplug.pg \
++ libadplug.pgs libadplug.tmp libadplug.toc libadplug.tp \
++ libadplug.tps libadplug.vr libadplug.vrs
+
+ clean-aminfo:
++ -test -z "libadplug.dvi libadplug.pdf libadplug.ps libadplug.html" \
++ || rm -rf libadplug.dvi libadplug.pdf libadplug.ps libadplug.html
+
diff -Nru adplug-2.2.1+dfsg1/debian/patches/series adplug-2.2.1+dfsg2/debian/patches/series
--- adplug-2.2.1+dfsg1/debian/patches/series 2011-03-17 15:29:11.000000000 +0100
+++ adplug-2.2.1+dfsg2/debian/patches/series 2012-12-16 14:15:49.000000000 +0100
@@ -1 +1,2 @@
03-no-tests.diff
+04-no-gfdl-docs.diff
diff -Nru adplug-2.2.1+dfsg1/doc/Makefile.in adplug-2.2.1+dfsg2/doc/Makefile.in
--- adplug-2.2.1+dfsg1/doc/Makefile.in 2010-04-06 05:12:22.000000000 +0200
+++ adplug-2.2.1+dfsg2/doc/Makefile.in 2012-12-16 14:14:36.000000000 +0100
@@ -46,13 +46,13 @@
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
-INFO_DEPS = $(srcdir)/libadplug.info
+INFO_DEPS =
am__TEXINFO_TEX_DIR = $(srcdir)
-DVIS = libadplug.dvi
-PDFS = libadplug.pdf
-PSS = libadplug.ps
-HTMLS = libadplug.html
-TEXINFOS = libadplug.texi
+DVIS =
+PDFS =
+PSS =
+HTMLS =
+TEXINFOS =
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
MAKEINFOHTML = $(MAKEINFO) --html
@@ -205,14 +205,13 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-info_TEXINFOS = libadplug.texi
-libadplug_TEXINFOS = fdl.texi
+info_TEXINFOS =
+libadplug_TEXINFOS =
man_MANS = adplugdb.1
EXTRA_DIST = adplugdb.1.in
-MOSTLYCLEANFILES = stamp-vti libadplug.info libadplug.info-1 \
- libadplug.info-2
+MOSTLYCLEANFILES = stamp-vti
-CLEANFILES = libadplug.cps libadplug.fns libadplug.vrs
+CLEANFILES =
DISTCLEANFILES = adplugdb.1
MAINTAINERCLEANFILES = version.texi
edit = sed \
@@ -305,14 +304,8 @@
rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
exit 1; \
fi
-$(srcdir)/libadplug.info: libadplug.texi $(srcdir)/version.texi $(libadplug_TEXINFOS)
-libadplug.dvi: libadplug.texi $(srcdir)/version.texi $(libadplug_TEXINFOS)
-libadplug.pdf: libadplug.texi $(srcdir)/version.texi $(libadplug_TEXINFOS)
-libadplug.html: libadplug.texi $(srcdir)/version.texi $(libadplug_TEXINFOS)
$(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti
-$(srcdir)/stamp-vti: libadplug.texi $(top_srcdir)/configure
- @(dir=.; test -f ./libadplug.texi || dir=$(srcdir); \
- set `$(SHELL) $(srcdir)/mdate-sh $$dir/libadplug.texi`; \
+$(srcdir)/stamp-vti: $(top_srcdir)/configure
echo "@set UPDATED $$1 $$2 $$3"; \
echo "@set UPDATED-MONTH $$2 $$3"; \
echo "@set EDITION $(VERSION)"; \
@@ -411,14 +404,8 @@
done
mostlyclean-aminfo:
- -rm -rf libadplug.aux libadplug.cp libadplug.cps libadplug.fn libadplug.fns \
- libadplug.ky libadplug.kys libadplug.log libadplug.pg \
- libadplug.pgs libadplug.tmp libadplug.toc libadplug.tp \
- libadplug.tps libadplug.vr libadplug.vrs
clean-aminfo:
- -test -z "libadplug.dvi libadplug.pdf libadplug.ps libadplug.html" \
- || rm -rf libadplug.dvi libadplug.pdf libadplug.ps libadplug.html
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
signature.asc
Description: Digital signature
