[med-svn] [aghermann] 01/01: option to disable use __DATE__ to ensure reproducible builds

[andrei zavada]

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

hmmr-guest pushed a commit to branch WIP
in repository aghermann.

commit 24af7ef7cec10d36155cc004aa35355e5d99ac39
Author: Andrei Zavada <hmmr at ra>
Date:   Wed Feb 4 03:14:09 2015 +0200

    option to disable use __DATE__ to ensure reproducible builds
---
 debian/changelog                        | 8 ++++++++
 debian/rules                            | 2 ++
 upstream/ChangeLog                      | 4 ++++
 upstream/configure.ac                   | 2 +-
 upstream/src/aghermann/print_version.cc | 4 ++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 79c8bec..05a6add 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+aghermann (1.0.3-1) experimental; urgency=low
+
+  * New upstream version.
+  * Tweak CXXFLAGS to make builds reproducible (see
+    https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros).
+
+ -- Andrei Zavada <johnhommer at gmail.com>  Wed,  4 Feb 2015 02:09:00 +0200
+
 aghermann (1.0.2-1) unstable; urgency=low
 
   * New upstream version (Closes: #764820).
diff --git a/debian/rules b/debian/rules
index 4848fe9..9934dcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,8 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+CXXFLAGS += -D__REPRODUCIBLE_BUILD
+
 %:
 	dh $@ --with autoreconf
 
diff --git a/upstream/ChangeLog b/upstream/ChangeLog
index 500b339..14819eb 100644
--- a/upstream/ChangeLog
+++ b/upstream/ChangeLog
@@ -1,3 +1,7 @@
+v.1.0.3 (2015-02-03)
+	* Fix: Option to avoid using __DATE__ and __TIME__ (see
+	  https://wiki.debian.org/ReproducibleBuilds/TimestampsFromCPPMacros).
+
 v.1.0.2 (2014-10-14)
 	* Fix: Get desktop and icon files right.
 
diff --git a/upstream/configure.ac b/upstream/configure.ac
index 11d08d9..68a4c03 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -1,6 +1,6 @@
 AC_COPYRIGHT([Copyright (c) 2008-14 Andrei Zavada <johnhommer at gmail.com>])
 
-AC_INIT([Aghermann], [1.0.2], [johnhommer at gmail.com])
+AC_INIT([Aghermann], [1.0.3], [johnhommer at gmail.com])
 AC_CONFIG_SRCDIR([src/aghermann/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)
diff --git a/upstream/src/aghermann/print_version.cc b/upstream/src/aghermann/print_version.cc
index 40ead33..b23c201 100644
--- a/upstream/src/aghermann/print_version.cc
+++ b/upstream/src/aghermann/print_version.cc
@@ -15,7 +15,11 @@
 void
 print_version()
 {
+#ifdef __REPRODUCIBLE_BUILD
+        printf( PACKAGE_STRING "\n");
+#else
         printf( PACKAGE_STRING " built " __DATE__ " " __TIME__ " by " BUILT_BY "\n");
+#endif
 }
 
 // Local Variables:

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