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

diff --git a/debian/changelog b/debian/changelog
index 18208df51f81a227b4f817226d30c025befc9eaa..c9c2a43f7549afff4f5042908f5da954a7fb000c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ java-package (0.57) UNRELEASED; urgency=medium
 
   * Team upload.
   * Include Java 8 in the help message of make-jpkg (Closes: #775977)
 
   * Team upload.
   * Include Java 8 in the help message of make-jpkg (Closes: #775977)

+  * Provide all runtimes since Java 5, thanks to Laurens Blankers
+    (Closes: #775987)

   * Standards-Version updated to 3.9.6 (no changes)
 
  -- Emmanuel Bourg <ebourg@apache.org>  Thu, 22 Jan 2015 09:41:39 +0100
   * Standards-Version updated to 3.9.6 (no changes)
 
  -- Emmanuel Bourg <ebourg@apache.org>  Thu, 22 Jan 2015 09:41:39 +0100

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 8858bb62eb7bf08ab6e6fbac4f5ced906f93489a..1c7587672e4e5f252203e513dff166eb5b979bdd 100644 (file)
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -13,12 +13,18 @@ j2sdk_control() {
         # No browser on ARM yet
         java_browser_plugin=""
     fi
         # No browser on ARM yet
         java_browser_plugin=""
     fi

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

     cat << EOF
 Package: $j2se_package
 Architecture: any
 Depends: \${misc:Depends}, $depends
 Recommends: netbase
     cat << EOF
 Package: $j2se_package
 Architecture: any
 Depends: \${misc:Depends}, $depends
 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_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java${j2se_release}-runtime-headless, java$((${j2se_release}-1))-runtime-headless, java$((${j2se_release}-2))-runtime-headless, java-sdk, java2-sdk, java$((${j2se_release}-2))-sdk, java$((${j2se_release}-1))-sdk, java${j2se_release}-sdk
+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
  The Java(TM) SE JDK is a development environment for building
  applications, applets, and components that can be deployed on the
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building
  applications, applets, and components that can be deployed on the

diff --git a/lib/jre.sh b/lib/jre.sh
index b19e6cefaab40471ccc6eb698bac773e79a625ee..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
 Depends: \${misc:Depends}, \${shlibs:Depends}
 Recommends: netbase
     cat << EOF
 Package: $j2se_package
 Architecture: any
 Depends: \${misc:Depends}, \${shlibs:Depends}
 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