]> git.sven.stormbind.net Git - sven/java-package.git/commitdiff
Add ${misc:Depends} to the guest dependency.
authorBenjamin Drung <benjamin.drung@profitbricks.com>
Thu, 8 May 2014 11:22:06 +0000 (13:22 +0200)
committerBenjamin Drung <benjamin.drung@profitbricks.com>
Thu, 8 May 2014 11:22:06 +0000 (13:22 +0200)
lib/jdk-doc.sh
lib/jdk.sh
lib/jre.sh

index 4dbfa04074c3a07d14383009c8f502f3033dcbce..a1891ba8035d7a85780a8fca7bed7d23e0a78f07 100644 (file)
@@ -3,9 +3,7 @@ j2sdk_doc_control() {
     cat << EOF
 Package: $j2se_package
 Architecture: any
     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
 Description: $j2se_title
  The Java(TM) SE JDK is a development environment for building
  applications, applets, and components that can be deployed on the
index 55802e6ca452f0240218d0be06648407ddee5aec..220f2132d0ce44799c5d51e1998a357f39abd7db 100644 (file)
@@ -15,7 +15,7 @@ j2sdk_control() {
     cat << EOF
 Package: $j2se_package
 Architecture: any
     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
 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
index 9d12cb6b592befd00c6a4f4cc8a1f30e4d20c471..9154993c9f5c3ea98a486dbbe73b2ecc5746a517 100644 (file)
@@ -4,7 +4,7 @@ j2re_control() {
     cat << EOF
 Package: $j2se_package
 Architecture: any
     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
 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