Removed the recommended dependency on libstdc++5 from the generated control file

diff --git a/debian/changelog b/debian/changelog
index 72452ca407f76ddb98ae26615a8af2acddb28074..2da5db1e51028d6c77e9c8bd23ffa9dbb0f976ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ java-package (0.53) UNRELEASED; urgency=low
   * Updated the manpages for Java 8
   * Updated debhelper level to 7
   * debian/rules: Use dh_prep instead of dh_clean -k
   * Updated the manpages for Java 8
   * Updated debhelper level to 7
   * debian/rules: Use dh_prep instead of dh_clean -k

+  * Removed the recommended dependency on libstdc++5 from the generated
+    control file (used by the now unsupported IBM JDK 5)

 
  -- Emmanuel Bourg <ebourg@apache.org>  Wed, 28 Aug 2013 19:34:41 +0200
 
 
  -- Emmanuel Bourg <ebourg@apache.org>  Wed, 28 Aug 2013 19:34:41 +0200
 

diff --git a/lib/jdk.sh b/lib/jdk.sh
index c4a985f3ddf5aee1320452493874f21897e72fc4..129bb93a07a0e2e30ba3461a85859c86ee0549c9 100644 (file)
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -16,7 +16,7 @@ j2sdk_control() {
 Package: $j2se_package
 Architecture: any
 Depends: $depends
 Package: $j2se_package
 Architecture: any
 Depends: $depends

-Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2, libstdc++5
+Recommends: netbase, libx11-6 | xlibs, libasound2, libgtk1.2

 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
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building
 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
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building