[jabref] 331/459: Update build dependency on JVM to "openjdk-7-jre | java6-runtime".

[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 11039f95eeb6032e3159f5afa0bfe975dc7c7143
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Oct 29 22:27:04 2012 +0100

    Update build dependency on JVM to "openjdk-7-jre | java6-runtime".
    
    Using default-jre is probably no good idea, since this installs gcj-jre on
    several architectures.
    
    Update wrapper script as well.
    
    Thanks: Torquil Macdonald Sørensen for the bug report.
    Closes: #689253
---
 debian/control        | 2 +-
 debian/jabref-wrapper | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 5ad158e..68f7d67 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,7 @@ Depends: ${misc:Depends},
  libmysql-java,
  libpdfbox-java (>= 1:1.5.0),
  libspin-java,
- openjdk-6-jre | sun-java6-jre,
+ openjdk-7-jre | java6-runtime,
  velocity (>=1.5)
 Recommends: xdg-utils
 Suggests: gv | postscript-viewer,
diff --git a/debian/jabref-wrapper b/debian/jabref-wrapper
index 6d0ecea..53c67b2 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 sun6 runtime.
-find_java_runtime openjdk6 sun6
+# We need openjdk7/6 or sun6 runtime.
+find_java_runtime openjdk sun6
 
 find_jars jabref antlr antlr3 jgoodies-looks forms spin glazedlists microba pdfbox jempbox mysql-connector-java JPFCodeGenerator-rt jpf jpf-boot commons-logging jgoodies-common
 

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