[pkg-java] r17074 - in trunk/bnd/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-07-26 11:16:39 +0000 (Fri, 26 Jul 2013)
New Revision: 17074

Added:
   trunk/bnd/debian/patches/ant-1.9-compatibility.diff
Modified:
   trunk/bnd/debian/changelog
   trunk/bnd/debian/patches/fix-encoding.diff
   trunk/bnd/debian/patches/series
Log:
Added a patch to compile with Ant 1.9 (Closes: #712343)



Modified: trunk/bnd/debian/changelog
===================================================================
--- trunk/bnd/debian/changelog	2013-07-26 10:12:37 UTC (rev 17073)
+++ trunk/bnd/debian/changelog	2013-07-26 11:16:39 UTC (rev 17074)
@@ -1,5 +1,6 @@
 bnd (1.50.0-6) UNRELEASED; urgency=low
 
+  * Added a patch to compile with Ant 1.9 (Closes: #712343)
   * debian/watch: Updated to catch the recent releases on Github
   * debian/control: Updated Standards-Version to 3.9.4 (no changes)
   * debian/rules: Improved the clean target

Added: trunk/bnd/debian/patches/ant-1.9-compatibility.diff
===================================================================
--- trunk/bnd/debian/patches/ant-1.9-compatibility.diff	                        (rev 0)
+++ trunk/bnd/debian/patches/ant-1.9-compatibility.diff	2013-07-26 11:16:39 UTC (rev 17074)
@@ -0,0 +1,30 @@
+Description: Ensures the source compatibility with Ant 1.9.
+ This patch can be removed when upgrading to bnd 2.x.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
++++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
+@@ -1373,7 +1373,7 @@
+ 	}
+ 
+ 	public boolean doWrap(File properties, File bundle, File output, File classpath[], int options,
+-			Map<String, String> additional) throws Exception {
++			Map<String, Object> additional) throws Exception {
+ 		if (!bundle.exists()) {
+ 			error("No such file: " + bundle.getAbsolutePath());
+ 			return false;
+--- a/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
++++ b/biz.aQute.bndlib/src/aQute/lib/osgi/Analyzer.java
+@@ -1527,9 +1527,9 @@
+ 		return sb.toString();
+ 	}
+ 
+-	public void putAll(Map<String, String> additional, boolean force) {
+-		for (Iterator<Map.Entry<String, String>> i = additional.entrySet().iterator(); i.hasNext();) {
+-			Map.Entry<String, String> entry = i.next();
++	public void putAll(Map<String, Object> additional, boolean force) {
++		for (Iterator<Map.Entry<String, Object>> i = additional.entrySet().iterator(); i.hasNext();) {
++			Map.Entry<String, Object> entry = i.next();
+ 			if (force || getProperties().get(entry.getKey()) == null)
+ 				setProperty((String) entry.getKey(), (String) entry.getValue());
+ 		}

Modified: trunk/bnd/debian/patches/fix-encoding.diff
===================================================================
--- trunk/bnd/debian/patches/fix-encoding.diff	2013-07-26 10:12:37 UTC (rev 17073)
+++ trunk/bnd/debian/patches/fix-encoding.diff	2013-07-26 11:16:39 UTC (rev 17074)
@@ -1,3 +1,5 @@
+Description: Set the encoding of the source file to avoid compilation warnings/errors
+Author: Emmanuel Bourg <ebourg at apache.org>
 --- a/cnf/build.xml
 +++ b/cnf/build.xml
 @@ -49,7 +49,7 @@

Modified: trunk/bnd/debian/patches/series
===================================================================
--- trunk/bnd/debian/patches/series	2013-07-26 10:12:37 UTC (rev 17073)
+++ trunk/bnd/debian/patches/series	2013-07-26 11:16:39 UTC (rev 17074)
@@ -6,3 +6,4 @@
 display_bsn_on_missing_bundle.diff
 find_swt_jar.diff
 fix-encoding.diff
+ant-1.9-compatibility.diff