[Dctrl-tools-devel] [dctrl-tools] 01/03: Remove --force option from po4a calls

[Gerfried Fuchs]

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

rhonda pushed a commit to branch debian
in repository dctrl-tools.

commit d06d3331084cfc3ecfa2858395f4aae80d790246
Author: Rhonda D'Vine <rhonda at debian.org>
Date:   Wed Jan 20 13:24:51 2016 +0100

    Remove --force option from po4a calls
---
 debian/changelog                                   |  7 +++++++
 .../GNUmakefile_remove---force-from-po4a-call      | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 114bb53..cd56a41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dctrl-tools (2.24-2) unstable; urgency=low
+
+  * Remove --force option from po4a calls in GNUmakefile to make package
+    reproducible buildable.
+
+ -- 
+
 dctrl-tools (2.24-1) unstable; urgency=medium
 
   [ Rhonda D'Vine ]
diff --git a/debian/patches/GNUmakefile_remove---force-from-po4a-call b/debian/patches/GNUmakefile_remove---force-from-po4a-call
new file mode 100644
index 0000000..4c50451
--- /dev/null
+++ b/debian/patches/GNUmakefile_remove---force-from-po4a-call
@@ -0,0 +1,24 @@
+Author: Rhonda D'Vine <rhonda at debian.org>
+Description: Remove --force option from po4a calls
+  The --force option forced a regenerate of the pot files on every call,
+  hindering the reproducible buildability of the package
+
+Index: VCS/GNUmakefile
+===================================================================
+--- VCS.orig/GNUmakefile	2015-12-03 17:18:38.980045908 +0100
++++ VCS/GNUmakefile	2016-01-20 13:22:32.795072663 +0100
+@@ -173,12 +173,12 @@
+ # create (or update) dctrl-tools-man.pot
+ man/po4a/po/dctrl-tools-man.pot :
+ 	touch man/po4a/po/dctrl-tools-man.pot
+-	$(PO4A) --force --no-translations $(PO4A_CONFIG)
++	$(PO4A) --no-translations $(PO4A_CONFIG)
+ 
+ # build translated manpages in man/translated/$lang/
+ po4a :
+ 	touch man/po4a/po/dctrl-tools-man.pot
+-	$(PO4A) --force --no-backups $(PO4A_CONFIG)
++	$(PO4A) --no-backups $(PO4A_CONFIG)
+ 
+ # handle the "%.1 : %.1.cp" rule if and only if the grep-dctrl.1.cp file exists
+ translated-man : po4a
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4a6c9f6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+GNUmakefile_remove---force-from-po4a-call

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/dctrl-tools.git