[jabref] 159/459: merge change in wrapper script from 2.3

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository jabref.

commit b186b09dea2833a5fc79a2da249730339f1c29e6
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu May 1 23:32:44 2008 +0000

    merge change in wrapper script from 2.3
---
 debian/changelog      | 3 +++
 debian/jabref-wrapper | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d6f50dd..0a037c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ jabref (2.4~beta1-1) UNRELEASED; urgency=low
     gcj.
   * Move wrapper script in source package to debian/jabref-wrapper and
     install it from debian/rules.
+  * Replace /usr/lib/jvm/java-7-icedtea with /usr/lib/jvm/java-6-openjdk in
+    wrapper script. Doesn't work on Debian yet but helps Ubuntu users (cf.
+    LP: #225450 and LP: #203636).
   * Sync debian/copyright with output of Help/About.
   * Sync manpage with output of --help.
   * debian/watch: add uversionmangle to cope with upstream b(eta) releases.
diff --git a/debian/jabref-wrapper b/debian/jabref-wrapper
index 8f8c305..e29f7f5 100644
--- a/debian/jabref-wrapper
+++ b/debian/jabref-wrapper
@@ -6,7 +6,7 @@
 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
-	t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t
+	t=/usr/lib/jvm/java-6-openjdk && test -d $t && JAVA_HOME=$t
 	test -n "$JAVA_HOME" && JAVA=${JAVA_HOME}/jre/bin/java
 fi
 

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