Skip to content

Commit a84ec12

Browse files
committed
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.
1 parent 4a8bb9d commit a84ec12

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

debian/cloud-deps.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
/usr/share/java/log4j-*.jar
2323
/usr/share/java/apache-log4j-extras-1.1.jar
2424
/usr/share/java/trilead-ssh2-build213-svnkit-1.3-patch.jar
25-
/usr/share/java/cglib-2.2.jar
2625
/usr/share/java/xmlrpc-common-3.*.jar
2726
/usr/share/java/xmlrpc-client-3.*.jar
2827
/usr/share/java/jstl-1.2.jar

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Provides: vmops-utils
3333
Conflicts: vmops-utils
3434
Replaces: vmops-utils
3535
Architecture: any
36-
Depends: openjdk-6-jre, python
36+
Depends: openjdk-6-jre, python, libcglib-java (>= 2.2.2)
3737
Description: CloudStack utility library
3838
The CloudStack utility libraries provide a set of Java classes used
3939
in the CloudStack environment.
@@ -119,7 +119,7 @@ Provides: vmops-agent
119119
Conflicts: vmops-agent
120120
Replaces: vmops-agent
121121
Architecture: any
122-
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)
122+
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)
123123
Description: CloudStack agent
124124
The CloudStack agent is in charge of managing shared computing resources in
125125
a CloudStack powered cloud. Install this package if this computer

0 commit comments

Comments
 (0)