Improve wrapper script to avoid unnecessary warnings; thanks to Martin

Lutz for the bug report and to Onkar Shinde for the instructions
(closes: #586781).

diff --git a/debian/changelog b/debian/changelog
index 2c28cfb..0c2fff5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+jabref (2.6+ds-3) UNRELEASED; urgency=low
+
+  * Improve wrapper script to avoid unnecessary warnings; thanks to Martin
+    Lutz for the bug report and to Onkar Shinde for the instructions
+    (closes: #586781).
+
+ -- gregor herrmann <gregoa@debian.org>  Tue, 22 Jun 2010 20:21:42 +0200
+
 jabref (2.6+ds-2) unstable; urgency=low
 
   * debian/control: add "Recommends: xdg-utils"; thanks to Vincent Fourmond

diff --git a/debian/jabref-wrapper b/debian/jabref-wrapper
index 543f3c8..7ad84db 100644 (file)
--- a/debian/jabref-wrapper
+++ b/debian/jabref-wrapper
@@ -4,7 +4,7 @@
 . /usr/lib/java-wrappers/java-wrappers.sh
 
 # We need openjdk6 or sun6 runtime.
-find_java_runtime openjdk6 || find_java_runtime sun6
+find_java_runtime openjdk6 sun6
 
 find_jars jabref antlr antlr3 looks forms spin glazedlists microba pdfbox jempbox mysql-connector-java JPFCodeGenerator-rt jpf jpf-boot commons-logging