[freecol] 92/125: Require java 1.8

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository freecol.

commit 1a639db2f69d74e9c9df4147f74c6285f12b2efe
Author: Markus Koschany <apo at debian.org>
Date:   Sun Dec 20 00:23:29 2015 +0100

    Require java 1.8
---
 debian/control | 4 ++--
 debian/rules   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index c6c8f99..fefd8b5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  ant,
  ant-optional,
  debhelper (>= 9),
- default-jdk,
+ openjdk-8-jdk,
  javahelper,
  libcommons-cli-java,
  libcortado-java,
@@ -26,7 +26,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-games/freecol.git
 Package: freecol
 Architecture: all
 Depends:
- default-jre | java7-runtime,
+ default-jre | java8-runtime,
  fonts-liberation,
  java-wrappers,
  ${java:Depends},
diff --git a/debian/rules b/debian/rules
index 7ce7440..8dac3ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
-export JAVA_HOME=/usr/lib/jvm/default-java
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
 export CLASSPATH=/usr/share/java/cortado.jar:/usr/share/java/miglayout.jar:/usr/share/java/commons-cli.jar
 
 %:

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