From: Benjamin Drung Date: Thu, 8 May 2014 11:22:06 +0000 (+0200) Subject: Add ${misc:Depends} to the guest dependency. X-Git-Url: https://git.sven.stormbind.net/?a=commitdiff_plain;h=0093f783df5682c283ae4183f1277b49b054ba19;p=sven%2Fjava-package.git Add ${misc:Depends} to the guest dependency. --- diff --git a/lib/jdk-doc.sh b/lib/jdk-doc.sh index 4dbfa04..a1891ba 100644 --- a/lib/jdk-doc.sh +++ b/lib/jdk-doc.sh @@ -3,9 +3,7 @@ j2sdk_doc_control() { cat << EOF Package: $j2se_package Architecture: any -Depends: -Recommends: -Provides: +Depends: \${misc:Depends} Description: $j2se_title The Java(TM) SE JDK is a development environment for building applications, applets, and components that can be deployed on the diff --git a/lib/jdk.sh b/lib/jdk.sh index 55802e6..220f213 100644 --- a/lib/jdk.sh +++ b/lib/jdk.sh @@ -15,7 +15,7 @@ j2sdk_control() { cat << EOF Package: $j2se_package Architecture: any -Depends: $depends +Depends: \${misc:Depends}, $depends 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 diff --git a/lib/jre.sh b/lib/jre.sh index 9d12cb6..9154993 100644 --- a/lib/jre.sh +++ b/lib/jre.sh @@ -4,7 +4,7 @@ j2re_control() { cat << EOF Package: $j2se_package Architecture: any -Depends: \${shlibs:Depends} +Depends: \${misc:Depends}, \${shlibs:Depends} 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