Repository: cloudstack Updated Branches: refs/heads/4.5-RC20150504T1217 25e555bd2 -> 54f3e7733
debian: allow openjdk1.8 as optional dependency Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/54f3e773 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/54f3e773 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/54f3e773 Branch: refs/heads/4.5-RC20150504T1217 Commit: 54f3e7733f28fe77b01395f3da287d73e370f343 Parents: 25e555b Author: Rohit Yadav <rohit.ya...@shapeblue.com> Authored: Wed May 6 02:09:41 2015 +0200 Committer: Rohit Yadav <rohit.ya...@shapeblue.com> Committed: Wed May 6 02:09:41 2015 +0200 ---------------------------------------------------------------------- debian/control | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54f3e773/debian/control ---------------------------------------------------------------------- diff --git a/debian/control b/debian/control index 398a767..35dcb80 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: cloudstack Section: libs Priority: extra Maintainer: Wido den Hollander <w...@widodh.nl> -Build-Depends: debhelper (>= 7), openjdk-7-jdk, genisoimage, +Build-Depends: debhelper (>= 7), openjdk-7-jdk | openjdk-8-jdk, genisoimage, python-mysqldb, maven3 | maven (>= 3), python (>= 2.6.6-3~) Standards-Version: 3.8.1 Homepage: http://www.cloudstack.org/ @@ -22,7 +22,7 @@ Description: CloudStack server library Package: cloudstack-agent Architecture: all -Depends: openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, sysvinit-utils, qemu-system-x86 | qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt, ethtool, iptables +Depends: openjdk-7-jre | openjdk-8-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, openssh-client, libvirt0, sysvinit-utils, qemu-system-x86 | qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset, python-libvirt, ethtool, iptables Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts Description: CloudStack agent The CloudStack agent is in charge of managing shared computing resources in @@ -31,7 +31,7 @@ Description: CloudStack agent Package: cloudstack-usage Architecture: all -Depends: openjdk-7-jre, cloudstack-common (= ${source:Version}), jsvc, libmysql-java +Depends: openjdk-7-jre | openjdk-8-jre, cloudstack-common (= ${source:Version}), jsvc, libmysql-java Description: CloudStack usage monitor The CloudStack usage monitor provides usage accounting across the entire cloud for cloud operators to charge based on usage parameters.
