[Git][debian-gis-team/josm-installer][experimental] 2 commits: Updated linux directory to r19419.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / josm-installer


Commits:
fb02dc11 by Bas Couwenberg at 2025-07-12T14:33:08+02:00
Updated linux directory to r19419.

- - - - -
3a57063f by Bas Couwenberg at 2025-07-12T14:33:30+02:00
Set distribution to experimental.

- - - - -


3 changed files:

- debian/changelog
- linux/latest/usr/bin/josm-latest
- linux/tested/usr/bin/josm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+josm-installer (0.0.7+svn19419~exp1) experimental; urgency=medium
+
+  * Updated linux directory to r19419.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 12 Jul 2025 14:33:09 +0200
+
 josm-installer (0.0.7+svn19381~exp1) experimental; urgency=medium
 
   * Bump Standards-Version to 4.7.2, no changes.


=====================================
linux/latest/usr/bin/josm-latest
=====================================
@@ -91,7 +91,11 @@ if [ "$JAVACMD" ]; then
     JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}"
     JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"
     if [[ "${JAVA_VERSION}" -ge 11 ]]; then
-        JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+        if [[ -e "${JAVAFX_HOME}" ]]; then
+            JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+        else
+            JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS"
+        fi
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.security.action=ALL-UNNAMED"
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED"
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"


=====================================
linux/tested/usr/bin/josm
=====================================
@@ -91,7 +91,11 @@ if [ "$JAVACMD" ]; then
     JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}"
     JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"
     if [[ "${JAVA_VERSION}" -ge 11 ]]; then
-        JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+        if [[ -e "${JAVAFX_HOME}" ]]; then
+            JAVA_OPTS="--module-path ${JAVAFX_HOME} --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+        else
+            JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS"
+        fi
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.security.action=ALL-UNNAMED"
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED"
         JAVA_OPTS="$JAVA_OPTS --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/21b81410b56052f8e090e28522c825696ef16da0...3a57063fb08091338f8fa7d720d3365284ed974a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/21b81410b56052f8e090e28522c825696ef16da0...3a57063fb08091338f8fa7d720d3365284ed974a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250712/11e12980/attachment-0001.htm>