This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 51384291809856eef1694d9d87506885734c0ef9 Author: gregor herrmann <[email protected]> Date: Mon Feb 11 16:00:11 2008 +0000 * Only set JAVA to $JAVA_HOME/jre/bin/java if JAVA_HOME is not empty; thanks to Michael Piefel for the hint. * Set debhelper compatibility level to 6. --- debian/changelog | 5 ++++- debian/compat | 2 +- debian/control | 2 +- jabref | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index d245d4c..11467df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,11 @@ jabref (2.3.1-2) UNRELEASED; urgency=low * Change pdfviewer to pdf-viewer in Suggests:. * Set Standards-Version to 3.7.3 (no changes required). * debian/rules: explicitly set JAVA_HOME. + * Only set JAVA to $JAVA_HOME/jre/bin/java if JAVA_HOME is not empty; + thanks to Michael Piefel for the hint. + * Set debhelper compatibility level to 6. - -- gregor herrmann <[email protected]> Tue, 25 Dec 2007 01:09:10 +0100 + -- gregor herrmann <[email protected]> Mon, 11 Feb 2008 16:51:33 +0100 jabref (2.3.1-1) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 7ed6ff8..1e8b314 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +6 diff --git a/debian/control b/debian/control index 1b646bb..31960de 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: contrib/tex Priority: optional Maintainer: gregor herrmann <[email protected]> Uploaders: tony mancill <[email protected]> -Build-Depends: debhelper (>= 5.0.0), dpatch, ant +Build-Depends: debhelper (>= 6), dpatch, ant Build-Depends-Indep: java-gcj-compat-dev, imagemagick, liblog4j1.2-java Standards-Version: 3.7.3 Homepage: http://jabref.sourceforge.net/ diff --git a/jabref b/jabref index 2596eba..8f8c305 100644 --- a/jabref +++ b/jabref @@ -3,11 +3,11 @@ # jabref wrapper script # code for java detection borrowed from tuxguitar -if [ -z $JAVA_HOME ] ; then +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 - JAVA=${JAVA_HOME}/jre/bin/java + test -n "$JAVA_HOME" && JAVA=${JAVA_HOME}/jre/bin/java fi export JAVA=${JAVA:=java} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
