Commit 2745ce27 authored by Bas Couwenberg's avatar Bas Couwenberg

Disable OpenJFX, not available for OpenJDK 9.

parent a1c31370
......@@ -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@debian.org> Tue, 27 Mar 2018 07:18:16 +0200
......
......@@ -6,8 +6,7 @@ Uploaders: David Paleino <dapal@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
......
#!/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@valencia.po .
dh_auto_build -- -Ddebian.version=${DEB_VERSION} dist
dh_auto_build -- -Ddebian.version=${DEB_VERSION} -DnoJavaFX=true dist
mv ca@valencia.po i18n/po/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment