Add java6-{runtime|sdk|...} to the provides line in generated packages Closes: #684993

diff --git a/debian/changelog b/debian/changelog
index ed4981db44157911e4d2ca2e392ec8f377e0e92c..dab97f521ed95bb1018de7e450c359b8feabfe59 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 java-package (0.51) unstable; urgency=low
 
 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)
   
   [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 774f2db75fa8e6dcd3d695357450d24c19265162..b179bce9df80a925ce2c94a67470355dc84d7da1 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
 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,
 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 dfb0e04ffdc774a5a01d0b6045e233c0c5216464..ef48f4cce98350427df6e1cc28baf7332c3d9c3b 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
 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
 Replaces: ${j2se_package}debian
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building