[ant] 03/04: Reproducible build: Use the date from debian/changelog in version.txt

[Emmanuel Bourg]

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

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

commit 637283ae5593a114e2df0fa7e45bd2a9961cd300
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sat Jun 6 16:39:35 2015 +0200

    Reproducible build: Use the date from debian/changelog in version.txt
---
 debian/changelog |  2 ++
 debian/rules     | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e757d4..78f38f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ant (1.9.5-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Refreshed the patches
+  * Improved the build reproducibility by using the date from the changelog
+    in version.txt
   * Moved the package to Git
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sat, 06 Jun 2015 15:28:46 +0200
diff --git a/debian/rules b/debian/rules
index 21d4f4b..f188803 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,10 +26,13 @@ export BOOTJAVAC_OPTS=-source 1.5 -target 1.5 -nowarn
 # needed for building with bootstrap ant
 export ANT_HOME := bootstrap
 
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAR_PATH := /usr/share/java
+PACKAGE   := $(DEB_SOURCE_PACKAGE)
+VERSION   := $(DEB_UPSTREAM_VERSION)
+JAR_PATH  := /usr/share/java
 CLASSPATH := ${JAR_PATH}/activation.jar:${JAR_PATH}/antlr.jar:${JAR_PATH}/bcel.jar:${JAR_PATH}/bsf.jar:${JAR_PATH}/commons-logging.jar:${JAR_PATH}/javax.mail.jar:${JAR_PATH}/inetlib.jar:${JAR_PATH}/jdepend.jar:${JAR_PATH}/junit.jar:${JAR_PATH}/log4j-1.2.jar:${JAR_PATH}/oro.jar:${JAR_PATH}/regexp.jar:${JAR_PATH}/xalan2.jar:${JAR_PATH}/xml-resolver-1.2.jar:${JAR_PATH}/commons-net.jar:${JAR_PATH}/jsch.jar:${JAR_PATH}/junit4.jar
+DATE      := $(shell dpkg-parsechangelog --show-field Date)
+TODAY     := $(shell date --date='$(DATE)' --utc +'%B %-d %Y')
+
 
 build-ant: stamp-build-ant
 stamp-build-ant:
@@ -37,7 +40,7 @@ stamp-build-ant:
 	install -d bootstrap/lib
 	/bin/sh bootstrap.sh
 	# the rest
-	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dbuild.classpath=${CLASSPATH} -propertyfile debian/ant.properties jars test-jar
+	/bin/sh bootstrap/bin/ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -Dbuild.classpath=${CLASSPATH} -propertyfile debian/ant.properties -DTODAY='${TODAY}' jars test-jar
 	touch stamp-build-ant
 
 build-ant-doc: stamp-build-ant-doc

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