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 c7ccbcf0e3769c5ed06da18ebe64b4a8cba61928..d901e312b3bea6904f993e3f88484ebffd8bde15 100644 (file)
--- a/lib/oracle-server-jre.sh
+++ b/lib/oracle-server-jre.sh
@@ -71,7 +71,7 @@ EOF
       j2se_found=true
       j2se_required_space=$(( $j2se_expected_min_size * 2 + 20 ))
       j2se_vendor="oracle"
-      j2se_title="Java™ Platform, Standard Edition $j2se_release Server Runtime Environment"
+      j2se_title="Java Platform, Standard Edition $j2se_release Server Runtime Environment"
 
       j2se_install=oracle_server_j2re_install
       j2se_remove=oracle_server_j2re_remove
@@ -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