[Chinese-commits] [fortune-zh] 01/02: makefile: fix traversal order

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository fortune-zh.

commit c4ed5a97eaf14ed7b0448774c81fb57c4c4e1302
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Mon Jan 9 14:05:29 2017 +0000

    makefile: fix traversal order
---
 Makefile         | 2 +-
 debian/changelog | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 871c33a..670688b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ stat:
 	strfile $< $<.dat
 chinese.dat: 
 	touch chinese
-	find chinese.d -type f -name '*.dat' -exec cat '{}' \; >> chinese
+	find chinese.d -type f -name '*.dat' -print0 | LC_ALL=C sort -z | xargs -0r cat | cat >> chinese
 	strfile chinese
 
 distclean: clean
diff --git a/debian/changelog b/debian/changelog
index 3d8d0c6..80af38f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fortune-zh (2.1) UNRELEASED; urgency=medium
+
+  * Make the findutil traversal order fixed to fix reproducibility.
+    Thanks to Chris Lamb <lamby at debian.org>. (Closes: #850505)
+
+ -- Zhou Mo <cdluminate at gmail.com>  Mon, 09 Jan 2017 14:04:08 +0000
+
 fortune-zh (2.0) unstable; urgency=medium
 
   * New 2.X release.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fortune-zh.git