[freecol] 33/125: [freecol] Work around a bug in current java-wrappers

[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 08d6d4ef01a685d209b021c1ccd0f369449e7dfa
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sun Aug 10 08:44:46 2008 +0000

    [freecol] Work around a bug in current java-wrappers
---
 debian/changelog       | 3 ++-
 debian/wrapper/freecol | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 847a6d1..efe7ab4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ freecol (0.7.4.dfsg-2) UNRELEASED; urgency=low
   * Add openjdk in the wrapper script, and tighten up dependency on
     java-wrappers accordingly.
   * freecol can now move to main ! (closes: #491260)
+  * Adapted wrapper/freecol to work around a java-wrappers bug
 
- -- Vincent Fourmond <fourmond at debian.org>  Sat, 09 Aug 2008 22:39:39 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 10 Aug 2008 09:27:55 +0200
 
 freecol (0.7.4.dfsg-1) unstable; urgency=low
 
diff --git a/debian/wrapper/freecol b/debian/wrapper/freecol
index bd85918..67177c0 100755
--- a/debian/wrapper/freecol
+++ b/debian/wrapper/freecol
@@ -3,8 +3,8 @@
 # Including wrapper script:
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-# We need openjdk, icedtea or Sun 6
-find_java_runtime openjdk icedtea sun6
+# We need openjdk, icedtea  or Sun 6
+find_java_runtime openjdk || find_java_runtime icedtea || find_java_runtime sun6
 
 find_jars higlayout wstx-lgpl freecol
 

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