[med-svn] [mira] 01/01: make reproducible

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository mira.

commit 14fad44043cccdd823968b2869c0897052f58337
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Wed Feb 3 06:25:38 2016 +0000

    make reproducible
---
 debian/changelog                 |  6 ++++++
 debian/patches/make-reproducible | 19 +++++++++++++++++++
 debian/patches/series            |  1 +
 debian/rules                     |  1 +
 4 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6ec25c8..4548606 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mira (4.9.5-5) UNRELEASED; urgency=medium
+
+  * Make build reproducible; fix FTBFS on non-'C' locales
+
+ -- Michael R. Crusoe <crusoe at ucdavis.edu>  Wed, 03 Feb 2016 06:31:56 +0000
+
 mira (4.9.5-4) unstable; urgency=medium
 
   * Packaging moved from SVN to Git
diff --git a/debian/patches/make-reproducible b/debian/patches/make-reproducible
new file mode 100644
index 0000000..6e05ff1
--- /dev/null
+++ b/debian/patches/make-reproducible
@@ -0,0 +1,19 @@
+Author: Michael R. Crusoe <crusoe at ucdavis.edu>
+Description: Make reproducible
+Fixes a FTBFS when the locale uses non-ASCII characters when printing the date.
+Also makes the build more reproducible 
+--- mira.orig/src/progs/Makefile.am
++++ mira/src/progs/Makefile.am
+@@ -16,10 +16,8 @@
+ 
+ compileinfo.itxt:
+ 	@/bin/echo -n "Compiled by: " >compileinfo.itxt.xxd
+-	@whoami >>compileinfo.itxt.xxd
+-	@date >>compileinfo.itxt.xxd
+-	@/bin/echo -n "On: " >>compileinfo.itxt.xxd
+-	@uname -a >>compileinfo.itxt.xxd
++	@$$DEBIAN_MAINTAINER >>compileinfo.itxt.xxd
++	@echo $$SOURCE_DATE_EPOCH >>compileinfo.itxt.xxd
+ 	@echo "Making .H out of .xxd" $@
+ 	@$(SHELL) -ec 'grep -v "^#" compileinfo.itxt.xxd | xxd -i >compileinfo.itxt.xxd.H'
+ 	@rm compileinfo.itxt.xxd
diff --git a/debian/patches/series b/debian/patches/series
index 77bee94..ee9caac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+make-reproducible
 fix_strange_link_issue.patch
 spelling.patch
diff --git a/debian/rules b/debian/rules
index 71d1343..5c0cd78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ export DH_VERBOSE=1
 #Hacky thing to allow building against tcmalloc without installing
 #troublesome libbgoogle-perftools-dev, see README.Debian
 export DEB_CFLAGS_MAINT_APPEND=-L$(CURDIR)/lib
+export DEBIAN_MAINTAINER=$(dpkg-parsechangelog -SMaintainer)
 
 pkg=mira-assembler
 exampledir=usr/share/doc/mira-examples/examples/minidemo/data/bbdataset1/

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