[Reproducible-commits] [txt2man] 10/13: Imported Debian patch 1.5.6-2

Reiner Herrmann reiner at reiner-h.de
Thu Jul 2 16:52:20 UTC 2015


This is an automated email from the git hooks/post-receive script.

deki-guest pushed a commit to branch pu/reproducible_builds
in repository txt2man.

commit 8cbd27d64ba12f3ec369ac2607e762490425ffcb
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date:   Sun Apr 12 18:26:50 2015 -0300

    Imported Debian patch 1.5.6-2
---
 debian/changelog            |  9 +++++++++
 debian/patches/fix-makefile | 22 +++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 16670bf..da50092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+txt2man (1.5.6-2) experimental; urgency=medium
+
+  * Updated the patch fix-makefile to use the date of the latest entry in
+    debian/changelog for the date headers in man pages to make that builds
+    are reproducible. Thanks a lot to Jonathan Wiltshire, Jérémy Bobbio and
+    Reiner Herrmann. (Closes: #782462)
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org>  Sun, 12 Apr 2015 18:26:50 -0300
+
 txt2man (1.5.6-1) experimental; urgency=medium
 
   * New maintainer. Thanks a lot to Fredrik Steen and Robin Cornelius for
diff --git a/debian/patches/fix-makefile b/debian/patches/fix-makefile
index 75c0cbd..9500a57 100644
--- a/debian/patches/fix-makefile
+++ b/debian/patches/fix-makefile
@@ -1,18 +1,28 @@
-Description: fix the upstream Makefile.
+Description: fix the upstream Makefile to install the files in right places.
 Author: Joao Eriberto Mota Filho <eriberto at debian.org>
 Last-Update: 2014-12-12
+
+Description: use the date of the latest entry in debian/changelog for the date
+             headers in man pages, so that builds are reproducible.
+             (Closes: #782462)
+Author: Jonathan Wiltshire <jmw at debian.org>
+        Jérémy Bobbio <lunar at debian.org>
+        Reiner Herrmann <reiner at reiner-h.de>
+Forwarded: not-needed
+Last-Update: 2015-04-12
 Index: txt2man-1.5.6/Makefile
 ===================================================================
 --- txt2man-1.5.6.orig/Makefile
 +++ txt2man-1.5.6/Makefile
-@@ -1,5 +1,5 @@
+@@ -1,20 +1,21 @@
  # Makefile
 -prefix ?= /usr/local
 +prefix ?= $(DESTDIR)/usr
  version = txt2man-1.5.6
++date = $(shell dpkg-parsechangelog -u -c1 -S date | LC_ALL=C date +"%d %B %Y" -f -)
  BIN = src2man bookman txt2man
  MAN1 = src2man.1 txt2man.1 bookman.1
-@@ -7,9 +7,9 @@ MAN1 = src2man.1 txt2man.1 bookman.1
+ 
  all: $(MAN1)
  
  install: $(MAN1)
@@ -24,3 +34,9 @@ Index: txt2man-1.5.6/Makefile
  
  clean:
  	rm -f *.1 *.txt *.ps *.pdf *.html
+ 
+-%.1:%.txt; ./txt2man -s 1 -t $* -r $(version) $< > $@
++%.1:%.txt; ./txt2man -s 1 -t $* -r $(version) -d "$(date)" $< > $@
+ %.txt:%; ./$< -h 2>&1 > $@
+ %.html:%.1; rman -f HTML $< > $@
+ %.ps:%.1; groff -man $< > $@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/txt2man.git



More information about the Reproducible-commits mailing list