[med-svn] [mhap] 01/03: Revert "Don't force Java 8"

[Afif Elghraoui]

This is an automated email from the git hooks/post-receive script.

afif pushed a commit to branch debian/jessie-backports
in repository mhap.

commit b2afa0421ecb1e997e198c709e15c2d0fa29fff3
Author: Afif Elghraoui <afif at debian.org>
Date:   Mon Oct 10 06:35:45 2016 -0700

    Revert "Don't force Java 8"
    
    This reverts commit 9320016aee452653b2ca08c0361edebc717d3485.
    
    Conflicts:
    	debian/control
---
 debian/control | 4 ++--
 debian/rules   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index f20cc5b..72e3408 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
 	javahelper,
 	maven-debian-helper,
 	libmaven-dependency-plugin-java,
-	default-jdk-headless,
+	openjdk-8-jdk,
 	libcommons-compress-java,
 	libfastutil-java,
 	libguava-java,
@@ -27,7 +27,7 @@ Depends:
 # default-jre, which pulls in many unnecessary libraries
 # for graphics
 #	${java:Depends},
-	default-jre-headless,
+	java8-runtime-headless,
 	jarwrapper,
 	libcommons-compress-java,
 	libfastutil-java,
diff --git a/debian/rules b/debian/rules
index 5b00d6c..dee2f34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 include /usr/share/dpkg/default.mk
 
 export LC_ALL=C.UTF-8
-export JAVA_HOME=/usr/lib/jvm/default-java
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
 DEB_VERSION_UPSTREAM := $(DEB_VERSION_UPSTREAM:+dfsg=)
 
 cupboard = \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mhap.git