This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository electric.
commit 7e07249d38a3b3b9e09d8f27761423c9a4c14577 Author: Emmanuel Bourg <ebo...@apache.org> Date: Wed Nov 29 13:51:49 2017 +0100 Fixed the Java 9 patch --- debian/changelog | 9 ++------- debian/patches/java9.patch | 28 +++++++++------------------- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index b25cba0..4ed3822 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,6 @@ -electric (9.07+dfsg-4) UNRELEASED; urgency=medium - - * - - -- Markus Koschany <a...@debian.org> Wed, 01 Nov 2017 11:30:36 +0100 - electric (9.07+dfsg-3) unstable; urgency=medium + [ Markus Koschany ] * Add java9.patch and fix FTBFS with OpenJDK 9. Thanks to Chris West for the report (Closes: #873219) * Declare compliance with Debian Policy 4.1.1. @@ -14,7 +9,7 @@ electric (9.07+dfsg-3) unstable; urgency=medium * Update wrapper script and require Java 7 at least. * Build with OpenJDK 9. - -- Markus Koschany <a...@debian.org> Mon, 30 Oct 2017 22:00:38 +0100 + -- Emmanuel Bourg <ebo...@apache.org> Wed, 29 Nov 2017 13:51:27 +0100 electric (9.07+dfsg-2) unstable; urgency=medium diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch index b80dad7..beaef79 100644 --- a/debian/patches/java9.patch +++ b/debian/patches/java9.patch @@ -1,25 +1,15 @@ -From: Markus Koschany <a...@debian.org> -Date: Mon, 30 Oct 2017 21:49:23 +0100 -Subject: java9 - -This patch is incomplete. Electric still FTBFS with OpenJDK 9. - +Description: Fixes the compilation errors with Java 9 +Author: Emmanuel Bourg <ebo...@apache.org> Bug-Debian: https://bugs.debian.org/873219 Bug-Upstream: https://lists.gnu.org/archive/html/bug-gnu-electric/2017-10/msg00000.html ---- - com/sun/electric/tool/user/ui/JobTree.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/com/sun/electric/tool/user/ui/JobTree.java b/com/sun/electric/tool/user/ui/JobTree.java -index eac6ea6..002cfca 100644 --- a/com/sun/electric/tool/user/ui/JobTree.java +++ b/com/sun/electric/tool/user/ui/JobTree.java -@@ -223,7 +223,7 @@ public class JobTree extends DefaultMutableTreeNode { - } - } +@@ -55,7 +55,7 @@ -- public static class JobTreeNode implements TreeNode -+ public static class JobTreeNode extends DefaultMutableTreeNode - { - private Job.Inform jobInfo; + private JobTree() { + super(jobNodeName); +- children = jobNodes; ++ children = (Vector) jobNodes; + } + /** Build Job explorer tree */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/electric.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits