From: Laurens Blankers Date: Sat, 24 Jan 2015 14:08:40 +0000 (+0100) Subject: Provide all runtimes since Java 5 (Close: #775987) X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=b3b4b4bd61cd0795ae29f57908f93e2436cf2be5;p=sven%2Fjava-package.git Provide all runtimes since Java 5 (Close: #775987) --- diff --git a/debian/changelog b/debian/changelog index 18208df..c9c2a43 100644 --- 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) + * Provide all runtimes since Java 5, thanks to Laurens Blankers + (Closes: #775987) * Standards-Version updated to 3.9.6 (no changes) -- Emmanuel Bourg Thu, 22 Jan 2015 09:41:39 +0100 diff --git a/lib/jdk.sh b/lib/jdk.sh index 8858bb6..1c75876 100644 --- a/lib/jdk.sh +++ b/lib/jdk.sh @@ -13,12 +13,18 @@ j2sdk_control() { # 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 -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 diff --git a/lib/jre.sh b/lib/jre.sh index b19e6ce..93aed8b 100644 --- a/lib/jre.sh +++ b/lib/jre.sh @@ -1,12 +1,17 @@ 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 -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