[gant] 36/51: Upload gant 1.9.9-3 to unstable

[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 44f18877a1180a603edf7a0e8d6d8307102d3a7a
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sun Sep 22 23:58:46 2013 +0000

    Upload gant 1.9.9-3 to unstable
---
 debian/changelog                               |  7 +++++++
 debian/control                                 |  4 ++--
 debian/patches/01_fix_ant_1.9_api_changes.diff | 23 +++++++++++++++++++++++
 debian/patches/series                          |  1 +
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d2222d..ed3e4e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gant (1.9.9-3) unstable; urgency=low
+
+  * Fix FTBFS bug due to API changes in Ant 1.9. (Closes: #713745).
+  * Use canonical URLs in Vcs-* fields.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 22 Sep 2013 18:37:35 -0300
+
 gant (1.9.9-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 57a46b5..cb6d81d 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends-Indep: ant, groovy, default-jdk, libmaven-ant-tasks-java,
  maven2, libplexus-classworlds-java, libplexus-utils-java
 Standards-Version: 3.9.4
 Homepage: http://gant.codehaus.org/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/gant
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/gant
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/gant
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/gant
 
 Package: gant
 Architecture: all
diff --git a/debian/patches/01_fix_ant_1.9_api_changes.diff b/debian/patches/01_fix_ant_1.9_api_changes.diff
new file mode 100644
index 0000000..fd8d0cd
--- /dev/null
+++ b/debian/patches/01_fix_ant_1.9_api_changes.diff
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 0000000..58f90b4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+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