[bnd] 05/07: Use SOURCE_DATE_EPOCH for the Bnd-LastModified field

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository bnd.

commit 9a7a83fc42489ad6b234d04c9605124933f6c814
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 10 13:58:45 2016 +0200

    Use SOURCE_DATE_EPOCH for the Bnd-LastModified field
---
 debian/changelog                             |  1 +
 debian/patches/reproducible-timestamps.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2181b43..dddbce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ bnd (2.4.1-4) UNRELEASED; urgency=medium
   * Reproducibility improvements:
     - The value of the ${tstamp} and ${now} macros is now derived
       from SOURCE_DATE_EPOCH
+    - Use SOURCE_DATE_EPOCH for the Bnd-LastModified field
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 May 2016 09:01:16 +0200
 
diff --git a/debian/patches/reproducible-timestamps.patch b/debian/patches/reproducible-timestamps.patch
index 184c0e9..d6f9341 100644
--- a/debian/patches/reproducible-timestamps.patch
+++ b/debian/patches/reproducible-timestamps.patch
@@ -23,3 +23,14 @@ Forwarded: no
  		TimeZone tz = TimeZone.getTimeZone("UTC");
  
  		if (args.length > 1) {
+--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
++++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Analyzer.java
+@@ -628,7 +628,7 @@
+ 				main.putValue(CREATED_BY, System.getProperty("java.version") + " (" + System.getProperty("java.vendor")
+ 						+ ")");
+ 				main.putValue(TOOL, "Bnd-" + getBndVersion());
+-				main.putValue(BND_LASTMODIFIED, "" + System.currentTimeMillis());
++				main.putValue(BND_LASTMODIFIED, "" + (System.getenv("SOURCE_DATE_EPOCH") != null ? System.getenv("SOURCE_DATE_EPOCH") + "000" : System.currentTimeMillis()));
+ 			}
+ 
+ 			String exportHeader = printClauses(exports, true);

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