merge changes from trunk/2.3.1-6 into 2.4 branch

diff --git a/debian/README.Debian b/debian/README.Debian
index 0bdd84a..03674c1 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,18 +1,15 @@
 JabRef for Debian
 -----------------
 
-Please note that JabRef needs Sun Java.
+Please note that JabRef needs OpenJDK (or Sun Java 5/6).
 
 Starting with version 2.2-01-4 /usr/bin/jabref should find and use your
-installed Sun Java virtual machine. If for some reasons the script fails 
-it falls back to just calling `java'.
+installed OpenJDK or Sun Java virtual machine.
 
-In that case you might get ugly errors at starting JabRef if you have
-another Java runtime engine than the Sun JVM set as your default Java
-virtual machine. This can easily be changed by running
+In case it doesn't find any of them it falls back to using another JVM it
+finds on your system.
 
-       # update-alternatives --config java
+If you want to override this selection mechanism start JabRef with
+       JAVA_HOME=/path/to/your/JVM jabref
 
-as root and explicitly choosing Sun Java there.
-
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Fri, 16 Mar 2007 02:35:10 +0100
+ -- gregor herrmann <gregoa@debian.org>  Fri, 21 Nov 2008 21:27:10 +0100

diff --git a/debian/changelog b/debian/changelog
index 91471cc..444e088 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,20 @@
 jabref (2.4~beta1-1) UNRELEASED; urgency=low
   
   * foo
-    * debian/watch: back to the redirector at qa.debian.org.
 
  -- gregor herrmann <gregoa@debian.org>  Wed, 16 Jul 2008 22:24:25 +0200
 
+jabref (2.3.1-6) unstable; urgency=low
+
+  * debian/watch: back to the redirector at qa.debian.org.
+  * Use java-wrappers instead of the hand-crafted wrapper script; thanks to
+    Vincent Fourmond for the patch (closes: #506219).
+  * Update README.Debian: mention supported Java virtual machines and
+    JAVA_HOME (cf. LP: #258198).
+  * debian/rules: set JAVA_HOME=/usr/lib/jvm/default-java.
+
+ -- gregor herrmann <gregoa@debian.org>  Fri, 21 Nov 2008 21:46:28 +0100
+
 jabref (2.3.1-5) unstable; urgency=low
 
   * Change runtime dependency from "sun-java6-jre | sun-java5-jre" to

diff --git a/debian/control b/debian/control
index 172f04d..6159635 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: all
 Depends: openjdk-6-jre | sun-java6-jre | sun-java5-jre, antlr, antlr3,
  libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
  libglazedlists-java, libmicroba-java, libpdfbox-java,
- libjempbox-java (>= 0.2.0)
+ libjempbox-java (>= 0.2.0), java-wrappers (>= 0.1.6)
 Suggests: gv | postscript-viewer, xpdf | pdf-viewer
 Description: graphical frontend to manage BibTeX databases
  JabRef is a GUI to manage BibTeX databases, the standard LaTeX bibliography

diff --git a/debian/jabref-wrapper b/debian/jabref-wrapper
index e29f7f5..e2b391d 100644 (file)
--- a/debian/jabref-wrapper
+++ b/debian/jabref-wrapper
@@ -1,15 +1,11 @@
 #!/bin/sh
 
-# jabref wrapper script
-# code for java detection borrowed from tuxguitar
+# Include the wrappers utility script
+. /usr/lib/java-wrappers/java-wrappers.sh
 
-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-6-openjdk && test -d $t && JAVA_HOME=$t
-       test -n "$JAVA_HOME" && JAVA=${JAVA_HOME}/jre/bin/java
-fi
+# We need openjdk6 or sun{5,6} runtime.
+find_java_runtime openjdk || find_java_runtime sunmin5
 
-export JAVA=${JAVA:=java}
+find_jars jabref antlr antlr3 looks forms spin glazedlists microba pdfbox jempbox
 
-exec $JAVA -jar /usr/share/java/jabref.jar "$@"
+run_java net.sf.jabref.JabRefMain "$@"

diff --git a/debian/jabref.1 b/debian/jabref.1
index be67fed..8cdad33 100644 (file)
--- a/debian/jabref.1
+++ b/debian/jabref.1
@@ -68,10 +68,18 @@ Display version
 .TP
 \fB\-l\fR, \fB\-\-loads\fR=<BOOLEAN>
 Load session
+.SH JAVA-WRAPPERS NOTE
+This program is a shell script wrapper based on
+.BR java-wrappers (7).
+You therefore benefit from several features; please see the 
+.BR java-wrappers (7)
+manual page for more information about them.
 .SH SEE ALSO
 the included help
 .br
 http://jabref.sourceforge.net/
+.br
+.BR java-wrappers (7)
 .SH AUTHOR
 jabref was written by Morten O. Alver and Nizar Batada.
 .PP

diff --git a/debian/rules b/debian/rules
index ddf2d46..8fbbec9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ configure-stamp: patch
 build: build-stamp
 build-stamp: configure-stamp
        dh_testdir
-       JAVA_HOME=/usr/lib/jvm/java-gcj ant jars
+       JAVA_HOME=/usr/lib/jvm/default-java ant jars
        convert -geometry 32x32 src/images/JabRef-icon-48.png build/jabref32.xpm
        convert -geometry 16x16 src/images/JabRef-icon-48.png build/jabref16.xpm
        touch build-stamp