[DebianGIS-dev] [SCM] josm branch, master, updated. upstream/0.0.svn2255-15-gfb5c4d8

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit fb5c4d87dddd5422a54c5c0bc4fe9d54129b0875
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Feb 12 21:23:47 2010 +0100

    prefer ipv4

diff --git a/debian/changelog b/debian/changelog
index 02ffc5e..7f6a7d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ josm (0.0.svn2561-1) UNRELEASED; urgency=low
 
   [ Giovanni Mascellani ]
   * New upstream release (closes: #561184)
+  * Prefer IPv4 stack (temporary workaroung for the bindv6only Java bug)
 
- -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Sat, 19 Dec 2009 10:23:17 +0100
+ -- Giovanni Mascellani <mascellani at poisson.phc.unipi.it>  Fri, 12 Feb 2010 21:23:01 +0100
 
 josm (0.0.svn2255-1) unstable; urgency=low
 
diff --git a/debian/josm.sh b/debian/josm.sh
index 09ed031..fabe3af 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -6,6 +6,7 @@ set -e
 # Override to a specific one using $JAVACMD
 ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
 JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-openjdk/bin/java /usr/lib/jvm/java-6-sun/bin/java /usr/lib/jvm/java-1.5.0-sun/bin/java"
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
 
 for jcmd in $JAVA_CMDS; do
 	if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then

-- 
Java OpenStreetMap editor