r7909 - in packages/trunk/freecol/debian: . wrapper

[Vincent Fourmond]

Author: fourmond
Date: 2008-08-10 08:44:46 +0000 (Sun, 10 Aug 2008)
New Revision: 7909

Modified:
   packages/trunk/freecol/debian/changelog
   packages/trunk/freecol/debian/wrapper/freecol
Log:
[freecol] Work around a bug in current java-wrappers

Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog	2008-08-10 08:14:34 UTC (rev 7908)
+++ packages/trunk/freecol/debian/changelog	2008-08-10 08:44:46 UTC (rev 7909)
@@ -6,8 +6,9 @@
   * 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
 

Modified: packages/trunk/freecol/debian/wrapper/freecol
===================================================================
--- packages/trunk/freecol/debian/wrapper/freecol	2008-08-10 08:14:34 UTC (rev 7908)
+++ packages/trunk/freecol/debian/wrapper/freecol	2008-08-10 08:44:46 UTC (rev 7909)
@@ -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