Commit b0a1de3e authored by Emmanuel Bourg's avatar Emmanuel Bourg

Refreshed the patches

parent d02a2362
ant (1.10.4-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- Refreshed the patches
-- Emmanuel Bourg <ebourg@apache.org> Mon, 25 Jun 2018 12:57:35 +0200
ant (1.10.3-2) unstable; urgency=medium
* Team upload.
......
......@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1700,6 +1700,16 @@
@@ -1699,6 +1699,16 @@
*/
@Override
public void execute() throws BuildException {
......
......@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
@@ -238,6 +238,10 @@
@@ -227,6 +227,10 @@
*/
public static String getDateForHeader() {
Calendar cal = Calendar.getInstance();
......@@ -16,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 @@
@@ -247,6 +251,7 @@
}
tzMarker.append(minutes);
synchronized (DATE_HEADER_FORMAT_INT) {
......
......@@ -30,7 +30,7 @@ Forwarded: no
// scan source directories and dest directory to build up
// compile list
if (hasPath(src)) {
@@ -1722,4 +1722,24 @@
@@ -1713,4 +1713,24 @@
0x00, 0x00, 0x00, 0x02, 0x00, 0x04
};
......@@ -57,7 +57,7 @@ Forwarded: no
}
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -2174,7 +2174,7 @@
@@ -2160,7 +2160,7 @@
: getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
if (sourceArg != null) {
toExecute.createArgument().setValue("-source");
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -2177,6 +2177,11 @@
@@ -2163,6 +2163,11 @@
toExecute.createArgument().setValue(LanguageLevel.adjust(sourceArg, "javadoc -source", this));
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment