[DebianGIS-dev] r1446 - packages/josm/trunk/debian

[pere at alioth.debian.org]

Author: pere
Date: 2008-03-25 22:54:41 +0000 (Tue, 25 Mar 2008)
New Revision: 1446

Modified:
   packages/josm/trunk/debian/changelog
   packages/josm/trunk/debian/josm.sh
Log:
  [ Andreas Putzo ]
  [ Petter Reinholdtsen ]
  * Change wrapper script selection algorithm to try the users preference as
    defined by $JAVA_HOME first.  Next, the other JVMs known to work with josm,
    with the one working best first, and the less functional ones after that.

Modified: packages/josm/trunk/debian/changelog
===================================================================
--- packages/josm/trunk/debian/changelog	2008-03-25 22:07:30 UTC (rev 1445)
+++ packages/josm/trunk/debian/changelog	2008-03-25 22:54:41 UTC (rev 1446)
@@ -1,9 +1,15 @@
 josm (0.0.0.20080316-2) UNRELEASED; urgency=low
 
+  [ Andreas Putzo ]
   * Add 50_OsmServerWriter.dpatch to allow uploading with gcj.
   * Suppress some compiler warnings (serial, unusedImport) in build.xml.
   * Update wrapper script to choose a working jvm. 
 
+  [ Petter Reinholdtsen ]
+  * Change wrapper script selection algorithm to try the users preference as
+    defined by $JAVA_HOME first.  Next, the other JVMs known to work with josm,
+    with the one working best first, and the less functional ones after that.
+
  -- Andreas Putzo <andreas at putzo.net>  Tue, 25 Mar 2008 21:29:28 +0000
 
 josm (0.0.0.20080316-1) unstable; urgency=low

Modified: packages/josm/trunk/debian/josm.sh
===================================================================
--- packages/josm/trunk/debian/josm.sh	2008-03-25 22:07:30 UTC (rev 1445)
+++ packages/josm/trunk/debian/josm.sh	2008-03-25 22:54:41 UTC (rev 1446)
@@ -2,7 +2,11 @@
 # Simple wrapper script used to start JOSM in Debian
 set -e
 
-JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/gij-4.1 /usr/bin/jamvm /usr/lib/jvm/java-6-sun/jre/bin/java /usr/lib/jvm/java-1.5.0-sun/jre/bin/java"
+# First, the users preference as defined by $JAVA_HOME.  Next, the
+# other JVMs known to work with josm, with the one working best
+# first, and the less functional ones after that.  Override to a
+# specific one using $JAVACMD
+JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/jre/bin/java /usr/lib/jvm/java-1.5.0-sun/jre/bin/java /usr/bin/jamvm /usr/bin/gij-4.1"
 
 for jcmd in $JAVA_CMDS; do 
     if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then