From a84ec1218dbb6b1d9fa0cb90d5288c7836c33ced Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Tue, 11 Sep 2012 13:23:34 +0200 Subject: [PATCH] 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. --- debian/cloud-deps.install | 1 - debian/control | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install index 370f5e2060d..04e96dce367 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 diff --git a/debian/control b/debian/control index 2035e9666be..f1e30d3e0c2 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