[jabref] 118/459: * Add /usr/lib/jvm/java-7-icedtea to wrapper script. Doesn't work on Debian yet but helps Ubuntu users. * TODO: add dependency on icedtea-java7-jre (not yet in Debian). * Move wrapper script to debian/ directory in source package and reformat it.

[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 14b717635551df91ecc7c9013bcfa8f813732836
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Nov 16 17:03:39 2007 +0000

    * Add /usr/lib/jvm/java-7-icedtea to wrapper script. Doesn't work on
      Debian yet but helps Ubuntu users.
    * TODO: add dependency on icedtea-java7-jre (not yet in Debian).
    * Move wrapper script to debian/ directory in source package and reformat
      it.
---
 debian/changelog | 10 ++++++++++
 debian/install   |  2 +-
 debian/jabref    | 15 +++++++++++++++
 jabref           | 15 ---------------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5b24e3..d499d3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+jabref (2.3-2) UNRELEASED; urgency=low
+
+  * Add /usr/lib/jvm/java-7-icedtea to wrapper script. Doesn't work on
+    Debian yet but helps Ubuntu users.
+  * TODO: add dependency on icedtea-java7-jre (not yet in Debian).
+  * Move wrapper script to debian/ directory in source package and reformat
+    it.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Fri, 16 Nov 2007 18:00:07 +0100
+
 jabref (2.3-1) unstable; urgency=low
 
   * New upstream release, closes a bunch of bugs reported in the Debian BTS:
diff --git a/debian/install b/debian/install
index 2ba8447..09e0f01 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
 build/lib/JabRef-2.3.jar usr/share/java
-jabref usr/bin
+debian/jabref usr/bin
 build/*.xpm usr/share/pixmaps
 debian/jabref.desktop usr/share/applications
diff --git a/debian/jabref b/debian/jabref
new file mode 100644
index 0000000..2596eba
--- /dev/null
+++ b/debian/jabref
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# 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
+	t=/usr/lib/jvm/java-7-icedtea && test -d $t && JAVA_HOME=$t
+	JAVA=${JAVA_HOME}/jre/bin/java
+fi
+
+export JAVA=${JAVA:=java}
+
+exec $JAVA -jar /usr/share/java/jabref.jar "$@"
diff --git a/jabref b/jabref
deleted file mode 100644
index f71d8ae..0000000
--- a/jabref
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# 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}
-
-exec $JAVA -jar /usr/share/java/jabref.jar "$@"

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