[gant] 40/51: Removed 01_fix_ant_1.9_api_changes.diff (fixed upstream)

[Emmanuel Bourg]

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

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

commit 333aa88e85bfa8294ee00408654bff28e75fff16
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 31 12:22:12 2015 +0200

    Removed 01_fix_ant_1.9_api_changes.diff (fixed upstream)
---
 debian/build.xml                               |  2 +-
 debian/changelog                               |  4 +++-
 debian/patches/01_fix_ant_1.9_api_changes.diff | 23 -----------------------
 debian/patches/series                          |  1 -
 4 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index ee40e5b..ce305ae 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -24,7 +24,7 @@ Author : Russel Winder <russel.winder at concertant.com>
     This Ant script provides the build needed by Debian whilst the Gradle system is not packaged.
   </description>
 
-  <property name="gantVersion" value="1.9.9"/>
+  <property name="gantVersion" value="1.9.11"/>
   <property name="groovyVersion" value="1.8.6"/>
   <property name="mavenAntTaskVersion" value="2.1.3"/>
   <property name="ivyVersion" value="2.2.0"/>
diff --git a/debian/changelog b/debian/changelog
index e3f29f3..a71155d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-gant (1.9.9-4) UNRELEASED; urgency=medium
+gant (1.9.11-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Removed 01_fix_ant_1.9_api_changes.diff (fixed upstream)
   * debian/watch: Track the release tags on GitHub
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 31 Jul 2015 12:20:15 +0200
diff --git a/debian/patches/01_fix_ant_1.9_api_changes.diff b/debian/patches/01_fix_ant_1.9_api_changes.diff
deleted file mode 100644
index fd8d0cd..0000000
--- a/debian/patches/01_fix_ant_1.9_api_changes.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix API change in org.apache.tools.ant.Project class
-Author: Miguel Landaeta <miguel at miguel.cc>
-Bug-Debian: http://bugs.debian.org/713745
-Forwarded: no
-Last-Update: 2013-09-22
-
---- gant-1.9.9.orig/src/main/groovy/org/codehaus/gant/ant/Gant.java
-+++ gant-1.9.9/src/main/groovy/org/codehaus/gant/ant/Gant.java
-@@ -202,12 +202,12 @@ public class Gant extends Task {
-    */
-   //  Russel Winder rehacked the code provided by Eric Van Dewoestine.
-   private void addAlmostAll(final Project newProject, final Project oldProject) {
--    @SuppressWarnings("unchecked") final Hashtable<String,String> properties = oldProject.getProperties();
-+    @SuppressWarnings("unchecked") final Hashtable<String,Object> properties = oldProject.getProperties();
-     final Enumeration<String> e = properties.keys();
-     while (e.hasMoreElements()) {
-       final String key = e.nextElement();
-       if (!(MagicNames.PROJECT_BASEDIR.equals(key) || MagicNames.ANT_FILE.equals(key))) {
--        if (newProject.getProperty(key) == null) { newProject.setNewProperty(key, properties.get(key)); }
-+        if (newProject.getProperty(key) == null) { newProject.setNewProperty(key, properties.get(key).toString()); }
-       }
-     }
-   }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 58f90b4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_fix_ant_1.9_api_changes.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gant.git