[zookeeper] 02/03: Use the changelog date as the build date in Info.java

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Apr 28 13:32:09 UTC 2015


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

ebourg-guest pushed a commit to annotated tag debian/3.4.6-4
in repository zookeeper.

commit 330896cc76d8c7eb1763ce2d651a18368c585bdd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 28 14:58:21 2015 +0200

    Use the changelog date as the build date in Info.java
---
 debian/changelog | 5 +++--
 debian/rules     | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5504ba..6cce87e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 zookeeper (3.4.6-4) UNRELEASED; urgency=medium
 
   * Team upload.
-  * Improved the build reproducibility by removing the Built-At, Built-By
-    and Built-On entries in the manifests.
+  * Improved the build reproducibility:
+    - Removed the Built-At, Built-By and Built-On entries in the manifests
+    - Use the changelog date as the build date in Info.java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 28 Apr 2015 10:03:34 +0200
 
diff --git a/debian/rules b/debian/rules
index ab870a4..8ed0841 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java
 PYVERS := $(shell pyversions -vr)
 DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_CHANGELOG_DATETIME = $(shell dpkg-parsechangelog --show-field Date)
 
 %:
 	dh $@ --with javahelper --with python2
@@ -15,7 +16,7 @@ override_dh_auto_build:
 	javacc -OUTPUT_DIRECTORY=src/java/main/org/apache/jute/compiler/generated src/java/main/org/apache/jute/compiler/generated/rcc.jj
 	# the upstream build file includes .java files in the jars. Let's create the jars ourselves.
 	# see: https://issues.apache.org/jira/browse/ZOOKEEPER-537
-	ant -Dversion=$(DEB_UPSTREAM_VERSION) -DlastRevision=-1 javadoc javadoc-dev jar
+	ant -Dversion=$(DEB_UPSTREAM_VERSION) -DlastRevision=-1 '-Dbuild.time=$(DEB_CHANGELOG_DATETIME)' javadoc javadoc-dev jar
 
 	# Compile C library
 	cd src/c && autoreconf -i

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



More information about the pkg-java-commits mailing list