Control: tags 800797 + patch
Control: tags 800797 + pending

Dear maintainer,

I've prepared an NMU for docbook-utils (versioned as 0.6.14-3.1) and
uploaded it to DELAYED/15. Please feel free to tell me if I
should delay it longer.

Regards.
 Reiner
diff -Nru docbook-utils-0.6.14/debian/changelog docbook-utils-0.6.14/debian/changelog
--- docbook-utils-0.6.14/debian/changelog	2012-09-12 11:48:00.000000000 +0200
+++ docbook-utils-0.6.14/debian/changelog	2016-07-04 16:11:02.000000000 +0200
@@ -1,3 +1,13 @@
+docbook-utils (0.6.14-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add patch to honour SOURCE_DATE_EPOCH to enable reproducible
+    building of manpages. Closes: #800797
+  * Import changes from Ubuntu:
+    - Make docbook-utils Multi-Arch: foreign. LP: #950886
+
+ -- Reiner Herrmann <rei...@reiner-h.de>  Mon, 04 Jul 2016 13:59:43 +0200
+
 docbook-utils (0.6.14-3) unstable; urgency=medium
 
   * Redo patch for 212088, it breaks on some system. Closes: #685766
diff -Nru docbook-utils-0.6.14/debian/control docbook-utils-0.6.14/debian/control
--- docbook-utils-0.6.14/debian/control	2012-05-09 18:38:19.000000000 +0200
+++ docbook-utils-0.6.14/debian/control	2016-07-04 16:11:48.000000000 +0200
@@ -8,13 +8,13 @@
 Homepage: http://sources.redhat.com/docbook-tools/
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-xml-sgml/packages/docbook-utils/
 Vcs-Svn: svn://svn.debian.org/debian-xml-sgml/packages/docbook-utils/trunk/
-Multi-Arch: foreign
 
 Package: docbook-utils
 Architecture: all
 Depends: docbook-dsssl, jadetex, lynx | links | links2| w3m, sgmlspl, sp, ${perl:Depends}, ${misc:Depends}
 Recommends: docbook-xml
 Replaces: docbook2man, docbook2texi, docbk-xml2x, docbook2x-doc, cygnus-stylesheets
+Multi-Arch: foreign
 Description: Convert DocBook files to other formats (HTML, RTF, PS, man, PDF)
  The docbook-utils is a set of a few small programs intended to ease
  everyday use of technical documentation software and more generally use of
diff -Nru docbook-utils-0.6.14/debian/patches/series docbook-utils-0.6.14/debian/patches/series
--- docbook-utils-0.6.14/debian/patches/series	2012-05-09 19:08:40.000000000 +0200
+++ docbook-utils-0.6.14/debian/patches/series	2016-07-04 10:49:44.000000000 +0200
@@ -4,3 +4,4 @@
 bug_214982.patch
 bug_394511.patch
 bug_528334.patch
+support_source_date_epoch.patch
diff -Nru docbook-utils-0.6.14/debian/patches/support_source_date_epoch.patch docbook-utils-0.6.14/debian/patches/support_source_date_epoch.patch
--- docbook-utils-0.6.14/debian/patches/support_source_date_epoch.patch	1970-01-01 01:00:00.000000000 +0100
+++ docbook-utils-0.6.14/debian/patches/support_source_date_epoch.patch	2016-07-04 16:10:16.000000000 +0200
@@ -0,0 +1,29 @@
+Author: Reiner Herrmann <rei...@reiner-h.de>
+Description: Support SOURCE_DATE_EPOCH for timestamps
+ To allow generating documents in a reproducible way,
+ allow overriding the timestamp through the environment.
+ .
+ See also: https://reproducible-builds.org/specs/source-date-epoch/
+Bug-Debian: https://bugs.debian.org/800797
+
+--- a/helpers/docbook2man-spec.pl
++++ b/helpers/docbook2man-spec.pl
+@@ -57,6 +57,7 @@
+ use SGMLS;			# Use the SGMLS package.
+ use SGMLS::Output;		# Use stack-based output.
+ use SGMLS::Refs;
++use POSIX qw(strftime setlocale LC_TIME);
+ 
+ ########################################################################
+ # SGMLSPL script produced automatically by the script sgmlspl.pl
+@@ -279,6 +280,10 @@
+ _END_BANNER
+ 
+ 	my $date = `date "+%d %B %Y"`;
++	if ($ENV{SOURCE_DATE_EPOCH}) {
++		setlocale(LC_TIME, "C");
++		$date = strftime("%d %B %Y", gmtime($ENV{SOURCE_DATE_EPOCH} || time));
++	}
+ 	my $manpage_date = $manpage_date || $date ;
+ 
+ 	output '.TH "';

Attachment: signature.asc
Description: Digital signature

Reply via email to