[pkg-java] r17240 - in trunk/gant/debian: . patches

[Miguel Landaeta]

Author: nomadium-guest
Date: 2013-09-22 23:58:46 +0000 (Sun, 22 Sep 2013)
New Revision: 17240

Added:
   trunk/gant/debian/patches/
   trunk/gant/debian/patches/01_fix_ant_1.9_api_changes.diff
   trunk/gant/debian/patches/series
Modified:
   trunk/gant/debian/changelog
   trunk/gant/debian/control
Log:
Upload gant 1.9.9-3 to unstable

Modified: trunk/gant/debian/changelog
===================================================================
--- trunk/gant/debian/changelog	2013-09-22 19:43:41 UTC (rev 17239)
+++ trunk/gant/debian/changelog	2013-09-22 23:58:46 UTC (rev 17240)
@@ -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.

Modified: trunk/gant/debian/control
===================================================================
--- trunk/gant/debian/control	2013-09-22 19:43:41 UTC (rev 17239)
+++ trunk/gant/debian/control	2013-09-22 23:58:46 UTC (rev 17240)
@@ -8,8 +8,8 @@
  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

Added: trunk/gant/debian/patches/01_fix_ant_1.9_api_changes.diff
===================================================================
--- trunk/gant/debian/patches/01_fix_ant_1.9_api_changes.diff	                        (rev 0)
+++ trunk/gant/debian/patches/01_fix_ant_1.9_api_changes.diff	2013-09-22 23:58:46 UTC (rev 17240)
@@ -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()); }
+       }
+     }
+   }

Added: trunk/gant/debian/patches/series
===================================================================
--- trunk/gant/debian/patches/series	                        (rev 0)
+++ trunk/gant/debian/patches/series	2013-09-22 23:58:46 UTC (rev 17240)
@@ -0,0 +1 @@
+01_fix_ant_1.9_api_changes.diff