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

[Bas Couwenberg (@sebastic)]

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


Commits:
26433b6b by Bas Couwenberg at 2024-10-02T15:32:26+02:00
Updated linux directory to r19215.

- - - - -
201d096e by Bas Couwenberg at 2024-10-02T15:33:49+02:00
Incorporate MaxRAMPercentag changes in josm launcher.

- - - - -
10453587 by Bas Couwenberg at 2024-10-02T16:05:27+02:00
Update lintian overrides.

- - - - -
3cb1b7aa by Bas Couwenberg at 2024-10-02T16:05:27+02:00
Set distribution to unstable.

- - - - -


7 changed files:

- debian/changelog
- + debian/lintian-overrides
- josm
- linux/latest/etc/default/josm-latest
- linux/latest/usr/bin/josm-latest
- linux/tested/etc/default/josm
- linux/tested/usr/bin/josm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,12 @@
-josm-installer (0.0.6+svn19018) UNRELEASED; urgency=medium
+josm-installer (0.0.6+svn19215) unstable; urgency=medium
 
   * Add openjfx to dependencies.
     (closes: #1081959)
+  * Updated linux directory to r19215.
+  * Incorporate MaxRAMPercentag changes in josm launcher.
+  * Update lintian overrides.
 
- -- Bas Couwenberg <sebastic at debian.org>  Mon, 16 Sep 2024 20:24:40 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 02 Oct 2024 15:34:05 +0200
 
 josm-installer (0.0.5+svn19018) unstable; urgency=medium
 


=====================================
debian/lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# https://josm.openstreetmap.de/ticket/23948
+appstream-metadata-validation-failed *
+


=====================================
josm
=====================================
@@ -66,6 +66,12 @@ if [ -f "/etc/default/${JOSM_VERSION}" ]; then
     . "/etc/default/${JOSM_VERSION}"
 fi
 
+# If there is more than 8G ram, we can use up to 75% of the memory while still leaving 2G for other things.
+if [ "$(free --mega | grep '^Mem:' | awk '{print $2}')" -gt 8192 ]; then
+    # But don't set anything if JAVA_OPTS is already set.
+    JAVA_OPTS="${JAVA_OPTS:=-XX:MaxRAMPercentage=75.0 -Xms256m}"
+fi
+
 JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
 
 if [ -z "${JAVACMD}" ] && [ -n "${ALTERNATIVE_JDK}" ]; then


=====================================
linux/latest/etc/default/josm-latest
=====================================
@@ -2,7 +2,7 @@
 # Uncomment the JAVA_OPTS lines to enable their use by /usr/bin/josm-latest
 
 # Increase usable memory
-#JAVA_OPTS="-Xmx2048m ${JAVA_OPTS}"
+#JAVA_OPTS="-XX:MaxRAMPercentage=75.0 -Xms256m ${JAVA_OPTS}"
 
 # Enable OpenGL pipeline (2D graphic accelerators)
 #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"


=====================================
linux/latest/usr/bin/josm-latest
=====================================
@@ -57,6 +57,12 @@ if [ -f "/etc/default/${JOSM_VERSION}" ]; then
     . "/etc/default/${JOSM_VERSION}"
 fi
 
+# If there is more than 8G ram, we can use up to 75% of the memory while still leaving 2G for other things.
+if [ "$(free --mega | grep '^Mem:' | awk '{print $2}')" -gt 8192 ]; then
+    # But don't set anything if JAVA_OPTS is already set.
+    JAVA_OPTS="${JAVA_OPTS:=-XX:MaxRAMPercentage=75.0 -Xms256m}"
+fi
+
 JAVA_OPTS="-Djosm.restart=true -Djosm.dir.name=JOSM-latest -Djava.net.useSystemProxies=true $JAVA_OPTS"
 
 if [ -z "${JAVACMD}" ] && [ -n "${ALTERNATIVE_JDK}" ]; then


=====================================
linux/tested/etc/default/josm
=====================================
@@ -2,7 +2,7 @@
 # Uncomment the JAVA_OPTS lines to enable their use by /usr/bin/josm
 
 # Increase usable memory
-#JAVA_OPTS="-Xmx2048m ${JAVA_OPTS}"
+#JAVA_OPTS="-XX:MaxRAMPercentage=75.0 -Xms256m ${JAVA_OPTS}"
 
 # Enable OpenGL pipeline (2D graphic accelerators)
 #JAVA_OPTS="-Dsun.java2d.opengl=True ${JAVA_OPTS}"


=====================================
linux/tested/usr/bin/josm
=====================================
@@ -57,6 +57,12 @@ if [ -f "/etc/default/${JOSM_VERSION}" ]; then
     . "/etc/default/${JOSM_VERSION}"
 fi
 
+# If there is more than 8G ram, we can use up to 75% of the memory while still leaving 2G for other things.
+if [ "$(free --mega | grep '^Mem:' | awk '{print $2}')" -gt 8192 ]; then
+    # But don't set anything if JAVA_OPTS is already set.
+    JAVA_OPTS="${JAVA_OPTS:=-XX:MaxRAMPercentage=75.0 -Xms256m}"
+fi
+
 JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
 
 if [ -z "${JAVACMD}" ] && [ -n "${ALTERNATIVE_JDK}" ]; then



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/bb3e4aff1fb8b096e29e4d786f07b812201eae7e...3cb1b7aa7a51a701daa276ccbfec1d878489ac2a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/bb3e4aff1fb8b096e29e4d786f07b812201eae7e...3cb1b7aa7a51a701daa276ccbfec1d878489ac2a
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/20241002/6603f3f1/attachment-0001.htm>