[DebianGIS-dev] [SCM] josm branch, master, updated. debian/0.0.svn3751-2-2-g0e32c8b

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit b53d3edc9d5771382e70d3e6f43200af48505eca
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Sun Jan 16 14:49:57 2011 +0100

    Using system proxy settings.

diff --git a/debian/changelog b/debian/changelog
index 346ae7e..1a0104e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn3751-3) UNRELEASED; urgency=low
+
+  * Use system proxy settings by default (closes: #610006).
+
+ -- Giovanni Mascellani <gio at debian.org>  Sun, 16 Jan 2011 14:47:25 +0100
+
 josm (0.0.svn3751-2) unstable; urgency=low
 
   * Added recommends to webkit-image-gtk | webkit-image-qt
diff --git a/debian/josm.sh b/debian/josm.sh
index 8bc1c45..7790fd2 100644
--- a/debian/josm.sh
+++ b/debian/josm.sh
@@ -13,7 +13,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"
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true -Djava.net.useSystemProxies=true"
 
 for jcmd in $JAVA_CMDS; do
 	if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then

-- 
Java OpenStreetMap editor