Add java5-{runtime|sdk|...} to the provides line in generated packages

diff --git a/debian/changelog b/debian/changelog
index a37b3afe1b4ea0c01a356cb2193793ae6b4c4e34..2bdfae19c27173856826dbc7319df1d6dc2b043d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,13 @@
 java-package (0.51) unstable; urgency=low
 
   * Add firefox-javaplugin.so alternative Closes: #673670
-  * Add java6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993
-  * Add java6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993
+  * Add java5 and 6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993
   * Drop installation debconf note Closes: #685082
-  * Correct handling of amd64 in roacle-jdk6.1->4 and improve error message when used with unknown archives
+  * Correct handling of amd64 in oracle-jdk6.1->4 and improve error message when used with unknown archives
   * Add support for earlier oracle-jdk6 version
 
   [Emmanuel Bourg]
-  * Improved detection of the JRE/JDK version (supports 2 digits Java 7 updates)
+  * Improved detection of the JRE/JDK version (supports 2 digits Java 7 updates) Closes: #597294
   * Brand and naming cleanup
   * Documentation directory changed to be /usr/share/doc/oracle-javaV-doc (for oracle)
 

diff --git a/lib/j2re.sh b/lib/j2re.sh
index b179bce9df80a925ce2c94a67470355dc84d7da1..5e1e496718dd1b3b76e61922bbe65dd3a8a1416d 100644 (file)
--- a/lib/j2re.sh
+++ b/lib/j2re.sh
@@ -6,7 +6,7 @@ Package: $j2se_package
 Architecture: any
 Depends: \${shlibs:Depends}
 Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2
-Provides: java-virtual-machine, java-runtime, java2-runtime, java6-runtime, java-runtime-headless, java2-runtime-headless, java6-runtime-headless, java-browser-plugin, j2re${j2se_release}
+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}
 Replaces: ${j2se_package}debian
 Description: $j2se_title
  The Java(TM) SE Runtime Environment contains the Java virtual machine,

diff --git a/lib/j2sdk.sh b/lib/j2sdk.sh
index ef48f4cce98350427df6e1cc28baf7332c3d9c3b..60452b498bf75fde511f7e89f2083613750a81d5 100644 (file)
--- a/lib/j2sdk.sh
+++ b/lib/j2sdk.sh
@@ -6,7 +6,7 @@ Package: $j2se_package
 Architecture: any
 Depends: \${shlibs:Depends}
 Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5
-Provides: java-virtual-machine, java-runtime, java2-runtime, java6-runtime, java-browser-plugin, java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java6-runtime-headless, java-sdk, java2-sdk, java6-sdk, j2sdk$j2se_release, j2re$j2se_release
+Provides: java-virtual-machine, java-runtime, java2-runtime, java5-runtime, java6-runtime, java-browser-plugin, java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java5-runtime-headless, java6-runtime-headless, java-sdk, java2-sdk, java5-sdk, java6-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