[ant] 06/16: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Mar 29 08:42:55 BST 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ant.
commit d298507520851713cf9a70477cd4bd65d88e2029
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Mar 28 01:08:58 2018 +0200
Refreshed the patches
---
debian/changelog | 4 +++-
.../patches/0009-reproducible-timestamp-task.patch | 24 ++++++++--------------
.../patches/0010-reproducible-javadoc-task.patch | 12 +++--------
.../0011-reproducible-propertyfile-task.patch | 14 ++++---------
debian/patches/0013-auto-adjust-target.patch | 8 ++++----
5 files changed, 23 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 86e7498..9d0e983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-ant (1.9.10-3) UNRELEASED; urgency=medium
+ant (1.10.0-1) UNRELEASED; urgency=medium
+ * New upstream release
+ - Refreshed the patches
* Adjust the source/target level to 1.7 in anticipation of the 1.6 removal
in Java 11
* Added activation.jar to the build classpath to fix the empty ant-javamail
diff --git a/debian/patches/0009-reproducible-timestamp-task.patch b/debian/patches/0009-reproducible-timestamp-task.patch
index bdb96a4..9a1b6b9 100644
--- a/debian/patches/0009-reproducible-timestamp-task.patch
+++ b/debian/patches/0009-reproducible-timestamp-task.patch
@@ -1,17 +1,11 @@
-From: Emmanuel Bourg <ebourg at apache.org>
-Date: Mon, 28 Mar 2016 01:45:52 +0200
-Subject: Add support for the SOURCE_DATE_EPOCH variable in the Tstamp task
-
+Description: Add support for the SOURCE_DATE_EPOCH variable in the Tstamp task
+Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
----
- src/main/org/apache/tools/ant/taskdefs/Tstamp.java | 39 ++++++++++++++++++++++
- 1 file changed, 39 insertions(+)
-
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
-@@ -71,20 +71,51 @@
+@@ -70,20 +70,51 @@
try {
- Date d = getNow();
+ Date d = new Date();
+ boolean reproducibleBuild = false;
+
@@ -41,27 +35,27 @@ Forwarded: no
cts.execute(getProject(), d, getLocation());
}
- SimpleDateFormat dstamp = new SimpleDateFormat("yyyyMMdd");
+ SimpleDateFormat dstamp = new SimpleDateFormat ("yyyyMMdd");
+ if (reproducibleBuild) {
+ dstamp.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));
+ }
setProperty("DSTAMP", dstamp.format(d));
- SimpleDateFormat tstamp = new SimpleDateFormat("HHmm");
+ SimpleDateFormat tstamp = new SimpleDateFormat ("HHmm");
+ if (reproducibleBuild) {
+ tstamp.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));
+ }
setProperty("TSTAMP", tstamp.format(d));
SimpleDateFormat today
- = new SimpleDateFormat("MMMM d yyyy", Locale.US);
+ = new SimpleDateFormat ("MMMM d yyyy", Locale.US);
+ if (reproducibleBuild) {
+ today.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));
+ }
setProperty("TODAY", today.format(d));
} catch (Exception e) {
-@@ -200,6 +231,10 @@
+@@ -183,6 +214,10 @@
}
}
@@ -72,7 +66,7 @@ Forwarded: no
/**
* The timezone to use for displaying time.
* The values are as defined by the Java TimeZone class.
-@@ -210,6 +245,10 @@
+@@ -193,6 +228,10 @@
timeZone = TimeZone.getTimeZone(id);
}
diff --git a/debian/patches/0010-reproducible-javadoc-task.patch b/debian/patches/0010-reproducible-javadoc-task.patch
index 35e68ae..937d795 100644
--- a/debian/patches/0010-reproducible-javadoc-task.patch
+++ b/debian/patches/0010-reproducible-javadoc-task.patch
@@ -1,17 +1,11 @@
-From: Emmanuel Bourg <ebourg at apache.org>
-Date: Mon, 28 Mar 2016 02:00:16 +0200
-Subject: Improves the reproducibility of the javadoc task for the Debian
+Description: Improves the reproducibility of the javadoc task for the Debian
builds by setting the locale to 'en' and the encoding to UTF-8 if none was
specified and SOURCE_DATE_EPOCH is set.
-
+Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
----
- src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -1707,6 +1707,16 @@
+@@ -1703,6 +1703,16 @@
*/
@Override
public void execute() throws BuildException {
diff --git a/debian/patches/0011-reproducible-propertyfile-task.patch b/debian/patches/0011-reproducible-propertyfile-task.patch
index 343d97b..bb4d0d1 100644
--- a/debian/patches/0011-reproducible-propertyfile-task.patch
+++ b/debian/patches/0011-reproducible-propertyfile-task.patch
@@ -1,17 +1,11 @@
-From: Emmanuel Bourg <ebourg at apache.org>
-Date: Tue, 24 May 2016 00:22:11 +0200
-Subject: Improves the reproducibility of the propertyfile task for the Debian
+Description: Improves the reproducibility of the propertyfile task for the Debian
builds by using the date specified by the SOURCE_DATE_EPOCH variable in the
header of the .properties file generated
-
+Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
----
- src/main/org/apache/tools/ant/util/DateUtils.java | 5 +++++
- 1 file changed, 5 insertions(+)
-
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
-@@ -238,6 +238,10 @@
+@@ -208,6 +208,10 @@
*/
public static String getDateForHeader() {
Calendar cal = Calendar.getInstance();
@@ -22,7 +16,7 @@ Forwarded: no
TimeZone tz = cal.getTimeZone();
int offset = tz.getOffset(cal.get(Calendar.ERA),
cal.get(Calendar.YEAR),
-@@ -258,6 +262,7 @@
+@@ -228,6 +232,7 @@
}
tzMarker.append(minutes);
synchronized (DATE_HEADER_FORMAT_INT) {
diff --git a/debian/patches/0013-auto-adjust-target.patch b/debian/patches/0013-auto-adjust-target.patch
index 98153cf..a820483 100644
--- a/debian/patches/0013-auto-adjust-target.patch
+++ b/debian/patches/0013-auto-adjust-target.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
Forwarded: no
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
-@@ -210,7 +210,10 @@
+@@ -207,7 +207,10 @@
*/
public String getSource() {
return source != null
@@ -15,7 +15,7 @@ Forwarded: no
}
/**
-@@ -789,7 +792,10 @@
+@@ -786,7 +789,10 @@
public String getTarget() {
return targetAttribute != null
? targetAttribute
@@ -27,7 +27,7 @@ Forwarded: no
}
/**
-@@ -1118,6 +1124,9 @@
+@@ -1109,6 +1115,9 @@
checkParameters();
resetFileLists();
@@ -39,7 +39,7 @@ Forwarded: no
if (hasPath(src)) {
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2207,7 +2207,12 @@
+@@ -2203,7 +2203,12 @@
: getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
if (sourceArg != null) {
toExecute.createArgument().setValue("-source");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git
More information about the pkg-java-commits
mailing list