Provide all runtimes since Java 5 (Close: #775987)

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

diff --git a/lib/jre.sh b/lib/jre.sh
index 9d12cb6b592befd00c6a4f4cc8a1f30e4d20c471..93aed8b2cfdf3734825a3af432b742e67fac1f18 100644 (file)
--- a/lib/jre.sh
+++ b/lib/jre.sh
@@ -1,12 +1,17 @@
 
 j2re_control() {
     j2se_control
 
 j2re_control() {
     j2se_control

+    for i in `seq 5 ${j2se_release}`;
+    do
+        provides_runtime="${provides_runtime} java${i}-runtime,"
+        provides_headless="${provides_headless} java${i}-runtime-headless,"
+    done

     cat << EOF
 Package: $j2se_package
 Architecture: any
     cat << EOF
 Package: $j2se_package
 Architecture: any

-Depends: \${shlibs:Depends}
+Depends: \${misc:Depends}, \${shlibs:Depends}

 Recommends: netbase
 Recommends: netbase

-Provides: java-virtual-machine, java-runtime, java2-runtime, java${j2se_release}-runtime, java$((${j2se_release}-1))-runtime, java$((${j2se_release}-2))-runtime, java-runtime-headless, java2-runtime-headless, java${j2se_release}-runtime-headless, java$((${j2se_release}-1))-runtime-headless, java$((${j2se_release}-2))-runtime-headless, java-browser-plugin
+Provides: java-virtual-machine, java-runtime, java2-runtime, $provides_runtime java-runtime-headless, java2-runtime-headless, $provides_headless java-browser-plugin

 Description: $j2se_title
  The Java(TM) SE Runtime Environment contains the Java virtual machine,
  runtime class libraries, and Java application launcher that are
 Description: $j2se_title
  The Java(TM) SE Runtime Environment contains the Java virtual machine,
  runtime class libraries, and Java application launcher that are


@@ -35,13 +40,13 @@ j2re_run() {
     j2se_changelog > "$debian_dir/changelog"
     j2re_control > "$debian_dir/control"
     j2se_copyright > "$debian_dir/copyright"
     j2se_changelog > "$debian_dir/changelog"
     j2re_control > "$debian_dir/control"
     j2se_copyright > "$debian_dir/copyright"

-    echo "$j2se_name $jvm_base" > "$debian_dir/install"

     j2se_rules > "$debian_dir/rules"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"
     eval "$j2se_jinfo" > "$package_dir/.$j2se_name.jinfo"
     j2se_rules > "$debian_dir/rules"
     chmod +x "$debian_dir/rules"
     j2se_install_scripts
     install -d "$target/debian"
     j2se_info > "$target/debian/info"
     eval "$j2se_jinfo" > "$package_dir/.$j2se_name.jinfo"

-    echo ".$j2se_name.jinfo $jvm_base" >> "$debian_dir/install"
+    echo ".$j2se_name.jinfo $jvm_base" > "$debian_dir/install"
+    echo "$j2se_name $jvm_base" >> "$debian_dir/install"

     j2se_build
 }
     j2se_build
 }