[josm] 01/01: Add patch to remove java-8 JREs from list of possible Java commands.

[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 a97169ee45e3e3f23221c1924f900044a30d4d48
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Mar 28 14:29:34 2018 +0200

    Add patch to remove java-8 JREs from list of possible Java commands.
---
 debian/changelog               |  6 ++++++
 debian/patches/09-java-9.patch | 19 +++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 09e85fc..c426dd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn13576+dfsg-3) UNRELEASED; urgency=medium
+
+  * Add patch to remove java-8 JREs from list of possible Java commands.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 28 Mar 2018 14:28:23 +0200
+
 josm (0.0.svn13576+dfsg-2) unstable; urgency=medium
 
   * Bump Java dependencies from 8 to 9.
diff --git a/debian/patches/09-java-9.patch b/debian/patches/09-java-9.patch
new file mode 100644
index 0000000..87b7176
--- /dev/null
+++ b/debian/patches/09-java-9.patch
@@ -0,0 +1,19 @@
+Description: Remove java-8 JREs from list of possible Java commands.
+ josm is now built with openjdk-9-sdk which requires a java-9-jre at runtime.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/linux/tested/usr/bin/josm
++++ b/linux/tested/usr/bin/josm
+@@ -12,11 +12,9 @@ ARCH="`dpkg --print-architecture 2> /dev
+ # If OpenJDK is only available headless, do not try it
+ if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
+ 	JAVA_CMDS="$JAVA_HOME/bin/java"
+-	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
+ 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
+ else
+ 	JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
+-	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
+ 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
+ fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0e16b21..89d7d22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 06-move_data_out_of_jar.patch
 07-use_system_fonts.patch
 08-use_noto_font.patch
+09-java-9.patch

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