[Pkg-osm-commits] [SCM] josm branch, master, updated. debian/0.0.svn5267+dfsg1-2-11-gcc30cb5

[David Paleino]

The following commit has been merged in the master branch:
commit 2e64f352d328633940db610596cfb00decc8c253
Author: David Paleino <dapal at debian.org>
Date:   Wed Oct 10 10:42:39 2012 +0200

    Don't prefer IPv4 stack anymore in josm wrapper script, since it seems to be functional now (Closes: #654515)

diff --git a/debian/changelog b/debian/changelog
index 7052802..0c8fed3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ josm (0.0.svn5531+dfsg1-1) UNRELEASED; urgency=low
 
   [ David Paleino ]
   * New tested snapshot (Closes: #685153)
+  * Don't prefer IPv4 stack anymore in josm wrapper script, since
+    it seems to be functional now (Closes: #654515)
 
- -- David Paleino <dapal at debian.org>  Wed, 10 Oct 2012 10:41:05 +0200
+ -- David Paleino <dapal at debian.org>  Wed, 10 Oct 2012 10:42:11 +0200
 
 josm (0.0.svn5267+dfsg1-2) unstable; urgency=low
 
diff --git a/debian/josm.sh b/debian/josm.sh
index f6bd3f8..3187eed 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -16,7 +16,7 @@ else
 	JAVA_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-6-sun/bin/java"
 fi
 
-JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true -Djava.net.useSystemProxies=true"
+JAVA_OPTS="$JAVA_OPTS -Djava.net.useSystemProxies=true"
 
 for jcmd in $JAVA_CMDS; do
 	if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then

-- 
Editor for OpenStreetMap