[Git][debian-gis-team/josm][master] 2 commits: Explicitly build with OpenJDK 8, OpenJFX not available for OpenJDK 9. See: #893348

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / josm


Commits:
c61d88d2 by Bas Couwenberg at 2018-03-18T08:54:23+01:00
Explicitly build with OpenJDK 8, OpenJFX not available for OpenJDK 9. See: #893348

- - - - -
a2dc6798 by Bas Couwenberg at 2018-03-18T08:54:40+01:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn13500+dfsg-2) unstable; 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:54:30 +0100
+
 josm (0.0.svn13500+dfsg-1) unstable; urgency=medium
 
   * New hotfix tested snapshot.


=====================================
debian/control
=====================================
--- 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,


=====================================
debian/rules
=====================================
--- 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



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/compare/023a8848f81e374bbcde7c5791ea70206a50b8ed...a2dc6798bc485ee74a9dce896cb03c39333eca6e

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/compare/023a8848f81e374bbcde7c5791ea70206a50b8ed...a2dc6798bc485ee74a9dce896cb03c39333eca6e
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180318/915c0942/attachment-0001.html>