[Git][debian-gis-team/josm][master] Add patch to remove java-8 JREs from list of possible Java commands.

[Bas Couwenberg]

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


Commits:
a97169ee by Bas Couwenberg at 2018-03-28T14:29:34+02:00
Add patch to remove java-8 JREs from list of possible Java commands.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/09-java-9.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- 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.


=====================================
debian/patches/09-java-9.patch
=====================================
--- /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
+ 


=====================================
debian/patches/series
=====================================
--- 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



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/commit/a97169ee45e3e3f23221c1924f900044a30d4d48

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/commit/a97169ee45e3e3f23221c1924f900044a30d4d48
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/20180328/29576865/attachment-0001.html>