[jabref] 175/459: * 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.

Thu Sep 15 20:40:12 UTC 2016

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

gregoa pushed a commit to branch master
in repository jabref.

commit e936c65a772ffe1b34211cdef169cfae4c7ada10
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Nov 21 20:46:20 2008 +0000

    * 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.
---
 debian/README.Debian  | 17 +++++++----------
 debian/changelog      |  5 +++++
 debian/control        |  2 +-
 debian/jabref-wrapper | 16 ++++++----------
 debian/jabref.1       |  8 ++++++++
 debian/rules          |  2 +-
 6 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 0bdd84a..03674c1 100644
--- 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 at comodo.priv.at>  Fri, 16 Mar 2007 02:35:10 +0100
+ -- gregor herrmann <gregoa at debian.org>  Fri, 21 Nov 2008 21:27:10 +0100
diff --git a/debian/changelog b/debian/changelog
index 0048022..323423b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 jabref (2.3.1-6) UNRELEASED; 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 at debian.org>  Thu, 28 Aug 2008 21:08:59 +0200
 
diff --git a/debian/control b/debian/control
index ab2b977..8ced20a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,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 ed2382e..e2b391d 100644
--- 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 -cp /usr/share/java/jabref.jar:/usr/share/java/antlr.jar:/usr/share/java/antlr3.jar:/usr/share/java/looks.jar:/usr/share/java/forms.jar:/usr/share/java/spin.jar:/usr/share/java/glazedlists.jar:/usr/share/java/microba.jar:/usr/share/java/pdfbox.jar:/usr/share/java/jempbox.jar net.sf.jabref.JabRefMain "$@"
+run_java net.sf.jabref.JabRefMain "$@"
diff --git a/debian/jabref.1 b/debian/jabref.1
index 235aadb..4b3189c 100644
--- a/debian/jabref.1
+++ b/debian/jabref.1
@@ -65,10 +65,18 @@ Load session
 .TP
 \fB\-s\fR, \fB\-\-nosplash\fR=<BOOLEAN>
 Do not show splash window at startup
+.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 4767acf..04e2931 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ include /usr/share/quilt/quilt.make
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN)
 	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

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

