[josm] 01/02: Explicitly build with OpenJDK 8, OpenJFX not available for OpenJDK 9. See: #893348

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository josm.

commit c61d88d2ae2398047c55a46440437951d105e043
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 18 08:39:49 2018 +0100

    Explicitly build with OpenJDK 8, OpenJFX not available for OpenJDK 9. See: #893348
---
 debian/changelog | 7 +++++++
 debian/control   | 3 ++-
 debian/rules     | 5 ++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68bee31..68886ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn13500+dfsg-2) UNRELEASED; urgency=medium
+
+  * Explicitly build with OpenJDK 8, OpenJFX not available for OpenJDK 9.
+    See: #893348
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 18 Mar 2018 08:39:40 +0100
+
 josm (0.0.svn13500+dfsg-1) unstable; urgency=medium
 
   * New hotfix tested snapshot.
diff --git a/debian/control b/debian/control
index a1966bc..9966aac 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: David Paleino <dapal at debian.org>,
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 9~),
-               default-jdk (>= 2:1.8) | java8-sdk,
+#               default-jdk (>= 2:1.8) | java8-sdk,
+               openjdk-8-jdk,
                ant,
                ant-contrib,
                gettext,
diff --git a/debian/rules b/debian/rules
index 17f370f..2825f2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_BUILD_ARCH)
+#export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/java/gettext-commons.jar:/usr/share/java/metadata-extractor.jar:/usr/share/java/signpost-core.jar:/usr/share/java/jmapviewer.jar:/usr/share/java/json.jar
 
 SVNREPO := https://josm.openstreetmap.de/svn/trunk

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