From fe9bf559d749565854d3f0a05ad2e007692f8fe9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Tue, 29 Dec 2020 20:03:49 -0800 Subject: Commit Debian 3.0 (quilt) metadata [dgit (9.10~bpo10+1) quilt-fixup] --- .../doca2ps.texi-remove-dates-from-generated.patch | 29 ++++++++++++++ .../etcmakefile.-pass-arguments-to-date-to-s.patch | 28 ++++++++++++++ .../manmakefile.-patch-to-use-the-system-hel.patch | 44 ++++++++++++++++++++++ debian/patches/series | 3 ++ 4 files changed, 104 insertions(+) create mode 100644 debian/patches/doca2ps.texi-remove-dates-from-generated.patch create mode 100644 debian/patches/etcmakefile.-pass-arguments-to-date-to-s.patch create mode 100644 debian/patches/manmakefile.-patch-to-use-the-system-hel.patch diff --git a/debian/patches/doca2ps.texi-remove-dates-from-generated.patch b/debian/patches/doca2ps.texi-remove-dates-from-generated.patch new file mode 100644 index 0000000..3ce02a9 --- /dev/null +++ b/debian/patches/doca2ps.texi-remove-dates-from-generated.patch @@ -0,0 +1,29 @@ +From: Vagrant Cascadian +Date: Tue, 29 Dec 2020 07:52:21 +0000 +X-Dgit-Generated: 1:4.14-6 2a97e1ccbcc82182cf631cbc5d4d2a86a5483b16 +Subject: doc/a2ps.texi: Remove dates from generated documentation. (Closes: #978610) + + +--- + +--- a2ps-4.14.orig/doc/a2ps.texi ++++ a2ps-4.14/doc/a2ps.texi +@@ -103,7 +103,7 @@ approved by the author. + @titlepage + @title GNU a2ps, version @value{VERSION} + @subtitle General Purpose PostScript Generating Utility +-@subtitle Edition @value{EDITION}, @value{UPDATED} ++@subtitle Edition @value{EDITION} + @author Akim Demaille + @author Miguel Santana + +@@ -141,8 +141,7 @@ GNU @pack{} is a filter which generates + with pretty-printing features, strong support for many alphabets, and + customizable layout. + +-This is Edition @value{VERSION} of the @pack{} documentation, updated +-@value{UPDATED}. ++This is Edition @value{VERSION} of the @pack{} documentation. + + @menu + * Introduction:: Foreword diff --git a/debian/patches/etcmakefile.-pass-arguments-to-date-to-s.patch b/debian/patches/etcmakefile.-pass-arguments-to-date-to-s.patch new file mode 100644 index 0000000..08f0ff9 --- /dev/null +++ b/debian/patches/etcmakefile.-pass-arguments-to-date-to-s.patch @@ -0,0 +1,28 @@ +From: Vagrant Cascadian +Date: Tue, 29 Dec 2020 07:16:56 +0000 +X-Dgit-Generated: 1:4.14-6 ef7606529df04df6daf9bcd6b67dd3ee1fdef7b1 +Subject: etc/Makefile.*: Pass arguments to date to support SOURCE_DATE_EPOCH when generating README. (Closes: #978610) + + +--- + +--- a2ps-4.14.orig/etc/Makefile.am ++++ a2ps-4.14/etc/Makefile.am +@@ -44,5 +44,5 @@ a2ps.cfg: a2ps_cfg Makefile + + # Building a time stamp to know the version. + README: README.in Makefile +- sed "s!@date@!`date`!g;s!@version@!$(VERSION)!g" \ ++ sed "s!@date@!`LC_ALL=C date --utc --date=@$(SOURCE_DATE_EPOCH)`!g;s!@version@!$(VERSION)!g" \ + $(srcdir)/README.in > README +--- a2ps-4.14.orig/etc/Makefile.in ++++ a2ps-4.14/etc/Makefile.in +@@ -486,7 +486,7 @@ a2ps.cfg: a2ps_cfg Makefile + + # Building a time stamp to know the version. + README: README.in Makefile +- sed "s!@date@!`date`!g;s!@version@!$(VERSION)!g" \ ++ sed "s!@date@!`LC_ALL=C date --utc --date=@$(SOURCE_DATE_EPOCH)`!g;s!@version@!$(VERSION)!g" \ + $(srcdir)/README.in > README + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/debian/patches/manmakefile.-patch-to-use-the-system-hel.patch b/debian/patches/manmakefile.-patch-to-use-the-system-hel.patch new file mode 100644 index 0000000..f755d56 --- /dev/null +++ b/debian/patches/manmakefile.-patch-to-use-the-system-hel.patch @@ -0,0 +1,44 @@ +From: Vagrant Cascadian +Date: Tue, 29 Dec 2020 07:34:39 +0000 +X-Dgit-Generated: 1:4.14-6 caa3b2561bb2d5aece28e7e35d8f6095b8314bd9 +Subject: man/Makefile.*: Patch to use the system help2man. (Closes: #978609, #971819) + +The embedded copy of help2man embeds the build time. + +https://tests.reproducible-builds.org/debian/issues/bullseye/timestamps_in_manpages_generated_by_help2man_issue.html + +--- + +--- a2ps-4.14.orig/man/Makefile.am ++++ a2ps-4.14/man/Makefile.am +@@ -9,7 +9,7 @@ texi2dvi4a2ps.1: $(top_srcdir)/contrib/t + EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \ + Makefile.maint GNUmakefile common.x + PERL = @PERL@ +-HELP2MAN = help2man ++HELP2MAN = /usr/bin/help2man + MAINTAINERCLEANFILES = $(man_MANS) + + # For additional rules usually of interest only to the maintainer, +--- a2ps-4.14.orig/man/Makefile.in ++++ a2ps-4.14/man/Makefile.in +@@ -260,7 +260,7 @@ irregular_men = a2ps.1 texi2dvi4a2ps.1 + EXTRA_DIST = $(man_MANS) $(HELP2MAN) $(man_aux) \ + Makefile.maint GNUmakefile common.x + +-HELP2MAN = help2man ++HELP2MAN = /usr/bin/help2man + MAINTAINERCLEANFILES = $(man_MANS) + all: all-am + +--- a2ps-4.14.orig/man/Makefile.maint ++++ a2ps-4.14/man/Makefile.maint +@@ -1,7 +1,7 @@ + # This -*- Makefile -*- uses features of GNU make. + # It is included via GNUmakefile. + +-HELP2MAN-run = $(PERL) -w -- $(srcdir)/$(HELP2MAN) ++HELP2MAN-run = /usr/bin/help2man + + # Depend on configure.in to get version number changes. + $(man_MANS): $(top_srcdir)/configure.in common.x diff --git a/debian/patches/series b/debian/patches/series index c068781..1ec1908 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,6 @@ fix-bad-free.diff fix-format-security.diff fix-texi-build.diff CVE-2014-0466.diff +etcmakefile.-pass-arguments-to-date-to-s.patch +manmakefile.-patch-to-use-the-system-hel.patch +doca2ps.texi-remove-dates-from-generated.patch -- cgit v1.2.3