* Change wrapper script /usr/bin/jabref to explicitly use the Sun Java

  5 or 6 virtual machine (closes: #383019).

diff --git a/debian/changelog b/debian/changelog
index 902f3106b66ace6ad8b8eb371afde769c8009845..bc82e18bcd4c67dc733a925b84e602bbf1a70882 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jabref (2.2-01-4) unstable; urgency=low
+
+  * Change wrapper script /usr/bin/jabref to explicitly use the Sun Java
+    5 or 6 virtual machine (closes: #383019).
+
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Mon, 12 Mar 2007 20:01:27 +0100
+
 jabref (2.2-01-3) unstable; urgency=low
 
   * Add call to dh_desktop to debian/rules.

diff --git a/jabref b/jabref
index 723500d460a965075edc6990512fd523772945a0..a782159f0d10c48dfb25f436d070f146e048a96b 100644 (file)
--- a/jabref
+++ b/jabref
@@ -1,4 +1,15 @@
 #!/bin/sh
 
-java -jar /usr/share/java/jabref.jar "$@"
+# jabref wrapper script
+# code for java detection borrowed from tuxguitar
 
+if [ -z $JAVA_HOME ]
+then
+t=/usr/lib/jvm/java-1.5.0-sun/ && test -d $t && JAVA_HOME=$t
+t=/usr/lib/jvm/java-6-sun/ && test -d $t && JAVA_HOME=$t
+JAVA=${JAVA_HOME}/jre/bin/java
+fi
+
+export JAVA=${JAVA:=java}
+
+$JAVA -jar /usr/share/java/jabref.jar "$@"