From 2b4287b7c2363c96fdadd5c8e0116f80b2a64dac Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Pineau?= Date: Fri, 17 Aug 2012 18:39:14 +0200 Subject: [PATCH] Add java5-{runtime|sdk|...} to the provides line in generated packages --- debian/changelog | 7 +++---- lib/j2re.sh | 2 +- lib/j2sdk.sh | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a37b3af..2bdfae1 100644 --- 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 b179bce..5e1e496 100644 --- 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 ef48f4c..60452b4 100644 --- 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 -- 2.39.2