[SCM] glyr/master: use BUILD_DATE and BUILD_TIME

[emillon-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e39927aeadfa542effab09f4bc42385172e7e9bd
Author: Etienne Millon <me at emillon.org>
Date:   Sun Nov 15 13:44:32 2015 +0100

    use BUILD_DATE and BUILD_TIME

diff --git a/debian/changelog b/debian/changelog
index 078e5f7..8f03865 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+glyr (1.0.8-2) UNRELEASED; urgency=medium
+
+  * Set build date from BUILD_DATE and BUILD_TIME instead of cpp macros.
+
+ -- Etienne Millon <me at emillon.org>  Sun, 15 Nov 2015 13:43:41 +0100
+
 glyr (1.0.8-1) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/patches/build-date.patch b/debian/patches/build-date.patch
new file mode 100644
index 0000000..e04f622
--- /dev/null
+++ b/debian/patches/build-date.patch
@@ -0,0 +1,36 @@
+--- a/lib/glyr.c
++++ b/lib/glyr.c
+@@ -243,10 +243,17 @@
+ 
+ /////////////////////////////////
+ 
++#ifndef BUILD_DATE
++#define BUILD_DATE __DATE__
++#endif
++#ifndef BUILD_TIME
++#define BUILD_TIME __TIME__
++#endif
++
+ __attribute__ ( (visibility ("default") ) )
+ const char * glyr_version (void)
+ {
+-    return "Version "GLYR_VERSION_MAJOR"."GLYR_VERSION_MINOR"."GLYR_VERSION_MICRO" ("GLYR_VERSION_NAME") of ["__DATE__"] compiled at ["__TIME__"]";
++    return "Version "GLYR_VERSION_MAJOR"."GLYR_VERSION_MINOR"."GLYR_VERSION_MICRO" ("GLYR_VERSION_NAME") of ["BUILD_DATE"] compiled at ["BUILD_TIME"]";
+ }
+ 
+ /////////////////////////////////
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -6,6 +6,12 @@
+ 
+ SET(GENERIC_LIB_VERSION ${GLYR_VERSION_MAJOR}.${GLYR_VERSION_MINOR})
+ SET(GLYR_API_SOVERSION 1)
++IF(DEFINED ENV{BUILD_DATE})
++    ADD_DEFINITIONS(-DBUILD_DATE="$ENV{BUILD_DATE}")
++ENDIF()
++IF(DEFINED ENV{BUILD_TIME})
++    ADD_DEFINITIONS(-DBUILD_TIME="$ENV{BUILD_TIME}")
++ENDIF()
+ 
+ # Link libglyr as shared library
+ ADD_LIBRARY(glyr SHARED	${LIB_SOURCE_LOCATIONS})
diff --git a/debian/patches/series b/debian/patches/series
index 6130e6d..b75b288 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Don-t-strip-binaries.patch
+build-date.patch
diff --git a/debian/rules b/debian/rules
index 327cb35..ed81764 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,10 @@
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+PACKAGE_DATETIME = $(shell dpkg-parsechangelog -SDate)
+export BUILD_DATE=$(shell LC_ALL=C date -u --date="$(PACKAGE_DATETIME)" +"%b %e %Y")
+export BUILD_TIME=$(shell LC_ALL=C date -u --date="$(PACKAGE_DATETIME)" +"%H:%M:%S")
+
 %:
 	dh $@ 
 

-- 
glyr packaging