[freecol] 03/11: Use the default-jdk instead of a specific JDK.

[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 d5a57bfe7078bd6dce6eb0527fe01285d1ae0761
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jul 7 00:07:25 2017 +0200

    Use the default-jdk instead of a specific JDK.
---
 debian/control | 2 +-
 debian/rules   | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 9d1fef3..e7e3d13 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,11 @@ Build-Depends:
  ant,
  ant-optional,
  debhelper (>= 10),
+ default-jdk (>= 2:1.8),
  javahelper,
  libcommons-cli-java,
  libcortado-java,
  libmiglayout-java,
- openjdk-8-jdk,
  tex4ht,
  texlive-binaries | texlive-base-bin,
  texlive-fonts-recommended,
diff --git a/debian/rules b/debian/rules
index afa4fd8..9a30560 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
-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
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 

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