[gle-graphics] 18/23: Import Debian changes 4.2.5-2

[Christian T. Steigies]

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

cts pushed a commit to branch master
in repository gle-graphics.

commit d8fb114ae6251326102f2ef5ce4c32d4066c5a55
Author: Christian T. Steigies <cts at debian.org>
Date:   Sun Mar 20 17:07:38 2016 +0100

    Import Debian changes 4.2.5-2
    
    gle-graphics (4.2.5-2) unstable; urgency=medium
    
      * build reproducibly by passing SOURCE_DATE_EPOCH to build
      * updated Standards-Version to 3.9.7 (no changes)
      * set Maintainer to Debian Science Maintainers and add myself to Uploaders
      * added Vcs fields
---
 debian/changelog                 |  9 +++++++++
 debian/control                   |  7 +++++--
 debian/patches/series            |  1 +
 debian/patches/source_date_epoch | 31 +++++++++++++++++++++++++++++++
 debian/rules                     |  8 ++++++--
 5 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5629e2e..663dbc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gle-graphics (4.2.5-2) unstable; urgency=medium
+
+  * build reproducibly by passing SOURCE_DATE_EPOCH to build
+  * updated Standards-Version to 3.9.7 (no changes)
+  * set Maintainer to Debian Science Maintainers and add myself to Uploaders
+  * added Vcs fields
+
+ -- Christian T. Steigies <cts at debian.org>  Sun, 20 Mar 2016 17:07:38 +0100
+
 gle-graphics (4.2.5-1) unstable; urgency=medium
 
   * new upstream version
diff --git a/debian/control b/debian/control
index eaaed0a..1435ccb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: gle-graphics
 Section: graphics
 Priority: optional
-Maintainer: Christian T. Steigies <cts at debian.org>
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Christian T. Steigies <cts at debian.org>
 Build-Depends: automake,
                autotools-dev,
                debhelper (>= 9),
@@ -20,8 +21,10 @@ Build-Depends: automake,
                pkg-config,
                texlive,
                texlive-latex-extra
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: http://glx.sf.net
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gle-graphics.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/gle-graphics.git
 
 Package: gle-graphics
 Architecture: any
diff --git a/debian/patches/series b/debian/patches/series
index dd15d9f..b52f466 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kfreebsd-buildd-has-no-proc
 qmake
+source_date_epoch
diff --git a/debian/patches/source_date_epoch b/debian/patches/source_date_epoch
new file mode 100644
index 0000000..4278730
--- /dev/null
+++ b/debian/patches/source_date_epoch
@@ -0,0 +1,31 @@
+Index: gle-graphics-4.2.5/src/gle/core.cpp
+===================================================================
+--- gle-graphics-4.2.5.orig/src/gle/core.cpp
++++ gle-graphics-4.2.5/src/gle/core.cpp
+@@ -176,13 +176,24 @@ void g_get_version(string* version) {
+ }
+ 
+ void g_get_build_date(string* date) {
++	unsigned long epoch;
++	char *c_time_string;
+ 	date->resize(0);
+-#if defined(__TIME__) && defined(__DATE__)
++#if defined(DEBIAN_EPOCH)
++	// convert seconds since 1970 into date string
++	const time_t build = DEBIAN_EPOCH;
++	struct tm *tm = gmtime(&build);
++	char buf[20];
++	strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tm);
++	string bdate(buf);
++#else
++  #if defined(__TIME__) && defined(__DATE__)
+ 	string bdate(__DATE__);
+ 	bdate += " "; bdate += __TIME__;
+ 	str_replace_all(bdate, "  ", " ");
+-	*date = bdate;
++  #endif
+ #endif
++	*date = bdate;
+ }
+ 
+ string g_get_version() {
diff --git a/debian/rules b/debian/rules
index 1411ab2..9864245 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,20 +2,24 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
 
 # fix build problems on the hurd
 ifeq ($(DEB_HOST_ARCH),hurd-i386)
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-as-needed -Wl,-lpthread -Wl,--as-needed -fPIC
 endif
 
+# get source date in seconds since 1970 and pass it to the build
+SOURCE_DATE_EPOCH=$(shell date -d "$$(dpkg-parsechangelog --count 1 -SDate)" +%s)
+export DEB_CPPFLAGS_MAINT_APPEND = -DDEBIAN_EPOCH=$(SOURCE_DATE_EPOCH)
+
 %:
 #	dh $@ --with autoreconf
 	dh $@ --with autotools_dev
 #	dh $@ --with autotools_dev,autoreconf
 
 override_dh_auto_build:
-	make	
+	make
 	make doc
 
 override_dh_auto_clean:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gle-graphics.git