[Git][debian-gis-team/josm-installer][master] 3 commits: Updated linux directory to r18297.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue Nov 2 05:09:14 GMT 2021
Bas Couwenberg pushed to branch master at Debian GIS Project / josm-installer
Commits:
5f61a138 by Bas Couwenberg at 2021-11-02T05:58:38+01:00
Updated linux directory to r18297.
- - - - -
e39ea3d0 by Bas Couwenberg at 2021-11-02T06:03:29+01:00
Move systemd files back to /lib.
- - - - -
afe8dede by Bas Couwenberg at 2021-11-02T06:03:39+01:00
Set distribution to unstable.
- - - - -
6 changed files:
- debian/changelog
- debian/rules
- linux/latest/usr/bin/josm-latest
- linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop
- linux/tested/usr/bin/josm
- linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
Changes:
=====================================
debian/changelog
=====================================
@@ -1,11 +1,13 @@
-josm-installer (0.0.2+svn18171) UNRELEASED; urgency=medium
+josm-installer (0.0.1+svn18297) unstable; urgency=medium
* Bump Standards-Version to 4.6.0, no changes.
* Bump debhelper compat to 12, changes:
- Drop --list-missing from dh_install
* Update lintian overrides.
+ * Updated linux directory to r18297.
+ * Move systemd files back to /lib.
- -- Bas Couwenberg <sebastic at debian.org> Wed, 08 Sep 2021 16:32:35 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 02 Nov 2021 06:03:30 +0100
josm-installer (0.0.1+svn18171) unstable; urgency=medium
=====================================
debian/rules
=====================================
@@ -32,9 +32,9 @@ override_dh_auto_install:
install -o root -g root -m 755 $(CURDIR)/josm $(CURDIR)/debian/josm-installer/usr/bin/josm
install -o root -g root -m 755 $(CURDIR)/josm-installer.py $(CURDIR)/debian/josm-installer/usr/bin/josm-installer
- install -o root -g root -d $(CURDIR)/debian/josm-installer/usr/lib/systemd/system
- install -o root -g root -m 644 $(CURDIR)/josm-installer.service $(CURDIR)/debian/josm-installer/usr/lib/systemd/system/josm-installer.service
- install -o root -g root -m 644 $(CURDIR)/josm-installer.timer $(CURDIR)/debian/josm-installer/usr/lib/systemd/system/josm-installer.timer
+ install -o root -g root -d $(CURDIR)/debian/josm-installer/lib/systemd/system
+ install -o root -g root -m 644 $(CURDIR)/josm-installer.service $(CURDIR)/debian/josm-installer/lib/systemd/system/josm-installer.service
+ install -o root -g root -m 644 $(CURDIR)/josm-installer.timer $(CURDIR)/debian/josm-installer/lib/systemd/system/josm-installer.timer
install -o root -g root -d $(CURDIR)/debian/josm-installer/usr/share/josm
install -o root -g root -m 644 $(CURDIR)/placeholder $(CURDIR)/debian/josm-installer/usr/share/josm/.placeholder
=====================================
linux/latest/usr/bin/josm-latest
=====================================
@@ -15,6 +15,7 @@ JAVA_CMDS="$JAVA_HOME/bin/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-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
@@ -26,7 +27,6 @@ if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \
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-17-openjdk/bin/java /usr/lib/jvm/java-17-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"
fi
# Undetermined version
@@ -62,6 +62,9 @@ if [ "$JAVACMD" ]; then
JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
elif [[ "${JAVACMD}" =~ 'java-1' ]]; then
JAVA_OPTS="--module-path /usr/share/openjfx/lib --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+ 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"
fi
set +e
while true; do
=====================================
linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop
=====================================
@@ -7,7 +7,7 @@ Comment=Extensible off-line editor for OpenStreetMap (OSM)
Icon=org.openstreetmap.josm-latest
Exec=josm-latest %U
Terminal=false
-MimeType=application/x-osm+xml;application/x-gpx+xml;application/geo+json;application/x-josm-session+xml;application/x-josm-session+zip;x-scheme-handler/geo;
+MimeType=application/geo+json;application/gpx+xml;application/gzip;application/x-bzip;application/x-bzip;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
StartupNotify=true
Categories=Education;Geoscience;Maps;
StartupWMClass=org-openstreetmap-josm-MainApplication
=====================================
linux/tested/usr/bin/josm
=====================================
@@ -15,6 +15,7 @@ JAVA_CMDS="$JAVA_HOME/bin/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-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
@@ -26,7 +27,6 @@ if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \
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-17-openjdk/bin/java /usr/lib/jvm/java-17-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"
fi
# Undetermined version
@@ -62,6 +62,9 @@ if [ "$JAVACMD" ]; then
JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
elif [[ "${JAVACMD}" =~ 'java-1' ]]; then
JAVA_OPTS="--module-path /usr/share/openjfx/lib --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
+ 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"
fi
set +e
while true; do
=====================================
linux/tested/usr/share/applications/org.openstreetmap.josm.desktop
=====================================
@@ -7,7 +7,7 @@ Comment=Extensible off-line editor for OpenStreetMap (OSM)
Icon=org.openstreetmap.josm
Exec=josm %U
Terminal=false
-MimeType=application/x-osm+xml;application/x-gpx+xml;application/geo+json;application/x-josm-session+xml;application/x-josm-session+zip;x-scheme-handler/geo;
+MimeType=application/geo+json;application/gpx+xml;application/gzip;application/x-bzip;application/x-bzip;application/x-gpx+xml;application/x-josm-session+xml;application/x-josm-session+zip;application/x-osm+xml;application/x-xz;application/zip;x-scheme-handler/geo;
StartupNotify=true
Categories=Education;Geoscience;Maps;
StartupWMClass=org-openstreetmap-josm-MainApplication
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/e48f45cb90958de26dcc299f4bd045f8ef9e4a9e...afe8dedeb3e847239bc82d83b07807016f001684
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/e48f45cb90958de26dcc299f4bd045f8ef9e4a9e...afe8dedeb3e847239bc82d83b07807016f001684
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/20211102/c386eb1a/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list