[Dctrl-tools-devel] [dctrl-tools] 01/02: Add patch reproducible_build

[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 be707abcc0199edb5d2969f8d22d74ac0eb06b26
Author: Rhonda D'Vine <rhonda at debian.org>
Date:   Tue Jul 12 12:11:16 2016 +0200

    Add patch reproducible_build
---
 debian/changelog                        |  7 +++++++
 debian/patches/reproducible_build.patch | 23 +++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d85577e..5d6623a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dctrl-tools (2.24-3) unstable; urgency=low
+
+  * Add patch reproducible_build from Reiner Hermann for sorting object files
+    for deterministic linking order (closes: #826760)
+
+ -- Rhonda D'Vine <rhonda at debian.org>  Tue, 12 Jul 2016 12:10:49 +0200
+
 dctrl-tools (2.24-2) unstable; urgency=low
 
   * Remove --force option from po4a calls in GNUmakefile to make package
diff --git a/debian/patches/reproducible_build.patch b/debian/patches/reproducible_build.patch
new file mode 100644
index 0000000..5d48fcc
--- /dev/null
+++ b/debian/patches/reproducible_build.patch
@@ -0,0 +1,23 @@
+Author: Reiner Herrmann <reiner at reiner-h.de>
+Description: Sort object files for deterministic linking order
+
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -31,7 +31,7 @@
+ PO4A_CONFIG = man/po4a/po4a.cfg
+ 
+ libsrc = $(wildcard lib/*.c)
+-libobj = $(libsrc:.c=.o)
++libobj = $(sort $(libsrc:.c=.o))
+ 
+ src = $(libsrc) \
+       $(wildcard grep-dctrl/*.c) \
+@@ -39,7 +39,7 @@
+       $(wildcard tbl-dctrl/*.c) \
+       $(wildcard join-dctrl/*.c)
+ 
+-obj = $(src:.c=.o)
++obj = $(sort $(src:.c=.o))
+ 
+ exe =  	grep-dctrl/grep-dctrl \
+ 	sort-dctrl/sort-dctrl \
diff --git a/debian/patches/series b/debian/patches/series
index 4a6c9f6..ccb5c31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 GNUmakefile_remove---force-from-po4a-call
+reproducible_build.patch

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