[Git][debian-gis-team/josm-installer][experimental] 34 commits: Revert "Update branch in gbp.conf & Vcs-Git URL."
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri May 2 16:29:26 BST 2025
Bas Couwenberg pushed to branch experimental at Debian GIS Project / josm-installer
Commits:
77a78f69 by Bas Couwenberg at 2023-06-11T10:56:59+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 605cfd25db204120e0bc9c35f7fee54148fcf029.
- - - - -
475256a4 by Bas Couwenberg at 2023-06-11T10:57:29+02:00
Move from experimental to unstable.
- - - - -
64fa7037 by Bas Couwenberg at 2023-06-12T11:18:04+02:00
Bump debhelper compat to 13.
- - - - -
111aab7e by Bas Couwenberg at 2023-08-12T13:55:46+02:00
Use execute_after instead of override in rules file.
- - - - -
697817f3 by Bas Couwenberg at 2023-08-23T16:33:57+02:00
Enable Salsa CI.
- - - - -
242e9554 by Bas Couwenberg at 2023-08-25T17:15:08+02:00
Explicitly enable test-build-twice job.
- - - - -
5fa2e6bd by Bas Couwenberg at 2023-12-06T07:08:46+01:00
Updated linux directory to r18889.
- - - - -
94f3b697 by Bas Couwenberg at 2023-12-06T07:08:59+01:00
Set distribution to unstable.
- - - - -
6e6eb2e5 by Bas Couwenberg at 2024-03-18T16:16:14+01:00
Updated linux directory to r18985.
- - - - -
aa41df09 by Bas Couwenberg at 2024-03-18T16:19:11+01:00
Require at least java11-runtime.
- - - - -
4e2adbc3 by Bas Couwenberg at 2024-03-18T16:19:25+01:00
Set distribution to unstable.
- - - - -
3e8dcee4 by Bas Couwenberg at 2024-03-18T16:40:42+01:00
Remove support for JRE <= 10 from josm launcher.
- - - - -
f2fc1ef1 by Bas Couwenberg at 2024-04-11T05:30:10+02:00
Updated linux directory to r19018.
- - - - -
083fbf84 by Bas Couwenberg at 2024-04-11T05:32:20+02:00
Set distribution to unstable.
- - - - -
eb859d80 by Bas Couwenberg at 2024-06-09T13:27:37+02:00
Update version_url for tested version.
- - - - -
f5fb1492 by Bas Couwenberg at 2024-06-10T12:50:13+02:00
Use dh_installsystemd to install systemd service and timer.
- - - - -
941540a9 by Bas Couwenberg at 2024-06-18T12:55:55+02:00
Close bug in changelog.
- - - - -
3a0204cb by Bas Couwenberg at 2024-07-28T19:41:22+02:00
Bump Standards-Version to 4.7.0, no changes.
- - - - -
eceb645a by Bas Couwenberg at 2024-08-06T15:25:59+02:00
Set distribution to unstable.
- - - - -
bb3e4aff by Bas Couwenberg at 2024-09-16T20:25:11+02:00
Add openjfx to dependencies. (closes: #1081959)
- - - - -
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.
- - - - -
2a5f967b by Bas Couwenberg at 2024-11-01T05:47:47+01:00
Updated linux directory to r19237.
- - - - -
13536c0d by Bas Couwenberg at 2024-11-01T05:49:34+01:00
Demote openjfx to Recommends, RC buggy.
- - - - -
32b4eee6 by Bas Couwenberg at 2024-11-01T05:53:14+01:00
Update lintian overrides.
- - - - -
4688184c by Bas Couwenberg at 2024-11-01T05:53:14+01:00
Set distribution to unstable.
- - - - -
d22b1076 by Bas Couwenberg at 2025-03-20T06:08:00+01:00
Bump Standards-Version to 4.7.2, no changes.
- - - - -
0e4d1734 by Bas Couwenberg at 2025-03-29T07:23:06+01:00
Fix old FSF address in copyright file.
- - - - -
b63d826e by Bas Couwenberg at 2025-03-31T05:51:19+02:00
Fix changelog version.
- - - - -
59397dbb by Bas Couwenberg at 2025-05-02T17:22:37+02:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
d96bde78 by Bas Couwenberg at 2025-05-02T17:25:53+02:00
Updated linux directory to r19381.
- - - - -
21b81410 by Bas Couwenberg at 2025-05-02T17:27:03+02:00
Set distribution to experimental.
- - - - -
18 changed files:
- + debian/.gitlab-ci.yml
- debian/changelog
- + debian/clean
- debian/control
- debian/copyright
- + debian/josm-installer.service
- + debian/josm-installer.timer
- debian/rules
- josm
- josm-installer.py
- linux/latest/DEBIAN/control
- linux/latest/etc/default/josm-latest
- linux/latest/usr/bin/josm-latest
- linux/latest/usr/share/metainfo/org.openstreetmap.josm-latest.appdata.xml
- linux/tested/DEBIAN/control
- linux/tested/etc/default/josm
- linux/tested/usr/bin/josm
- linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
Changes:
=====================================
debian/.gitlab-ci.yml
=====================================
@@ -0,0 +1,6 @@
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+variables:
+ SALSA_CI_ENABLE_BUILD_PACKAGE_TWICE: 1
=====================================
debian/changelog
=====================================
@@ -1,3 +1,67 @@
+josm-installer (0.0.7+svn19381~exp1) experimental; urgency=medium
+
+ * Bump Standards-Version to 4.7.2, no changes.
+ * Fix old FSF address in copyright file.
+ * Updated linux directory to r19381.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 02 May 2025 17:26:43 +0200
+
+josm-installer (0.0.6+svn19237) unstable; urgency=medium
+
+ * Updated linux directory to r19237.
+ * Demote openjfx to Recommends, RC buggy.
+ * Update lintian overrides.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 01 Nov 2024 05:49:35 +0100
+
+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> Wed, 02 Oct 2024 15:34:05 +0200
+
+josm-installer (0.0.5+svn19018) unstable; urgency=medium
+
+ * Update version_url for tested version.
+ * Use dh_installsystemd to install systemd service and timer.
+ (closes: #1073694)
+ * Bump Standards-Version to 4.7.0, no changes.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 06 Aug 2024 15:25:15 +0200
+
+josm-installer (0.0.4+svn19018) unstable; urgency=medium
+
+ * Remove support for JRE <= 10 from josm launcher.
+ * Updated linux directory to r19018.
+
+ -- Bas Couwenberg <sebastic at debian.org> Thu, 11 Apr 2024 05:30:11 +0200
+
+josm-installer (0.0.3+svn18985) unstable; urgency=medium
+
+ * Updated linux directory to r18985.
+ * Require at least java11-runtime.
+
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 18 Mar 2024 16:19:12 +0100
+
+josm-installer (0.0.3+svn18889) unstable; urgency=medium
+
+ * Bump debhelper compat to 13.
+ * Use execute_after instead of override in rules file.
+ * Enable Salsa CI.
+ * Updated linux directory to r18889.
+
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 06 Dec 2023 07:08:47 +0100
+
+josm-installer (0.0.2+svn18699) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 11 Jun 2023 10:57:03 +0200
+
josm-installer (0.0.2+svn18699~exp1) experimental; urgency=medium
* Add Rules-Requires-Root to control file.
=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+*.1
=====================================
debian/control
=====================================
@@ -3,7 +3,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Bas Couwenberg <sebastic at debian.org>
Section: contrib/utils
Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
python3,
python3-flake8,
shellcheck,
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 12),
docbook-xsl,
docbook-xml,
xsltproc
-Standards-Version: 4.6.2
+Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/debian-gis-team/josm-installer
Vcs-Git: https://salsa.debian.org/debian-gis-team/josm-installer.git -b experimental
Homepage: https://josm.openstreetmap.de
@@ -19,12 +19,13 @@ Rules-Requires-Root: no
Package: josm-installer
Architecture: all
-Depends: default-jre (>= 2:1.8) | java8-runtime,
+Depends: default-jre (>= 2:1.11) | java11-runtime,
fonts-noto,
proj-data,
python3,
python3-requests,
${misc:Depends}
+Recommends: openjfx
Conflicts: josm
Description: Editor for OpenStreetMap (installer)
JOSM is an editor for OpenStreetMap (OSM) written in Java.
=====================================
debian/copyright
=====================================
@@ -38,10 +38,6 @@ License: GPL-2+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- .
On Debian systems, the complete text of version 2 of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-2'.
=====================================
debian/josm-installer.service
=====================================
@@ -0,0 +1 @@
+../josm-installer.service
\ No newline at end of file
=====================================
debian/josm-installer.timer
=====================================
@@ -0,0 +1 @@
+../josm-installer.timer
\ No newline at end of file
=====================================
debian/rules
=====================================
@@ -9,9 +9,6 @@ MANPAGES := $(wildcard $(CURDIR)/*.*.xml)
%:
dh $@
-override_dh_clean:
- dh_clean *.1
-
override_dh_auto_build:
# Create man page from DocBook XML
for x in $(MANPAGES) ; do \
@@ -25,17 +22,11 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
shellcheck *.sh
endif
-override_dh_auto_install:
- dh_auto_install
-
+execute_after_dh_auto_install:
install -d $(CURDIR)/debian/josm-installer/usr/bin
install -m 755 $(CURDIR)/josm $(CURDIR)/debian/josm-installer/usr/bin/josm
install -m 755 $(CURDIR)/josm-installer.py $(CURDIR)/debian/josm-installer/usr/bin/josm-installer
- install -d $(CURDIR)/debian/josm-installer/lib/systemd/system
- install -m 644 $(CURDIR)/josm-installer.service $(CURDIR)/debian/josm-installer/lib/systemd/system/josm-installer.service
- install -m 644 $(CURDIR)/josm-installer.timer $(CURDIR)/debian/josm-installer/lib/systemd/system/josm-installer.timer
-
install -d $(CURDIR)/debian/josm-installer/usr/share/josm
install -m 644 $(CURDIR)/placeholder $(CURDIR)/debian/josm-installer/usr/share/josm/.placeholder
=====================================
josm
=====================================
@@ -30,20 +30,24 @@ dpkg_java() {
if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \
|| dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
# LTS versions in decreased order
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-21-openjdk/bin/java /usr/lib/jvm/java-21-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
# Released versions in decreased order
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-24-openjdk/bin/java /usr/lib/jvm/java-24-openjdk-$ARCH/bin/java"
+ # EOL versions in decreased order
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-23-openjdk/bin/java /usr/lib/jvm/java-23-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-22-openjdk/bin/java /usr/lib/jvm/java-22-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-20-openjdk/bin/java /usr/lib/jvm/java-20-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-19-openjdk/bin/java /usr/lib/jvm/java-19-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-16-openjdk/bin/java /usr/lib/jvm/java-16-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-15-openjdk/bin/java /usr/lib/jvm/java-15-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-14-openjdk/bin/java /usr/lib/jvm/java-14-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java"
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
# Development version(s)
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-19-openjdk/bin/java /usr/lib/jvm/java-19-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
fi
}
@@ -64,6 +68,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 [ "$(LC_ALL=C LANG=C 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
=====================================
josm-installer.py
=====================================
@@ -63,10 +63,7 @@ def josm_installer():
else:
variant = 'tested'
- version_url = (
- 'https://josm.openstreetmap.de/'
- 'wiki/TestedVersion?format=txt'
- )
+ version_url = 'https://josm.openstreetmap.de/tested'
jar_url = 'https://josm.openstreetmap.de/josm-%s.jar' % variant
=====================================
linux/latest/DEBIAN/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: josm developers <josm-dev at openstreetmap.org>
Homepage: https://josm.openstreetmap.de
Priority: extra
Architecture: all
-Depends: openjdk-11-jre | java11-runtime | openjdk-8-jre | java8-runtime,
+Depends: default-jre (>= 2:1.17) | java11-runtime,
proj-data, fonts-noto, openjfx
Description: Editor for OpenStreetMap (daily development snapshot)
JOSM is an editor for OpenStreetMap (OSM) written in Java.
=====================================
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
=====================================
@@ -21,20 +21,24 @@ dpkg_java() {
if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \
|| dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
# LTS versions in decreased order
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-21-openjdk/bin/java /usr/lib/jvm/java-21-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
# Released versions in decreased order
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-24-openjdk/bin/java /usr/lib/jvm/java-24-openjdk-$ARCH/bin/java"
+ # EOL versions in decreased order
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-23-openjdk/bin/java /usr/lib/jvm/java-23-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-22-openjdk/bin/java /usr/lib/jvm/java-22-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-20-openjdk/bin/java /usr/lib/jvm/java-20-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-19-openjdk/bin/java /usr/lib/jvm/java-19-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-16-openjdk/bin/java /usr/lib/jvm/java-16-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-15-openjdk/bin/java /usr/lib/jvm/java-15-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-14-openjdk/bin/java /usr/lib/jvm/java-14-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java"
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
# Development version(s)
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-19-openjdk/bin/java /usr/lib/jvm/java-19-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
fi
}
@@ -55,6 +59,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 [ "$(LC_ALL=C LANG=C 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/latest/usr/share/metainfo/org.openstreetmap.josm-latest.appdata.xml
=====================================
@@ -3,7 +3,9 @@
<id>org.openstreetmap.josm-latest</id>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>GPL-2.0+</project_license>
- <developer_name>JOSM developers</developer_name>
+ <developer id="org.openstreetmap.josm">
+ <name>JOSM developers</name>
+ </developer>
<name>JOSM</name>
<summary>Java OpenStreetMap Editor</summary>
<description>
@@ -23,8 +25,28 @@
<content_rating type="oars-1.1"/>
<launchable type="desktop-id">org.openstreetmap.josm-latest.desktop</launchable>
<screenshots>
- <screenshot type="default" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/native/linux/josm-screenshot.png</screenshot>
+ <screenshot type="default">
+ <image type="source" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/native/linux/josm-screenshot.png</image>
+ <caption>JOSM with data and background layer loaded</caption>
+ </screenshot>
</screenshots>
<url type="homepage">https://josm.openstreetmap.de</url>
- <updatecontact>josm-dev_at_openstreetmap.org</updatecontact>
-</component>
\ No newline at end of file
+ <url type="bugtracker">https://josm.openstreetmap.de/report/1</url>
+ <url type="help">https://josm.openstreetmap.de/wiki/Help</url>
+ <url type="translate">https://josm.openstreetmap.de/wiki/Translations</url>
+ <url type="vcs-browser">https://josm.openstreetmap.de/browser</url>
+ <url type="contribute">https://josm.openstreetmap.de/#Contribute</url>
+ <requires>
+ <memory>128</memory> <!-- Technically doable. No addons, small download area, one imagery layer had 128mb usage. -->
+ <control>keyboard</control>
+ <control>pointing</control>
+ <display_length side="longest" compare="gt">800</display_length> <!-- Due to menu bar -->
+ <display_length side="shortest" compare="gt">600</display_length>
+ </requires>
+ <recommends>
+ <memory>4096</memory>
+ <internet>always</internet>
+ <display_length side="longest" compare="gt">1024</display_length>
+ <display_length side="shortest" compare="gt">768</display_length>
+ </recommends>
+</component>
=====================================
linux/tested/DEBIAN/control
=====================================
@@ -5,7 +5,7 @@ Maintainer: josm developers <josm-dev at openstreetmap.org>
Homepage: https://josm.openstreetmap.de
Priority: extra
Architecture: all
-Depends: openjdk-11-jre | java11-runtime | openjdk-8-jre | java8-runtime,
+Depends: default-jre (>= 2:1.17) | java11-runtime,
proj-data, fonts-noto, openjfx
Conflicts: josm-plugins
Replaces: josm-plugins
=====================================
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
=====================================
@@ -21,20 +21,24 @@ dpkg_java() {
if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \
|| dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then
# LTS versions in decreased order
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-21-openjdk/bin/java /usr/lib/jvm/java-21-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-17-openjdk/bin/java /usr/lib/jvm/java-17-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
# Released versions in decreased order
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-24-openjdk/bin/java /usr/lib/jvm/java-24-openjdk-$ARCH/bin/java"
+ # EOL versions in decreased order
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-23-openjdk/bin/java /usr/lib/jvm/java-23-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-22-openjdk/bin/java /usr/lib/jvm/java-22-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-20-openjdk/bin/java /usr/lib/jvm/java-20-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-19-openjdk/bin/java /usr/lib/jvm/java-19-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-18-openjdk/bin/java /usr/lib/jvm/java-18-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-16-openjdk/bin/java /usr/lib/jvm/java-16-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-15-openjdk/bin/java /usr/lib/jvm/java-15-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-14-openjdk/bin/java /usr/lib/jvm/java-14-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java"
JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java"
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
# Development version(s)
- JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-19-openjdk/bin/java /usr/lib/jvm/java-19-openjdk-$ARCH/bin/java"
+ JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
fi
}
@@ -55,6 +59,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 [ "$(LC_ALL=C LANG=C 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/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
=====================================
@@ -3,7 +3,9 @@
<id>org.openstreetmap.josm</id>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>GPL-2.0+</project_license>
- <developer_name>JOSM developers</developer_name>
+ <developer id="org.openstreetmap.josm">
+ <name>JOSM developers</name>
+ </developer>
<name>JOSM</name>
<summary>Java OpenStreetMap Editor</summary>
<description>
@@ -23,8 +25,28 @@
<content_rating type="oars-1.1"/>
<launchable type="desktop-id">org.openstreetmap.josm.desktop</launchable>
<screenshots>
- <screenshot type="default" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/native/linux/josm-screenshot.png</screenshot>
+ <screenshot type="default">
+ <image type="source" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/native/linux/josm-screenshot.png</image>
+ <caption>JOSM with data and background layer loaded</caption>
+ </screenshot>
</screenshots>
<url type="homepage">https://josm.openstreetmap.de</url>
- <updatecontact>josm-dev_at_openstreetmap.org</updatecontact>
-</component>
\ No newline at end of file
+ <url type="bugtracker">https://josm.openstreetmap.de/report/1</url>
+ <url type="help">https://josm.openstreetmap.de/wiki/Help</url>
+ <url type="translate">https://josm.openstreetmap.de/wiki/Translations</url>
+ <url type="vcs-browser">https://josm.openstreetmap.de/browser</url>
+ <url type="contribute">https://josm.openstreetmap.de/#Contribute</url>
+ <requires>
+ <memory>128</memory> <!-- Technically doable. No addons, small download area, one imagery layer had 128mb usage. -->
+ <control>keyboard</control>
+ <control>pointing</control>
+ <display_length side="longest" compare="gt">800</display_length> <!-- Due to menu bar -->
+ <display_length side="shortest" compare="gt">600</display_length>
+ </requires>
+ <recommends>
+ <memory>4096</memory>
+ <internet>always</internet>
+ <display_length side="longest" compare="gt">1024</display_length>
+ <display_length side="shortest" compare="gt">768</display_length>
+ </recommends>
+</component>
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/455aa96eeda6787d0e2e032b6a0920b4fc8ab7de...21b81410b56052f8e090e28522c825696ef16da0
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/455aa96eeda6787d0e2e032b6a0920b4fc8ab7de...21b81410b56052f8e090e28522c825696ef16da0
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/20250502/74229b93/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list