This is an automated email from the git hooks/post-receive script. nomadium pushed a commit to annotated tag debian/1.50.0-6 in repository bnd.
commit 616e250ddc3700ac6f9a402dd36dadd9f663f72e Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 26 11:16:39 2013 +0000 Added a patch to compile with Ant 1.9 (Closes: #712343) --- debian/changelog | 1 + debian/patches/ant-1.9-compatibility.diff | 30 ++++++++++++++++++++++++++++++ debian/patches/fix-encoding.diff | 2 ++ debian/patches/series | 1 + 4 files changed, 34 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9ea6784..d036630 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 diff --git a/debian/patches/ant-1.9-compatibility.diff b/debian/patches/ant-1.9-compatibility.diff new file mode 100644 index 0000000..4cf9ed2 --- /dev/null +++ b/debian/patches/ant-1.9-compatibility.diff @@ -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 <[email protected]> +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()); + } diff --git a/debian/patches/fix-encoding.diff b/debian/patches/fix-encoding.diff index 92925f3..35d0f25 100644 --- a/debian/patches/fix-encoding.diff +++ b/debian/patches/fix-encoding.diff @@ -1,3 +1,5 @@ +Description: Set the encoding of the source file to avoid compilation warnings/errors +Author: Emmanuel Bourg <[email protected]> --- a/cnf/build.xml +++ b/cnf/build.xml @@ -49,7 +49,7 @@ diff --git a/debian/patches/series b/debian/patches/series index 66cc135..b6b06f0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ osgi43_fixes.diff display_bsn_on_missing_bundle.diff find_swt_jar.diff fix-encoding.diff +ant-1.9-compatibility.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/bnd.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
