[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3208-1-19-g14aac9f

[David Paleino]

The following commit has been merged in the master branch:
commit 66d7dc67b0855b16c115d187f288971b3c57951f
Author: David Paleino <dapal at debian.org>
Date:   Thu Jul 15 14:14:48 2010 +0200

    debian/README.Debian deleted, josm is a wrapper that uses the alternatives system

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index d9d459e..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,10 +0,0 @@
-Josm for Debian
----------------
-
-By default josm is launched using OpenJDK-6. This can be overridden
-by exporting the JAVACMD or JAVA_HOME environment variables before
-running josm.
-Note that JOSM doesn't follow the alternative system 
-in /etc/alternatives/ that is usually used on Debian systems.
-
- -- Andreas Putzo <andreas at putzo.net>  Sun, 13 Jul 2008 19:16:59 +0000
diff --git a/debian/changelog b/debian/changelog
index 2849849..5bc3607 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+josm (0.0.svn3329-2) UNRELEASED; urgency=low
+
+  * debian/README.Debian deleted, josm is a wrapper that uses the
+    alternatives system
+
+ -- David Paleino <dapal at debian.org>  Thu, 15 Jul 2010 14:14:10 +0200
+
 josm (0.0.svn3329-1) unstable; urgency=low
 
   [ David Paleino ]
diff --git a/debian/josm.sh b/debian/josm.sh
index fabe3af..62ab577 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -14,7 +14,7 @@ for jcmd in $JAVA_CMDS; do
     fi
 done
 
-for jcmd in $JAVA_CMDS; do 
+for jcmd in $JAVA_CMDS; do
     if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
         JAVACMD="$jcmd"
     fi
@@ -23,7 +23,7 @@ done
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm."
     exec $JAVACMD $JAVA_OPTS -jar /usr/share/josm/josm.jar "$@"
-else    
+else
     echo "No valid JVM found to run JOSM."
     exit 1
 fi

-- 
Java OpenStreetMap editor