[jabref] 245/459: Remove sun-java6-jre from Depends.

[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 23b75dc0d144a7d559f43e2d1d2be0d661a87cdf
Author: gregor herrmann <gregoa at debian.org>
Date:   Sun Jan 17 14:19:08 2010 +0000

    Remove sun-java6-jre from Depends.
---
 debian/changelog      | 5 +++--
 debian/control        | 2 +-
 debian/jabref-wrapper | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dda2c0a..47419e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ jabref (2.6~beta2+dfsg-1) UNRELEASED; urgency=low
 
   [ gregor herrmann ]
   * Move from contrib to main since all build and runtime dependencies are in
-    main now (closes: #548180).
-  * Repack upstream tarball to remove the sourceless pre-compiled libraries.
+    main now (closes: #548180). Remove sun-java6-jre from Depends.
+  * Repack upstream tarball to remove the sourceless pre-compiled libraries
+    and some file without (free) licenses.
   * debian/rules: override dh_auto_clean, `ant clean' fails with an unpatched
     build.xml after removing lib/. Move ant from B-D to B-D-I since it's not
     used in the clean target anymore.
diff --git a/debian/control b/debian/control
index 15e79c6..e8417c3 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,
+Depends: ${misc:Depends}, openjdk-6-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 e562ada..543f3c8 100644
--- a/debian/jabref-wrapper
+++ b/debian/jabref-wrapper
@@ -4,7 +4,7 @@
 . /usr/lib/java-wrappers/java-wrappers.sh
 
 # We need openjdk6 or sun6 runtime.
-find_java_runtime openjdk || find_java_runtime sun6
+find_java_runtime openjdk6 || 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