Bas Couwenberg pushed to branch master at Debian GIS Project / josm
Commits: c74eb51e by Bas Couwenberg at 2018-05-02T14:37:34+02:00 Add patch to add java-10 JREs to list of possible Java commands. - - - - - 3 changed files: - debian/changelog - + debian/patches/10-java-10.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ josm (0.0.svn13576+dfsg-4) UNRELEASED; urgency=medium * Bump Standards-Version to 4.1.4, no changes. + * Add patch to add java-10 JREs to list of possible Java commands. -- Bas Couwenberg <[email protected]> Wed, 18 Apr 2018 20:09:56 +0200 ===================================== debian/patches/10-java-10.patch ===================================== --- /dev/null +++ b/debian/patches/10-java-10.patch @@ -0,0 +1,18 @@ +Description: Add java-10 JREs to list of possible Java commands. +Author: Bas Couwenberg <[email protected]> +Forwarded: not-needed + +--- a/linux/tested/usr/bin/josm ++++ b/linux/tested/usr/bin/josm +@@ -13,9 +13,11 @@ ARCH="`dpkg --print-architecture 2> /dev + 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-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java" ++ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java /usr/lib/jvm/java-10-oracle/bin/java" + else + JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java" ++ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-oracle/bin/java" + fi + + if [ -f /etc/default/josm ]; then ===================================== debian/patches/series ===================================== --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 07-use_system_fonts.patch 08-use_noto_font.patch 09-java-9.patch +10-java-10.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/commit/c74eb51e309fc5468011a247d593f50aab3a4242 --- View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/commit/c74eb51e309fc5468011a247d593f50aab3a4242 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
