[med-svn] [aghermann] 05/05: don't bother setting or printing built_by

[andrei zavada]

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

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

commit 945862e77844e3d65cfa597e999160b45a89c584
Author: Andrei Zavada <hmmr at frdg>
Date:   Fri Aug 5 01:58:06 2016 +0300

    don't bother setting or printing built_by
    
    this is to make builds (very) reproducible, per Debian policy.
---
 debian/changelog                        |  6 ++++++
 upstream/ChangeLog                      |  3 +++
 upstream/configure.ac                   |  3 +--
 upstream/data/ui/mw-dialogs.glade       |  7 ++++++-
 upstream/src/aghermann/Makefile.am      |  4 ----
 upstream/src/aghermann/main.cc          |  3 ++-
 upstream/src/aghermann/print_version.cc | 19 -------------------
 7 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f986b63..da02029 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+aghermann (1.1.1-1) unstable; urgency=low
+
+  * New upstream version (Closes: #833472).
+
+ -- Andrei Zavada <johnhommer at gmail.com>  Fri,  5 Aug 2016 00:35:00 +0200
+
 aghermann (1.1.0-1) unstable; urgency=low
 
   * New upstream version (Closes: #824574).
diff --git a/upstream/ChangeLog b/upstream/ChangeLog
index b88a4f9..a83da18 100644
--- a/upstream/ChangeLog
+++ b/upstream/ChangeLog
@@ -1,3 +1,6 @@
+v.1.1.1 (2016-08-05)
+	* Misc: Ensure reproducible build #2.
+
 v.1.1.0 (2016-06-24)
 	* New: Allow multiple instances, and use session lock files.
 
diff --git a/upstream/configure.ac b/upstream/configure.ac
index 4893a30..e340c6f 100644
--- a/upstream/configure.ac
+++ b/upstream/configure.ac
@@ -1,6 +1,6 @@
 AC_COPYRIGHT([Copyright (c) 2008-16 Andrei Zavada <johnhommer at gmail.com>])
 
-AC_INIT([Aghermann], [1.1.0], [johnhommer at gmail.com])
+AC_INIT([Aghermann], [1.1.1], [johnhommer at gmail.com])
 AC_CONFIG_SRCDIR([src/aghermann/main.cc])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PREREQ(2.61)
@@ -190,7 +190,6 @@ if test x$enable_update_mime_database = xyes ; then
 fi
 
 dnl Any private defines
-AC_SUBST(user, [`whoami`@`hostname`])
 AC_SUBST(build_date, [`date --utc --date=@${SOURCE_DATE_EPOCH:-$(date +%s)} +"%F"`])
 AC_SUBST(build_datetime, [`date --utc --date=@${SOURCE_DATE_EPOCH:-$(date +%s)}`])
 
diff --git a/upstream/data/ui/mw-dialogs.glade b/upstream/data/ui/mw-dialogs.glade
index 27b71c0..60420aa 100644
--- a/upstream/data/ui/mw-dialogs.glade
+++ b/upstream/data/ui/mw-dialogs.glade
@@ -1534,7 +1534,7 @@
                     <property name="valign">start</property>
                     <property name="xpad">5</property>
                     <property name="ypad">15</property>
-                    <property name="label"><b><big><big>Aghermann 1.1.0 </big></big></b>
+                    <property name="label"><b><big><big>Aghermann 1.1.1 </big></big></b>
 <a href="http://johnhommer.com/academic/code/aghermann">johnhommer.com/academic/code/aghermann</a></property>
                     <property name="use_markup">True</property>
                     <property name="xalign">0</property>
@@ -1631,6 +1631,11 @@ With bug reports, open an issue on <a href="http://github.com/hmmr/aghermann/
                             <property name="xpad">10</property>
                             <property name="ypad">10</property>
                             <property name="label">
+<b>v. 1.1.1</b> (2016-08-05)
+<span font="monospace" size="small">
+	* Misc: Remove built_by define to ensure reproducible build
+	  (required by Debian).
+</span>
 <b>v. 1.1.0</b> (2016-06-24)
 <span font="monospace" size="small">
 	* New: Allow multiple instances, and use session lock files.
diff --git a/upstream/src/aghermann/Makefile.am b/upstream/src/aghermann/Makefile.am
index af0f43b..8ec8ed6 100644
--- a/upstream/src/aghermann/Makefile.am
+++ b/upstream/src/aghermann/Makefile.am
@@ -123,14 +123,10 @@ aghermann_SOURCES := \
 	ui/ui.cc \
 	ui/ui.hh \
 	ui/ui-itpp.hh \
-	print_version.cc \
 	main.cc \
 	globals.cc \
 	globals.hh
 
-print_version.o: FORCE
-FORCE:
-
 aghermann_LDADD := \
 	../libmetrics/libmetrics.la \
 	../libsigproc/libsigproc.la \
diff --git a/upstream/src/aghermann/main.cc b/upstream/src/aghermann/main.cc
index 62b436d..1fb8386 100644
--- a/upstream/src/aghermann/main.cc
+++ b/upstream/src/aghermann/main.cc
@@ -10,6 +10,7 @@
  */
 
 
+#include <cstdio>
 
 #ifdef _OPENMP
 # include <omp.h>
@@ -37,7 +38,7 @@ void print_usage( const char*);
 int
 main( int argc, char **argv)
 {
-        print_version();
+        puts( PACKAGE_STRING "\n");
 
         bool headless = false;
         string lf_fname = "";
diff --git a/upstream/src/aghermann/print_version.cc b/upstream/src/aghermann/print_version.cc
deleted file mode 100644
index c3c2d6c..0000000
--- a/upstream/src/aghermann/print_version.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *       File name:  aghermann/print_version.cc
- *         Project:  Aghermann
- *          Author:  Andrei Zavada <johnhommer at gmail.com>
- * Initial version:  2013-05-28
- *
- *         Purpose:  print version (separate file for every make to always touch it)
- *
- *         License:  GPL
- */
-
-#include <cstdio>
-#include "config.h"
-
-void
-print_version()
-{
-        printf( PACKAGE_STRING " built " __DATE__ " " __TIME__ " by " BUILT_BY "\n");
-}

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