cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [2/2] git commit: refs/heads/master - debian: Require either Java 6 or 7
Date Thu, 28 Feb 2013 12:48:28 GMT
Updated Branches:
  refs/heads/master 4446b9dff -> 01db2df23


debian: Require either Java 6 or 7

Our source is 1.6 compatible (pom.xml), but users can choose to compile
with JDK7 and run with JRE 7 if they want.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ca6c1eba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ca6c1eba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ca6c1eba

Branch: refs/heads/master
Commit: ca6c1eba9cae53944faa29e80b13ccd81cd9ed68
Parents: 4446b9d
Author: Wido den Hollander <wido@42on.com>
Authored: Thu Feb 28 12:56:46 2013 +0100
Committer: Wido den Hollander <wido@42on.com>
Committed: Thu Feb 28 13:48:14 2013 +0100

----------------------------------------------------------------------
 debian/control |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ca6c1eba/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 659084c..98a390f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cloudstack
 Section: libs
 Priority: extra
 Maintainer: Wido den Hollander <wido@widodh.nl>
-Build-Depends: debhelper (>= 7), openjdk-6-jdk, tomcat6, genisoimage,
+Build-Depends: debhelper (>= 7), openjdk-6-jdk | openjdk-7-jdk, tomcat6, 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-6-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), openssh-client,
libvirt0, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute,
ebtables, vlan, wget, jsvc
+Depends: openjdk-6-jre | openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base
(>= 3.2), openssh-client, libvirt0, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime,
rsync, grep, iproute, ebtables, vlan, wget, jsvc
 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-6-jre, cloudstack-common (= ${source:Version}), jsvc
+Depends: openjdk-6-jre | openjdk-7-jre, cloudstack-common (= ${source:Version}), jsvc
 Description: CloudStack usage monitor
  The CloudStack usage monitor provides usage accounting across the entire cloud for
  cloud operators to charge based on usage parameters.


Mime
View raw message