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

[Bas Couwenberg (@sebastic)]

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


Commits:
1c3a0cb6 by Bas Couwenberg at 2025-09-01T15:29:11+02:00
Updated linux directory to r19430.

- - - - -
dbf2a6ab by Bas Couwenberg at 2025-09-01T15:29:37+02:00
Set distribution to unstable.

- - - - -


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+svn19430) unstable; urgency=medium
+
+  * Updated linux directory to r19430.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 01 Sep 2025 15:29:17 +0200
+
 josm-installer (0.0.7+svn19419) unstable; urgency=medium
 
   * Move from experimental to unstable.


=====================================
linux/latest/usr/bin/josm-latest
=====================================
@@ -92,10 +92,21 @@ if [ "$JAVACMD" ]; then
     JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"
     if [[ "${JAVA_VERSION}" -ge 11 ]]; then
         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"
+            if [[ -n "${JOSM_MODULEPATH}" ]]; then
+                JOSM_MODULEPATH="${JOSM_MODULEPATH}:${JAVAFX_HOME}"
+            else
+                JOSM_MODULEPATH="${JAVAFX_HOME}"
+            fi
+
+            JAVA_OPTS="--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"
+            JAVA_OPTS="--add-modules java.scripting,java.sql ${JAVA_OPTS}"
+        fi
+
+        if [[ -n "${JOSM_MODULEPATH}" ]]; then
+            JAVA_OPTS="--module-path ${JOSM_MODULEPATH} ${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
=====================================
@@ -92,10 +92,21 @@ if [ "$JAVACMD" ]; then
     JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"
     if [[ "${JAVA_VERSION}" -ge 11 ]]; then
         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"
+            if [[ -n "${JOSM_MODULEPATH}" ]]; then
+                JOSM_MODULEPATH="${JOSM_MODULEPATH}:${JAVAFX_HOME}"
+            else
+                JOSM_MODULEPATH="${JAVAFX_HOME}"
+            fi
+
+            JAVA_OPTS="--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"
+            JAVA_OPTS="--add-modules java.scripting,java.sql ${JAVA_OPTS}"
+        fi
+
+        if [[ -n "${JOSM_MODULEPATH}" ]]; then
+            JAVA_OPTS="--module-path ${JOSM_MODULEPATH} ${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/4e8103e1485e5948220f648b17ec754d288bcc46...dbf2a6ab64034ee97788106892fa4b80f5adfbd1

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/4e8103e1485e5948220f648b17ec754d288bcc46...dbf2a6ab64034ee97788106892fa4b80f5adfbd1
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/20250901/3625808d/attachment-0001.htm>