[openjk] 01/02: Correct `date` invocation for $SOURCE_DATE_EPOCH

[Simon McVittie]

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

smcv pushed a commit to branch debian/master
in repository openjk.

commit 1fe084103bab214fa4017f4c0c14765c63121459
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Sep 22 08:19:09 2016 +0100

    Correct `date` invocation for $SOURCE_DATE_EPOCH
---
 debian/changelog                                                    | 6 ++++++
 .../Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch   | 4 ++--
 debian/patches/series                                               | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f853366..2fb3d02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openjk (0~20160911+dfsg1-2) UNRELEASED; urgency=medium
+
+  * Correct `date` invocation for $SOURCE_DATE_EPOCH
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 22 Sep 2016 08:18:53 +0100
+
 openjk (0~20160911+dfsg1-1) experimental; urgency=medium
 
   * New upstream snapshot
diff --git a/debian/patches/Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch b/debian/patches/Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch
index 76d8d34..f6cc48e 100644
--- a/debian/patches/Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch
+++ b/debian/patches/Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch
@@ -15,7 +15,7 @@ Subject: Allow __DATE__ to be overridden, for reproducible builds
  9 files changed, 27 insertions(+), 10 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d6130ba..353c234 100644
+index d6130ba..a6c03bf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -301,6 +301,15 @@ if(BuildPortableVersion)
@@ -25,7 +25,7 @@ index d6130ba..353c234 100644
 +# https://reproducible-builds.org/specs/source-date-epoch/
 +if (NOT ("$ENV{SOURCE_DATE_EPOCH}" STREQUAL ""))
 +	execute_process(COMMAND "date"
-+		"--date=$ENV{SOURCE_DATE_EPOCH}" "+%b %_d %Y"
++		"--date=@$ENV{SOURCE_DATE_EPOCH}" "+%b %_d %Y"
 +		OUTPUT_VARIABLE source_date
 +		ERROR_QUIET
 +		OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/debian/patches/series b/debian/patches/series
index 2718359..9111d9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
 Fix-a-typo-in-Siege-mode-attemtping-attempting.patch
-Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch
 Declare-platform-independent-byteswapping-functions-QINLI.patch
+Allow-__DATE__-to-be-overridden-for-reproducible-builds.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git