Provide the java<version-1>-runtime and java<version-2>-runtime dependencies

diff --git a/lib/jdk.sh b/lib/jdk.sh
index 1453dc0ef288f256116f60bbbf87ff405a31a488..99b05877381d04025d2090f92b38ee354dbf9275 100644 (file)
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -17,7 +17,7 @@ Package: $j2se_package
 Architecture: any
 Depends: $depends
 Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5
 Architecture: any
 Depends: $depends
 Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5

-Provides: java-virtual-machine, java-runtime, java2-runtime, $java_browser_plugin java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java-sdk, java2-sdk, java$((${j2se_release}-2))-sdk, java$((${j2se_release}-1))-sdk, java${j2se_release}-sdk, j2sdk$j2se_release, j2re$j2se_release
+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, j2sdk$j2se_release, j2re$j2se_release

 Replaces: ${j2se_package}debian
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building
 Replaces: ${j2se_package}debian
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building

diff --git a/lib/jre.sh b/lib/jre.sh
index 864f14106f968579358fe2adc9d4b2580090d24e..436dea26d8247027b7a2bd8fb401de98512c0530 100644 (file)
--- a/lib/jre.sh
+++ b/lib/jre.sh
@@ -6,7 +6,7 @@ Package: $j2se_package
 Architecture: any
 Depends: \${shlibs:Depends}
 Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2
 Architecture: any
 Depends: \${shlibs:Depends}
 Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2

-Provides: java-virtual-machine, java-runtime, java2-runtime, java5-runtime, java6-runtime, java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java-browser-plugin, j2re${j2se_release}
+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, j2re${j2se_release}

 Replaces: ${j2se_package}debian
 Description: $j2se_title
  The Java(TM) SE Runtime Environment contains the Java virtual machine,
 Replaces: ${j2se_package}debian
 Description: $j2se_title
  The Java(TM) SE Runtime Environment contains the Java virtual machine,