X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=lib%2Fjdk.sh;h=1c7587672e4e5f252203e513dff166eb5b979bdd;hp=39a4ceec3c5fa0332d4aa2c1c19a8f8feb721076;hb=b3b4b4bd61cd0795ae29f57908f93e2436cf2be5;hpb=a4165c81a86ff3223170e5cb490b14d70267578b

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 39a4cee..1c75876 100644
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -1,9 +1,6 @@
 
 j2sdk_control() {
     build_depends="libasound2, libgl1-mesa-glx, libgtk2.0-0, libxslt1.1, libxtst6, libxxf86vm1"
-    if test "$j2se_release" = 8; then
-        build_depends="$build_depends, libavcodec53, libavformat53"
-    fi
     j2se_control
     java_browser_plugin="java-browser-plugin, "
     depends="\${shlibs:Depends}"
@@ -16,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