From: Emmanuel Bourg <ebourg@apache.org>
Date: Fri, 30 Aug 2013 21:50:06 +0000 (+0200)
Subject: Removed the recommended dependency on libx11-6 and libasound2 from the generated... 
X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=0641b7d21ac5a0e899c9b7362fcdcd1110222097;p=sven%2Fjava-package.git

Removed the recommended dependency on libx11-6 and libasound2 from the generated control file
---

diff --git a/debian/changelog b/debian/changelog
index 719d329..0edc63f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ java-package (0.53) UNRELEASED; urgency=low
     control file (used by the now unsupported IBM JDK 5)
   * Removed the recommended dependency on libgtk1.2 from the generated
     control file (removed from Squeeze)
+  * Removed the recommended dependency on libx11-6 and libasound2 from
+    the generated control file (these dependencies are already injected
+    by dh_shlibdeps)
 
  -- Emmanuel Bourg <ebourg@apache.org>  Wed, 28 Aug 2013 19:34:41 +0200
 
diff --git a/lib/jdk.sh b/lib/jdk.sh
index d9f0ab7..7ae61f0 100644
--- a/lib/jdk.sh
+++ b/lib/jdk.sh
@@ -16,7 +16,7 @@ j2sdk_control() {
 Package: $j2se_package
 Architecture: any
 Depends: $depends
-Recommends: netbase, libx11-6 | xlibs, libasound2
+Recommends: netbase
 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
diff --git a/lib/jre.sh b/lib/jre.sh
index 2fe5ac9..d63408e 100644
--- a/lib/jre.sh
+++ b/lib/jre.sh
@@ -5,7 +5,7 @@ j2re_control() {
 Package: $j2se_package
 Architecture: any
 Depends: \${shlibs:Depends}
-Recommends: netbase, libx11-6 | xlibs, libasound2
+Recommends: netbase
 Provides: java-virtual-machine, java-runtime, java2-runtime, java${j2se_release}-runtime, java$((${j2se_release}-1))-runtime, java$((${j2se_release}-2))-runtime, java-runtime-headless, java2-runtime-headless, java${j2se_release}-runtime-headless, java$((${j2se_release}-1))-runtime-headless, java$((${j2se_release}-2))-runtime-headless, java-browser-plugin
 Description: $j2se_title
  The Java(TM) SE Runtime Environment contains the Java virtual machine,