generated JDK/JRE packages now depend upon "java-common"

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

diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh
index ebc0efd8df32757c50beb4a1efddbfd435646e99..23ce971a87c66fa7d051982ac94d932c7c3832a6 100644 (file)
--- a/lib/oracle-jdk.sh
+++ b/lib/oracle-jdk.sh
@@ -87,7 +87,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 Development Kit"
+      j2se_title="Java Platform, Standard Edition $j2se_release Development Kit"
 
       j2se_install=oracle_j2sdk_install
       j2se_remove=oracle_j2sdk_remove
@@ -163,7 +163,7 @@ EOF
 oracle_j2sdk_jinfo() {
     cat << EOF
 name=$j2se_name
-priority=$j2se_priority
+priority=${priority_override:-$j2se_priority}
 section=main
 EOF
     jinfos "hl" $jvm_base$j2se_name/jre/bin/ $oracle_jre_bin_hl
@@ -205,8 +205,8 @@ oracle_j2sdk_control() {
     done
     cat << EOF
 Package: $j2se_package
-Architecture: any
-Depends: \${misc:Depends}, $depends
+Architecture: $j2se_debian_arch
+Depends: \${misc:Depends}, java-common, $depends
 Recommends: netbase
 Provides: java-virtual-machine, java-runtime, java2-runtime, $provides_runtime $java_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, $provides_headless java-sdk, java2-sdk, $provides_sdk
 Description: $j2se_title