[josm] 01/01: Use /etc/default/josm to configure Java options.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit d9f76e0ec7ef6899c7b545555166166eb62a20c1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 19 18:54:09 2016 +0200

    Use /etc/default/josm to configure Java options.
---
 debian/changelog                             |  7 ++++
 debian/patches/09-josm-default-options.patch | 55 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 debian/rules                                 |  3 ++
 4 files changed, 66 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a0649ab..2b8edf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn10327+dfsg-2) UNRELEASED; urgency=medium
+
+  * Use /etc/default/josm to configure Java options.
+    (LP: #287717)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 19 Jun 2016 18:39:37 +0200
+
 josm (0.0.svn10327+dfsg-1) unstable; urgency=medium
 
   * New hotfix tested snapshot.
diff --git a/debian/patches/09-josm-default-options.patch b/debian/patches/09-josm-default-options.patch
new file mode 100644
index 0000000..e6e4a36
--- /dev/null
+++ b/debian/patches/09-josm-default-options.patch
@@ -0,0 +1,55 @@
+Description: Use /etc/default/josm to configure Java options.
+Author: Stéphane Brunner (https://launchpad.net/~stephane-brunner)
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/josm/+bug/287717
+
+--- a/linux/latest/usr/bin/josm-latest
++++ b/linux/latest/usr/bin/josm-latest
+@@ -20,6 +20,10 @@ else
+ 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
+ fi
+ 
++if [ -f /etc/default/josm-latest ]; then
++    . /etc/default/josm-latest
++fi
++
+ JAVA_OPTS="-Djosm.restart=true -Djosm.home=$HOME/.josm-latest -Djava.net.useSystemProxies=true $JAVA_OPTS"
+ 
+ if [ -z "${JAVACMD}" ]; then
+--- a/linux/tested/usr/bin/josm
++++ b/linux/tested/usr/bin/josm
+@@ -20,6 +20,10 @@ else
+ 	JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
+ fi
+ 
++if [ -f /etc/default/josm ]; then
++    . /etc/default/josm
++fi
++
+ JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS"
+ 
+ if [ -z "${JAVACMD}" ]; then
+--- /dev/null
++++ b/linux/latest/etc/default/josm-latest
+@@ -0,0 +1,9 @@
++# Options to pass to java when starting JOSM.
++# Uncomment the JAVA_OPTS lines to enable their use by /usr/bin/josm-latest
++
++# Increase usable memory
++#JAVA_OPTS="${JAVA_OPTS} -Xmx1024m"
++
++# Enable OpenGL pipeline (2D graphic accelerators)
++#JAVA_OPTS="${JAVA_OPTS} -Dsun.java2d.opengl=True"
++
+--- /dev/null
++++ b/linux/tested/etc/default/josm
+@@ -0,0 +1,9 @@
++# Options to pass to java when starting JOSM.
++# Uncomment the JAVA_OPTS lines to enable their use by /usr/bin/josm
++
++# Increase usable memory
++#JAVA_OPTS="${JAVA_OPTS} -Xmx1024m"
++
++# Enable OpenGL pipeline (2D graphic accelerators)
++#JAVA_OPTS="${JAVA_OPTS} -Dsun.java2d.opengl=True"
++
diff --git a/debian/patches/series b/debian/patches/series
index 419e6a3..d8f5420 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 06-move_data_out_of_jar.patch
 07-use_system_fonts.patch
 08-use_noto_font.patch
+09-josm-default-options.patch
diff --git a/debian/rules b/debian/rules
index 750bdab..23b86da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,9 @@ override_dh_auto_install:
 
 	install -m 755 $(CURDIR)/linux/tested/usr/bin/josm $(CURDIR)/debian/josm/usr/bin/josm
 
+	install -o root -g root -d $(CURDIR)/debian/josm/etc/default
+	install -m 644 $(CURDIR)/linux/tested/etc/default/josm $(CURDIR)/debian/josm/etc/default/josm
+
 	for size in 512x512 256x256 192x192 128x128 96x96 80x80 72x72 64x64 48x48 42x42 40x40 36x36 32x32 24x24 22x22 16x16 8x8; do \
 		install -o root -g root -d $(CURDIR)/debian/josm/usr/share/icons/hicolor/$${size}/apps ; \
 		install -o root -g root -m 644 $(CURDIR)/linux/tested/usr/share/icons/hicolor/$${size}/apps/josm.png $(CURDIR)/debian/josm/usr/share/icons/hicolor/$${size}/apps/josm.png ; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git