From e0a81f74e9d4982fffab79fb8fe7fa45358631ed Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Pineau?= Date: Fri, 17 Aug 2012 12:30:38 +0200 Subject: [PATCH] Add java6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993 --- debian/changelog | 3 ++- lib/j2re.sh | 2 +- lib/j2sdk.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed4981d..dab97f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ java-package (0.51) unstable; urgency=low - * Add firefox-javaplugin.so alternative + * Add firefox-javaplugin.so alternative Closes: #673670 + * Add java6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993 [Emmanuel Bourg] * Improved detection of the JRE/JDK version (supports 2 digits Java 7 updates) diff --git a/lib/j2re.sh b/lib/j2re.sh index 774f2db..b179bce 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, java-runtime-headless, java2-runtime-headless, java-browser-plugin, j2re${j2se_release} +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} 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 dfb0e04..ef48f4c 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, java-browser-plugin, java-compiler, java2-compiler, java-runtime-headless, java2-runtime-headless, java-sdk, java2-sdk, j2sdk$j2se_release, j2re$j2se_release +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 Replaces: ${j2se_package}debian Description: $j2se_title The Java(TM) SE JDK is a development environment for building -- 2.39.5