[DebianGIS-dev] [SCM] gpsprune branch, master, updated. debian/11-1-1-g5a6edb5

[David Paleino]

The following commit has been merged in the master branch:
commit 5a6edb5a5641ab127c1a0fb08eb346a9361ebdf8
Author: David Paleino <dapal at debian.org>
Date:   Sun Sep 19 22:03:32 2010 +0200

    debian/scripts/gpsprune: fixed to prefer IPv4 when ipv6bindonly is set to 1

diff --git a/debian/changelog b/debian/changelog
index c8ec039..2d6a7f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gpsprune (11-2) UNRELEASED; urgency=low
+
+  * debian/scripts/gpsprune: fixed to prefer IPv4 when ipv6bindonly
+    is set to 1
+
+ -- David Paleino <dapal at debian.org>  Sun, 19 Sep 2010 22:02:45 +0200
+
 gpsprune (11-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/scripts/gpsprune b/debian/scripts/gpsprune
index 63eee47..a842819 100644
--- a/debian/scripts/gpsprune
+++ b/debian/scripts/gpsprune
@@ -1,16 +1,16 @@
 #!/bin/sh
 PRUNEJAR=/usr/share/gpsprune/gpsprune.jar
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
 
 proxyhost=$(echo $http_proxy | sed 's?http://\([^:]\+\).*?\1?')
 proxyport=$(echo $http_proxy | sed 's?http://[^:]\+:\([0-9]\+\)?\1?')
 
 if [ -z $proxyport ] ; then
     if [ -z $proxyhost ] ; then
-        java -jar $PRUNEJAR $@
+        java $JAVA_OPTS -jar $PRUNEJAR $@
     else
-	java -Dhttp.proxyHost=$proxyhost -jar $PRUNEJAR $@
+	java $JAVA_OPTS -Dhttp.proxyHost=$proxyhost -jar $PRUNEJAR $@
     fi
 else
-    java -Dhttp.proxyHost=$proxyhost -Dhttp.proxyPort=$proxyport -jar $PRUNEJAR $@
+    java $JAVA_OPTS -Dhttp.proxyHost=$proxyhost -Dhttp.proxyPort=$proxyport -jar $PRUNEJAR $@
 fi
-

-- 
Tool to visualize, edit, convert and prune GPS data