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

[Bas Couwenberg (@sebastic)]

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


Commits:
5389c2b6 by Bas Couwenberg at 2021-09-02T06:12:43+02:00
Updated linux directory to r18171.

- - - - -
f9121238 by Bas Couwenberg at 2021-09-02T06:18:33+02:00
Install systemd service and timer in /usr/lib instead of /usr.

- - - - -
08123651 by Bas Couwenberg at 2021-09-02T06:23:43+02:00
Update lintian overrides.

- - - - -
ebc1586f by Bas Couwenberg at 2021-09-02T06:23:43+02:00
Set distribution to unstable.

- - - - -


7 changed files:

- debian/changelog
- + debian/lintian-overrides
- debian/rules
- linux/latest/DEBIAN/control
- linux/latest/usr/bin/josm-latest
- linux/tested/DEBIAN/control
- linux/tested/usr/bin/josm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+josm-installer (0.0.1+svn18171) unstable; urgency=medium
+
+  * Updated linux directory to r18171.
+  * Install systemd service and timer in /usr/lib instead of /usr.
+  * Update lintian overrides.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 02 Sep 2021 06:12:46 +0200
+
 josm-installer (0.0.1+svn17970) unstable; urgency=medium
 
   * Move from experimental to unstable.


=====================================
debian/lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Service used by timer
+package-supports-alternative-init-but-no-init.d-script *
+


=====================================
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/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/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/usr/share/josm
 	install -o root -g root -m 644 $(CURDIR)/placeholder $(CURDIR)/debian/josm-installer/usr/share/josm/.placeholder


=====================================
linux/latest/DEBIAN/control
=====================================
@@ -6,8 +6,7 @@ Homepage: https://josm.openstreetmap.de
 Priority: extra
 Architecture: all
 Depends: openjdk-11-jre | java11-runtime | openjdk-8-jre | java8-runtime,
-         proj-data, fonts-noto
-Recommends: openjfx
+         proj-data, fonts-noto, openjfx
 Description: Editor for OpenStreetMap (daily development snapshot)
  JOSM is an editor for OpenStreetMap (OSM) written in Java.
   The current version supports stand alone GPX tracks, GPX track data


=====================================
linux/latest/usr/bin/josm-latest
=====================================
@@ -61,7 +61,7 @@ if [ "$JAVACMD" ]; then
     if [[ "${JAVACMD}" =~ 'java-9' ]] || [[ "${JAVACMD}" =~ 'java-10' ]]; then
         JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
     elif [[ "${JAVACMD}" =~ 'java-1' ]]; then
-        JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS"
+        JAVA_OPTS="--module-path /usr/share/openjfx/lib --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
     fi
     set +e
     while true; do


=====================================
linux/tested/DEBIAN/control
=====================================
@@ -6,8 +6,7 @@ Homepage: https://josm.openstreetmap.de
 Priority: extra
 Architecture: all
 Depends: openjdk-11-jre | java11-runtime | openjdk-8-jre | java8-runtime,
-         proj-data, fonts-noto
-Recommends: openjfx
+         proj-data, fonts-noto, openjfx
 Conflicts: josm-plugins
 Replaces: josm-plugins
 Description: Editor for OpenStreetMap


=====================================
linux/tested/usr/bin/josm
=====================================
@@ -61,7 +61,7 @@ if [ "$JAVACMD" ]; then
     if [[ "${JAVACMD}" =~ 'java-9' ]] || [[ "${JAVACMD}" =~ 'java-10' ]]; then
         JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
     elif [[ "${JAVACMD}" =~ 'java-1' ]]; then
-        JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS"
+        JAVA_OPTS="--module-path /usr/share/openjfx/lib --add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web $JAVA_OPTS"
     fi
     set +e
     while true; do



View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/9d73d9b7b8fc095cab60395bdadadec1742c2b53...ebc1586fbd65cdaf3c8adf81a690c2beb126816a

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm-installer/-/compare/9d73d9b7b8fc095cab60395bdadadec1742c2b53...ebc1586fbd65cdaf3c8adf81a690c2beb126816a
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/20210902/2b469e11/attachment-0001.htm>