This is an automated email from the git hooks/post-receive script. praveen pushed a commit to branch master in repository libjopendocument-java.
commit b315713f3f83c024d973a55ae272b68117679c0e Author: Praveen Arimbrathodiyil <[email protected]> Date: Fri Jun 20 23:52:59 2014 +0530 add fix for commons collections compat --- debian/patches/commons-collections-compat.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 26 insertions(+) diff --git a/debian/patches/commons-collections-compat.patch b/debian/patches/commons-collections-compat.patch new file mode 100644 index 0000000..1fafd8c --- /dev/null +++ b/debian/patches/commons-collections-compat.patch @@ -0,0 +1,25 @@ +Description: Fix commons collections compatibility + Debian's commons collections package has an update for java 8 compat +Author: Jerome Robert <[email protected]> +Source: https://lists.debian.org/debian-java/2014/06/msg00081.html + +Index: libjopendocument-java/src/org/jopendocument/util/CollectionMap.java +=================================================================== +--- libjopendocument-java.orig/src/org/jopendocument/util/CollectionMap.java ++++ libjopendocument-java/src/org/jopendocument/util/CollectionMap.java +@@ -196,7 +196,7 @@ public class CollectionMap<K, V> extends + + public void removeAll(Map<? extends K, ? extends V> m) { + for (final Map.Entry<? extends K, ? extends V> e : m.entrySet()) { +- this.remove(e.getKey(), e.getValue()); ++ this.removeMapping(e.getKey(), e.getValue()); + } + } + +@@ -259,4 +259,4 @@ public class CollectionMap<K, V> extends + public Collection<V> remove(Object key) { + return (Collection<V>) super.remove(key); + } +-} +\ No newline at end of file ++} diff --git a/debian/patches/series b/debian/patches/series index c9f99da..84f2f63 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +commons-collections-compat.patch use-system-jars.patch add-clean-target.patch fix-for-jdk7.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjopendocument-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
