build packages with and for java 8

rasto · Sep 25, 2016 · dc29377 · dc29377
1 parent 6bac8c0
commit dc29377
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/debian/control b/debian/control
@@ -3,13 +3,13 @@ Section: admin
 Priority: extra
 Maintainer: Rasto Levrinc <rasto.levrinc@gmail.com>
 Build-Depends: maven, cdbs
-Build-Depends-Indep: openjdk-7-jdk, libxalan2-java, libjava3d-java,
+Build-Depends-Indep: oracle-java8-jre | openjdk-8-jdk, libxalan2-java, libjava3d-java,
 Standards-Version: 3.8.3
 Homepage: http://lcmc.sourceforge.net
 
 Package: lcmc
 Architecture: all
-Depends: openjdk-6-jre | sun-java6-jre | sun-java6-jre | openjdk-7-jre,
+Depends: oracle-java8-jre | openjdk-8-jre,
  java-wrappers, ${misc:Depends}
 Description: Linux Cluster Management Console
  The LCMC is a GUI application that configures, manages and visualizes high-

diff --git a/debian/rules b/debian/rules
@@ -3,5 +3,5 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME 		:= /usr/lib/jvm/java-7-openjdk-amd64
+JAVA_HOME 		:= /usr/lib/jvm/java-8-openjdk-amd64
 DEB_JARS 		:= vecmath j3dcore jd3utils jai_core xalan2
diff --git a/debian/wrappers/lcmc b/debian/wrappers/lcmc
@@ -6,7 +6,7 @@
 JAVA_CLASSPATH="/usr/lib/jni:/usr/lib/java"
 LCMC_BIN="/usr/bin/lcmc"
 
-find_java_runtime sunmin5 openjdk
+find_java_runtime oracle8 java8
 
 find_jars LCMC
 

diff --git a/scripts/lcmc b/scripts/lcmc
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-JAVA_HOME=/usr/lib/jvm/java-openjdk CLASSPATH=/usr/share/java/LCMC.jar java lcmc.LCMC "$@"
+JAVA_HOME=/usr/lib/jvm/default-java CLASSPATH=/usr/share/java/LCMC.jar java lcmc.LCMC "$@"