This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ant.
commit 12c2a1746de864da02e3e0caf26e2915be0c6749
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Feb 23 12:57:48 2018 +0100
Refreshed the patches
---
debian/changelog | 4 +++-
debian/patches/0009-reproducible-timestamp-task.patch | 16 +++++++---------
debian/patches/0010-reproducible-javadoc-task.patch | 4 +---
debian/patches/0011-reproducible-propertyfile-task.patch | 6 ++----
debian/patches/0013-auto-adjust-target.patch | 15 ++++-----------
5 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4d36e9c..8e5846e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-ant (1.9.9-7) UNRELEASED; urgency=medium
+ant (1.9.10-1) UNRELEASED; urgency=medium
+ * New upstream release
+ - Refreshed the patches
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
diff --git a/debian/patches/0009-reproducible-timestamp-task.patch
b/debian/patches/0009-reproducible-timestamp-task.patch
index 22b7f99..bdb96a4 100644
--- a/debian/patches/0009-reproducible-timestamp-task.patch
+++ b/debian/patches/0009-reproducible-timestamp-task.patch
@@ -7,13 +7,11 @@ Forwarded: no
src/main/org/apache/tools/ant/taskdefs/Tstamp.java | 39 ++++++++++++++++++++++
1 file changed, 39 insertions(+)
-diff --git a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
-index 805427a..36acc6b 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
-@@ -70,20 +70,51 @@ public class Tstamp extends Task {
+@@ -71,20 +71,51 @@
try {
- Date d = new Date();
+ Date d = getNow();
+ boolean reproducibleBuild = false;
+
@@ -43,27 +41,27 @@ index 805427a..36acc6b 100644
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) {
-@@ -183,6 +214,10 @@ public class Tstamp extends Task {
+@@ -200,6 +231,10 @@
}
}
@@ -74,7 +72,7 @@ index 805427a..36acc6b 100644
/**
* The timezone to use for displaying time.
* The values are as defined by the Java TimeZone class.
-@@ -193,6 +228,10 @@ public class Tstamp extends Task {
+@@ -210,6 +245,10 @@
timeZone = TimeZone.getTimeZone(id);
}
diff --git a/debian/patches/0010-reproducible-javadoc-task.patch
b/debian/patches/0010-reproducible-javadoc-task.patch
index bcb1378..35e68ae 100644
--- a/debian/patches/0010-reproducible-javadoc-task.patch
+++ b/debian/patches/0010-reproducible-javadoc-task.patch
@@ -9,11 +9,9 @@ Forwarded: no
src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 10 ++++++++++
1 file changed, 10 insertions(+)
-diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-index ebdce49..b9cc3b8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -1703,6 +1703,16 @@ public class Javadoc extends Task {
+@@ -1707,6 +1707,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 cc35b6d..343d97b 100644
--- a/debian/patches/0011-reproducible-propertyfile-task.patch
+++ b/debian/patches/0011-reproducible-propertyfile-task.patch
@@ -9,11 +9,9 @@ Forwarded: no
src/main/org/apache/tools/ant/util/DateUtils.java | 5 +++++
1 file changed, 5 insertions(+)
-diff --git a/src/main/org/apache/tools/ant/util/DateUtils.java
b/src/main/org/apache/tools/ant/util/DateUtils.java
-index 9ce737b..b4337d5 100644
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
-@@ -208,6 +208,10 @@ public final class DateUtils {
+@@ -238,6 +238,10 @@
*/
public static String getDateForHeader() {
Calendar cal = Calendar.getInstance();
@@ -24,7 +22,7 @@ index 9ce737b..b4337d5 100644
TimeZone tz = cal.getTimeZone();
int offset = tz.getOffset(cal.get(Calendar.ERA),
cal.get(Calendar.YEAR),
-@@ -228,6 +232,7 @@ public final class DateUtils {
+@@ -258,6 +262,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 6ab2bde..0b76165 100644
--- a/debian/patches/0013-auto-adjust-target.patch
+++ b/debian/patches/0013-auto-adjust-target.patch
@@ -11,11 +11,9 @@ Forwarded: no
3 files changed, 79 insertions(+), 3 deletions(-)
create mode 100644 src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java
-diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java
b/src/main/org/apache/tools/ant/taskdefs/Javac.java
-index 23c19dd..fbdf409 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
-@@ -207,7 +207,10 @@ public class Javac extends MatchingTask {
+@@ -210,7 +210,10 @@
*/
public String getSource() {
return source != null
@@ -27,7 +25,7 @@ index 23c19dd..fbdf409 100644
}
/**
-@@ -786,7 +789,10 @@ public class Javac extends MatchingTask {
+@@ -789,7 +792,10 @@
public String getTarget() {
return targetAttribute != null
? targetAttribute
@@ -39,7 +37,7 @@ index 23c19dd..fbdf409 100644
}
/**
-@@ -1109,6 +1115,9 @@ public class Javac extends MatchingTask {
+@@ -1118,6 +1124,9 @@
checkParameters();
resetFileLists();
@@ -49,11 +47,9 @@ index 23c19dd..fbdf409 100644
// scan source directories and dest directory to build up
// compile list
if (hasPath(src)) {
-diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-index b9cc3b8..0404ae7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2203,7 +2203,12 @@ public class Javadoc extends Task {
+@@ -2207,7 +2207,12 @@
: getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
if (sourceArg != null) {
toExecute.createArgument().setValue("-source");
@@ -67,9 +63,6 @@ index b9cc3b8..0404ae7 100644
}
if (linksource && doclet == null) {
-diff --git a/src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java
b/src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java
-new file mode 100644
-index 0000000..20a37d9
--- /dev/null
+++ b/src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java
@@ -0,0 +1,62 @@
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/ant.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
