[jabref] 213/459: Remove alternative dependency on sun-java5-jre which was removed from the archive. Also adjust README.Debian and /usr/bin/jabref.

[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 3895482a03cd7979a3ac3e8615aa24cea17b1ef1
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Sep 13 21:58:08 2009 +0000

    Remove alternative dependency on sun-java5-jre which was removed from the
    archive. Also adjust README.Debian and /usr/bin/jabref.
---
 debian/README.Debian  | 2 +-
 debian/changelog      | 7 +++++++
 debian/control        | 2 +-
 debian/jabref-wrapper | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 03674c1..4d979d5 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,7 +1,7 @@
 JabRef for Debian
 -----------------
 
-Please note that JabRef needs OpenJDK (or Sun Java 5/6).
+Please note that JabRef needs OpenJDK (or Sun Java 6).
 
 Starting with version 2.2-01-4 /usr/bin/jabref should find and use your
 installed OpenJDK or Sun Java virtual machine.
diff --git a/debian/changelog b/debian/changelog
index 42d444b..360ac71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jabref (2.5-2) UNRELEASED; urgency=low
+
+  * Remove alternative dependency on sun-java5-jre which was removed from the
+    archive. Also adjust README.Debian and /usr/bin/jabref.
+
+ -- gregor herrmann <gregoa at debian.org>  Sun, 13 Sep 2009 23:51:43 +0200
+
 jabref (2.5-1) unstable; urgency=low
 
   * New upstream release (closes: #497897, LP: #301327). This version also
diff --git a/debian/control b/debian/control
index dbf933d..aa77f96 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/jabref/tr
 
 Package: jabref
 Architecture: all
-Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre | sun-java5-jre,
+Depends: ${misc:Depends}, openjdk-6-jre | sun-java6-jre,
  antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
  libglazedlists-java, libmicroba-java, libpdfbox-java,
  libjempbox-java (>= 0.2.0), java-wrappers (>= 0.1.6), libmysql-java,
diff --git a/debian/jabref-wrapper b/debian/jabref-wrapper
index 005adb3..e562ada 100644
--- a/debian/jabref-wrapper
+++ b/debian/jabref-wrapper
@@ -3,8 +3,8 @@
 # Include the wrappers utility script
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-# We need openjdk6 or sun{5,6} runtime.
-find_java_runtime openjdk || find_java_runtime sunmin5
+# We need openjdk6 or sun6 runtime.
+find_java_runtime openjdk || find_java_runtime sun6
 
 find_jars jabref antlr antlr3 looks forms spin glazedlists microba pdfbox jempbox mysql-connector-java JPFCodeGenerator-rt jpf jpf-boot commons-logging
 

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