You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/12 02:38:58 UTC
[20/50] [abbrv] git commit: debian: Install cglib through the package
manager
debian: Install cglib through the package manager
cglib 2.2.2 is available in Ubuntu and Debian from the repositories, no need
to ship it in the cloud-deps package.
It's also not used by cloud-agent, but by cloud-utils, so place the dependency there.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/af59f017
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/af59f017
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/af59f017
Branch: refs/heads/javelin
Commit: af59f017377b34f472d279772a2d2fe6337916cf
Parents: a28fd66
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Sep 11 13:23:34 2012 +0200
Committer: Alex Huang <al...@citrix.com>
Committed: Tue Sep 11 17:38:13 2012 -0700
----------------------------------------------------------------------
debian/cloud-deps.install | 1 -
debian/control | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af59f017/debian/cloud-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install
index 370f5e2..04e96dc 100644
--- a/debian/cloud-deps.install
+++ b/debian/cloud-deps.install
@@ -22,7 +22,6 @@
/usr/share/java/log4j-*.jar
/usr/share/java/apache-log4j-extras-1.1.jar
/usr/share/java/trilead-ssh2-build213-svnkit-1.3-patch.jar
-/usr/share/java/cglib-2.2.jar
/usr/share/java/xmlrpc-common-3.*.jar
/usr/share/java/xmlrpc-client-3.*.jar
/usr/share/java/jstl-1.2.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af59f017/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 2035e96..f1e30d3 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Provides: vmops-utils
Conflicts: vmops-utils
Replaces: vmops-utils
Architecture: any
-Depends: openjdk-6-jre, python
+Depends: openjdk-6-jre, python, libcglib-java (>= 2.2.2)
Description: CloudStack utility library
The CloudStack utility libraries provide a set of Java classes used
in the CloudStack environment.
@@ -119,7 +119,7 @@ Provides: vmops-agent
Conflicts: vmops-agent
Replaces: vmops-agent
Architecture: any
-Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-agent-deps (= ${source:Version}), python, cloud-python (= ${source:Version}), cloud-agent-libs (= ${source:Version}), cloud-agent-scripts (= ${source:Version}), libvirt0, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, ebtables, vlan, libcglib-java, libcommons-httpclient-java, libservlet2.5-java, liblog4j1.2-java (>= 1.2.16), libjna-java, wget, jsvc, lsb-base (>= 3.2)
+Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-core (= ${source:Version}), cloud-agent-deps (= ${source:Version}), python, cloud-python (= ${source:Version}), cloud-agent-libs (= ${source:Version}), cloud-agent-scripts (= ${source:Version}), libvirt0, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, ebtables, vlan, libcommons-httpclient-java, libservlet2.5-java, liblog4j1.2-java (>= 1.2.16), libjna-java, wget, jsvc, lsb-base (>= 3.2)
Description: CloudStack agent
The CloudStack agent is in charge of managing shared computing resources in
a CloudStack powered cloud. Install this package if this computer