[ant] 01/03: Switch patch headers to "gbp pq" style
Chris West
faux-guest at moszumanska.debian.org
Tue Dec 12 15:51:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
faux-guest pushed a commit to branch master
in repository ant.
commit 7fe33da90a90268ffda9593231b9b11f4ded5223
Author: Chris West (Faux) <git at goeswhere.com>
Date: Tue Dec 12 13:59:16 2017 +0000
Switch patch headers to "gbp pq" style
---
.../patches/0009-reproducible-timestamp-task.patch | 18 ++++++++++----
.../patches/0010-reproducible-javadoc-task.patch | 14 ++++++++---
.../0011-reproducible-propertyfile-task.patch | 20 ++++++++++-----
debian/patches/0013-auto-adjust-target.patch | 29 +++++++++++++++++-----
4 files changed, 61 insertions(+), 20 deletions(-)
diff --git a/debian/patches/0009-reproducible-timestamp-task.patch b/debian/patches/0009-reproducible-timestamp-task.patch
index 9a1b6b9..22b7f99 100644
--- a/debian/patches/0009-reproducible-timestamp-task.patch
+++ b/debian/patches/0009-reproducible-timestamp-task.patch
@@ -1,9 +1,17 @@
-Description: Add support for the SOURCE_DATE_EPOCH variable in the Tstamp task
-Author: Emmanuel Bourg <ebourg at apache.org>
+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
+
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 @@
+@@ -70,20 +70,51 @@ public class Tstamp extends Task {
try {
Date d = new Date();
@@ -55,7 +63,7 @@ Forwarded: no
setProperty("TODAY", today.format(d));
} catch (Exception e) {
-@@ -183,6 +214,10 @@
+@@ -183,6 +214,10 @@ public class Tstamp extends Task {
}
}
@@ -66,7 +74,7 @@ Forwarded: no
/**
* The timezone to use for displaying time.
* The values are as defined by the Java TimeZone class.
-@@ -193,6 +228,10 @@
+@@ -193,6 +228,10 @@ public class Tstamp extends Task {
timeZone = TimeZone.getTimeZone(id);
}
diff --git a/debian/patches/0010-reproducible-javadoc-task.patch b/debian/patches/0010-reproducible-javadoc-task.patch
index 937d795..bcb1378 100644
--- a/debian/patches/0010-reproducible-javadoc-task.patch
+++ b/debian/patches/0010-reproducible-javadoc-task.patch
@@ -1,11 +1,19 @@
-Description: Improves the reproducibility of the javadoc task for the Debian
+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
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(+)
+
+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 @@
+@@ -1703,6 +1703,16 @@ public class Javadoc extends Task {
*/
@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 b578eb1..cc35b6d 100644
--- a/debian/patches/0011-reproducible-propertyfile-task.patch
+++ b/debian/patches/0011-reproducible-propertyfile-task.patch
@@ -1,11 +1,19 @@
-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>
+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
+ builds by using the date specified by the SOURCE_DATE_EPOCH variable in the
+ header of the .properties file generated
+
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 @@
+@@ -208,6 +208,10 @@ public final class DateUtils {
*/
public static String getDateForHeader() {
Calendar cal = Calendar.getInstance();
@@ -16,7 +24,7 @@ Forwarded: no
TimeZone tz = cal.getTimeZone();
int offset = tz.getOffset(cal.get(Calendar.ERA),
cal.get(Calendar.YEAR),
-@@ -228,6 +232,7 @@
+@@ -228,6 +232,7 @@ public final class DateUtils {
}
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 5345d7b..223bbdd 100644
--- a/debian/patches/0013-auto-adjust-target.patch
+++ b/debian/patches/0013-auto-adjust-target.patch
@@ -1,9 +1,21 @@
-Description: Adjust the source/target level automatically for Debian builds with Java 9
-Author: Emmanuel Bourg <ebourg at apache.org>, Chris West (Faux) <debian at fau.xxx>
+From: "ebourg at apache.org" <ebourg at apache.org>
+Date: Fri, 30 Jun 2017 00:35:44 +0200
+Subject: Adjust the source/target level automatically for Debian builds with
+ Java 9
+
Forwarded: no
+---
+ src/main/org/apache/tools/ant/taskdefs/Javac.java | 13 +++++-
+ .../org/apache/tools/ant/taskdefs/Javadoc.java | 2 +-
+ .../apache/tools/ant/taskdefs/LanguageLevel.java | 53 ++++++++++++++++++++++
+ 3 files changed, 65 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 @@
+@@ -207,7 +207,10 @@ public class Javac extends MatchingTask {
*/
public String getSource() {
return source != null
@@ -15,7 +27,7 @@ Forwarded: no
}
/**
-@@ -786,7 +789,10 @@
+@@ -786,7 +789,10 @@ public class Javac extends MatchingTask {
public String getTarget() {
return targetAttribute != null
? targetAttribute
@@ -27,7 +39,7 @@ Forwarded: no
}
/**
-@@ -1109,6 +1115,9 @@
+@@ -1109,6 +1115,9 @@ public class Javac extends MatchingTask {
checkParameters();
resetFileLists();
@@ -37,9 +49,11 @@ Forwarded: no
// 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..814ec8d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2203,7 +2203,7 @@
+@@ -2203,7 +2203,7 @@ public class Javadoc extends Task {
: getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
if (sourceArg != null) {
toExecute.createArgument().setValue("-source");
@@ -48,6 +62,9 @@ Forwarded: no
}
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..e781fb2
--- /dev/null
+++ b/src/main/org/apache/tools/ant/taskdefs/LanguageLevel.java
@@ -0,0 +1,53 @@
--
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