[ant] 02/02: Removed 0012-BZ-60582.patch (fixed upstream)

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Mar 1 10:31:36 UTC 2017


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

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

commit 7c2ac665ba5e7f6afeda6a70a25c639b5d8fe960
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 1 09:36:45 2017 +0100

    Removed 0012-BZ-60582.patch (fixed upstream)
---
 debian/changelog                   |  8 ++++++++
 debian/patches/0012-BZ-60582.patch | 17 -----------------
 debian/patches/series              |  1 -
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9759853..87f229a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ant (1.9.9-1) unstable; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Removed 0012-BZ-60582.patch (fixed upstream)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 01 Mar 2017 09:36:22 +0100
+
 ant (1.9.8-3) unstable; urgency=medium
 
   * Removed the newly introduced final modifier on Path.systemClasspath
diff --git a/debian/patches/0012-BZ-60582.patch b/debian/patches/0012-BZ-60582.patch
deleted file mode 100644
index 9e72609..0000000
--- a/debian/patches/0012-BZ-60582.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Remove the final modifier on Path.systemClasspath
-Origin: backport, https://github.com/apache/ant/commit/984a03d
-Bug: https://bz.apache.org/bugzilla/show_bug.cgi?id=60582
-Bug-Debian: https://bugs.debian.org/850553
---- a/src/main/org/apache/tools/ant/types/Path.java
-+++ b/src/main/org/apache/tools/ant/types/Path.java
-@@ -66,8 +66,9 @@
- public class Path extends DataType implements Cloneable, ResourceCollection {
-     // CheckStyle:VisibilityModifier OFF - bc
- 
-+    // non-final as some IDE integrations (at least Eclipse) want to override it
-     /** The system classpath as a Path object */
--    public static final Path systemClasspath =
-+    public static Path systemClasspath = //NOSONAR
-         new Path(null, System.getProperty("java.class.path"));
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index e833809..a74bc14 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0009-reproducible-timestamp-task.patch
 0010-reproducible-javadoc-task.patch
 0011-reproducible-propertyfile-task.patch
-0012-BZ-60582.patch

-- 
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