Add version matching code for JRE 9

[sven/java-package.git] / lib / oracle-server-jre.sh

diff --git a/lib/oracle-server-jre.sh b/lib/oracle-server-jre.sh
index 6faaeb6bad4cce646659c297f0df1e78201cbe46..d901e312b3bea6904f993e3f88484ebffd8bde15 100644 (file)
--- a/lib/oracle-server-jre.sh
+++ b/lib/oracle-server-jre.sh
@@ -114,7 +114,7 @@ EOF
 oracle_server_j2re_jinfo() {
     cat << EOF
 name=$j2se_name
-priority=$j2se_priority
+priority=${priority_override:-$j2se_priority}
 section=main
 EOF
     jinfos "hl" $jvm_base$j2se_name/bin/ $oracle_jre_bin_hl
@@ -134,7 +134,7 @@ oracle_server_j2re_control() {
     cat << EOF
 Package: $j2se_package
 Architecture: $j2se_debian_arch
-Depends: \${misc:Depends}, \${shlibs:Depends}, $depends
+Depends: \${misc:Depends}, \${shlibs:Depends}, java-common, $depends
 Recommends: netbase
 Provides: java-runtime-headless, java2-runtime-headless, $provides_headless
 Description: $j2se_title