[josm] 05/08: Disable OpenJFX, not available for OpenJDK 9.

[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 2745ce278d78f342ffcfb9f1842fdd746db58387
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 20 19:12:29 2018 +0100

    Disable OpenJFX, not available for OpenJDK 9.
---
 debian/changelog | 1 +
 debian/control   | 9 ++++-----
 debian/rules     | 7 ++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a538ae..95a9c34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ josm (0.0.svn13576+dfsg-1) UNRELEASED; urgency=medium
 
   * New tested snapshot.
   * Refresh patches.
+  * Disable OpenJFX, not available for OpenJDK 9.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 27 Mar 2018 07:18:16 +0200
 
diff --git a/debian/control b/debian/control
index 9966aac..0309b97 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,7 @@ Uploaders: David Paleino <dapal at debian.org>,
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 9~),
-#               default-jdk (>= 2:1.8) | java8-sdk,
-               openjdk-8-jdk,
+               default-jdk (>= 2:1.8) | java8-sdk,
                ant,
                ant-contrib,
                gettext,
@@ -20,8 +19,8 @@ Build-Depends: debhelper (>= 9~),
                libgettext-commons-java (>= 0.9.6),
                liboauth-signpost-java (>= 1.2),
                libsvgsalamander-java,
-               libterm-readkey-perl,
-               openjfx
+               libterm-readkey-perl
+#               openjfx
 Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/josm.git
@@ -37,7 +36,7 @@ Depends: default-jre (>= 2:1.8) | java8-runtime,
          libgettext-commons-java (>= 0.9.6),
          liboauth-signpost-java (>= 1.2),
          libsvgsalamander-java,
-         openjfx,
+#         openjfx,
          proj-data,
          ${misc:Depends}
 Recommends: josm-l10n
diff --git a/debian/rules b/debian/rules
index 2825f2d..23fa12a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 
-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 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
@@ -34,7 +31,7 @@ override_dh_auto_build:
 	# Move translation causing build failure out of the way
 	mv i18n/po/ca at valencia.po .
 
-	dh_auto_build -- -Ddebian.version=${DEB_VERSION} dist
+	dh_auto_build -- -Ddebian.version=${DEB_VERSION} -DnoJavaFX=true dist
 
 	mv ca at valencia.po i18n/po/
 

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