[Git][debian-gis-team/josm-installer][master] 7 commits: Update branch in gbp.conf & Vcs-Git URL.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Aug 10 09:33:20 BST 2025
Bas Couwenberg pushed to branch master at Debian GIS Project / josm-installer
Commits:
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.
- - - - -
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.
- - - - -
6076384c by Bas Couwenberg at 2025-08-10T10:30:08+02:00
Revert "Update branch in gbp.conf & Vcs-Git URL."
This reverts commit 59397dbb7161e9520ba5b7e72e15b1c404ce79e4.
- - - - -
4e8103e1 by Bas Couwenberg at 2025-08-10T10:30:37+02:00
Move from experimental to unstable.
- - - - -
4 changed files:
- debian/changelog
- josm
- linux/latest/usr/bin/josm-latest
- linux/tested/usr/bin/josm
Changes:
=====================================
debian/changelog
=====================================
@@ -1,9 +1,22 @@
-josm-installer (0.0.7+svn19237) UNRELEASED; urgency=medium
+josm-installer (0.0.7+svn19419) unstable; urgency=medium
+
+ * Move from experimental to unstable.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 10 Aug 2025 10:30:20 +0200
+
+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.
* Fix old FSF address in copyright file.
+ * Updated linux directory to r19381.
- -- Bas Couwenberg <sebastic at debian.org> Thu, 20 Mar 2025 06:08:00 +0100
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 02 May 2025 17:26:43 +0200
josm-installer (0.0.6+svn19237) unstable; urgency=medium
=====================================
josm
=====================================
@@ -34,8 +34,10 @@ dpkg_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"
# Released versions in decreased order
- 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-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"
@@ -45,7 +47,7 @@ dpkg_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"
# Development version(s)
- 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-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
fi
}
=====================================
linux/latest/usr/bin/josm-latest
=====================================
@@ -25,8 +25,10 @@ dpkg_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"
# Released versions in decreased order
- 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-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"
@@ -36,7 +38,7 @@ dpkg_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"
# Development version(s)
- 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-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
fi
}
@@ -89,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
=====================================
@@ -25,8 +25,10 @@ dpkg_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"
# Released versions in decreased order
- 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-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"
@@ -36,7 +38,7 @@ dpkg_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"
# Development version(s)
- 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-25-openjdk/bin/java /usr/lib/jvm/java-25-openjdk-$ARCH/bin/java"
fi
}
@@ -89,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/b63d826ed18f657dd65b490523b24ed127e824bb...4e8103e1485e5948220f648b17ec754d288bcc46
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/b63d826ed18f657dd65b490523b24ed127e824bb...4e8103e1485e5948220f648b17ec754d288bcc46
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/20250810/afaef08c/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list