X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Foracle-jdk.sh;h=23ce971a87c66fa7d051982ac94d932c7c3832a6;hp=fd510c707af0b60316781081202d10bba3ff013c;hb=0590bcbc83a2ff4486d8ce267211aeaecceec109;hpb=ad1b23a303f6d18ed6955d8f33f5deb2e6ea92bf diff --git a/lib/oracle-jdk.sh b/lib/oracle-jdk.sh index fd510c7..23ce971 100644 --- 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 @@ -206,7 +206,7 @@ oracle_j2sdk_control() { cat << EOF Package: $j2se_package Architecture: $j2se_debian_arch -Depends: \${misc:Depends}, $depends +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