This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository jabref.
commit eb5c1b0e2c48612c16198e34f244bea501e59e56
Author: gregor herrmann <gre...@debian.org>
Date: Fri Mar 16 18:32:59 2018 +0100
Force openjdk-8 at buildtime and runtime.
JabRef doesn't work and run with openjdk-9 which is the default now.
Closes: #890905
---
debian/control | 4 ++--
debian/jabref-wrapper | 3 ++-
debian/rules | 4 ++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/debian/control b/debian/control
index 2d5b97e..2b28907 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends-Indep: ant,
antlr,
antlr3,
antlr4,
- default-jdk (>= 2:1.8),
+ openjdk-8-jdk,
junit4,
libandroid-json-java,
libantlr3-runtime-java,
@@ -45,7 +45,7 @@ Homepage: https://www.jabref.org/
Package: jabref
Architecture: all
Depends: ${misc:Depends},
- default-jre (>= 2:1.8) | java8-runtime,
+ openjdk-8-jre,
java-wrappers,
libandroid-json-java,
libantlr3-runtime-java,
diff --git a/debian/jabref-wrapper b/debian/jabref-wrapper
index adbe785..f13ec26 100755
--- a/debian/jabref-wrapper
+++ b/debian/jabref-wrapper
@@ -4,7 +4,8 @@
. /usr/lib/java-wrappers/java-wrappers.sh
# We need a java8 runtime
-find_java_runtime java8
+# as this is also provided by openjdk9, we hardcode openjdk8 here
+find_java_runtime openjdk8
find_jars \
jabref \
diff --git a/debian/rules b/debian/rules
index d1809cd..f71523d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,10 @@
export DH_VERBOSE=1
+# force build with openjdk-8, even if -9 is installed
+include /usr/share/dpkg/architecture.mk
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
+
%:
dh $@ --buildsystem=gradle
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/jabref.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
