[freecol] 47/125: [freecol] Fix the problem with local games, at the cost of a potential discomfort for people playing over IPV6

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freecol.

commit 1a83767de528edbcc25d7c71ed4b7f25fe144085
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Thu Jan 7 21:56:36 2010 +0000

    [freecol] Fix the problem with local games, at the cost of a potential discomfort for people playing over IPV6
---
 debian/NEWS            |  9 +++++++++
 debian/changelog       |  9 +++++++++
 debian/control         |  5 +++--
 debian/wrapper/freecol | 12 +++++++++++-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 368fe96..09f0c08 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,12 @@
+freecol (0.8.4+dfsg-1) unstable; urgency=low
+
+  To work around bug #560056 on openjdk, IPV6 network stack is now
+  disabled by default. If you experience problems connecting to remote
+  servers, you can try enabling it back by passing --enable-ipv6 as 
+  first argument to freecol.
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 07 Jan 2010 22:44:32 +0100
+
 freecol (0.8.1.dfsg-1) unstable; urgency=low
 
   Saved games from version before 0.8 WILL NOT WORK with this version. 
diff --git a/debian/changelog b/debian/changelog
index 5d3c0ba..8468450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+freecol (0.8.4+dfsg-2) unstable; urgency=low
+
+  * Disable IPV6 networking stack by default to work around Java bug
+  (see #560056) (closes: #562133)
+  * Already conforms to standards 3.8.3
+  * Update build-deps to reflect changes in TeXLive
+
+ -- Vincent Fourmond <fourmond at debian.org>  Thu, 07 Jan 2010 22:53:26 +0100
+
 freecol (0.8.4+dfsg-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index ff9b454..f46481e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,9 @@ Uploaders: Vincent Fourmond <fourmond at debian.org>
 Build-Depends: debhelper (>= 5), dpatch, 
  ant, openjdk-6-jdk, cdbs
 Build-Depends-Indep: libhiglayout-java, libwoodstox-java,
-  tex4ht, texlive-base-bin, ant-optional, texlive-latex-recommended
-Standards-Version: 3.8.2
+ tex4ht, texlive-binaries | texlive-base-bin, ant-optional,
+ texlive-latex-recommended
+Standards-Version: 3.8.3
 Homepage: http://www.freecol.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/freecol
diff --git a/debian/wrapper/freecol b/debian/wrapper/freecol
index 05146d2..ad91c12 100755
--- a/debian/wrapper/freecol
+++ b/debian/wrapper/freecol
@@ -14,5 +14,15 @@ if [ "$LC_CTYPE" != "$LC_MESSAGES" -a "$LC_MESSAGES" ]; then
     lang_argument="--default-locale=$LC_MESSAGES"
 fi
 
-run_java -Xmx180M net.sf.freecol.FreeCol --freecol-data \
+if [ "$1" = "--enable-ipv6" ]; then
+    shift;
+else
+    echo "Disabling IPV6 network stack to work around bug #560056 on openjdk"
+    echo "If you experience problems with connecting to remote servers, "
+    echo "you can put it back by running Freecol this way:"
+    echo "  freecol --enable-ipv6" "$@"
+    disablenet="-Djava.net.preferIPv4Stack=true"
+fi
+
+run_java $disablenet -Xmx180M net.sf.freecol.FreeCol --freecol-data \
     /usr/share/games/freecol $lang_argument "$@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git