[electric] 06/09: Build with OpenJDK 9.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository electric.

commit 92fd284c9a3cccd85dc9c9de3803ddc5d1d3719c
Author: Markus Koschany <apo at debian.org>
Date:   Mon Oct 30 22:06:45 2017 +0100

    Build with OpenJDK 9.
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b18b299..c5c5876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ electric (9.07+dfsg-3) unstable; urgency=medium
   * Remove the alternative dependency on java6-runtime because Java 6 is
     obsolete and no longer supported in Debian.
   * Update wrapper script and require Java 7 at least.
+  * Build with OpenJDK 9.
 
  -- Markus Koschany <apo at debian.org>  Mon, 30 Oct 2017 22:00:38 +0100
 
diff --git a/debian/control b/debian/control
index 039e217..371e13a 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  ant,
  bsh,
  debhelper (>= 10),
- default-jdk,
+ openjdk-9-jdk,
  javahelper,
  jython,
  libjava3d-java,
diff --git a/debian/rules b/debian/rules
index 9a51645..0136b72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
+export JAVA_HOME=/usr/lib/jvm/java-9-openjdk-amd64
 export CLASSPATH=/usr/share/java/bsh.jar:/usr/share/java/j3dcore.jar:/usr/share/java/j3dutils.jar:/usr/share/java/vecmath.jar:/usr/share/java/slf4j-simple.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/jython.jar
 
 %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/electric.git