This is an automated email from the git hooks/post-receive script. praveen pushed a commit to branch master in repository libjopendocument-java.
commit f518454ea98a089772181078516d65c0e4fd2a20 Author: Praveen Arimbrathodiyil <[email protected]> Date: Fri Jun 20 16:48:11 2014 +0530 fix jdk7 build failure --- debian/patches/fix-for-jdk7.patch | 21 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 22 insertions(+) diff --git a/debian/patches/fix-for-jdk7.patch b/debian/patches/fix-for-jdk7.patch new file mode 100644 index 0000000..25e68c8 --- /dev/null +++ b/debian/patches/fix-for-jdk7.patch @@ -0,0 +1,21 @@ +Description: Fix build failure with JDK 7 + Rename function to resolve name clash +Source: https://groups.google.com/forum/#!msg/jopendocument/mY3HWyRmd1g/5xJB5q9a3M4J + +Index: libjopendocument-java/src/org/jopendocument/dom/Library.java +=================================================================== +--- libjopendocument-java.orig/src/org/jopendocument/dom/Library.java ++++ libjopendocument-java/src/org/jopendocument/dom/Library.java +@@ -643,10 +643,10 @@ public abstract class Library { + final EmbeddedLibrary other = (EmbeddedLibrary) obj; + if (this.passwordProtected != other.passwordProtected) + return false; +- return canBeMerged(this.modules, other.modules) && canBeMerged(this.dialogs, other.dialogs); ++ return canBeMerged2(this.modules, other.modules) && canBeMerged2(this.dialogs, other.dialogs); + } + +- static private final <V> boolean canBeMerged(final Map<String, V> m1, final Map<String, V> m2) { ++ static private final <V> boolean canBeMerged2(final Map<String, V> m1, final Map<String, V> m2) { + final Set<String> duplicateKeys = CollectionUtils.inter(m1.keySet(), m2.keySet()); + for (final String key : duplicateKeys) { + final V v1 = m1.get(key); diff --git a/debian/patches/series b/debian/patches/series index 00f6158..c9f99da 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ 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
