You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/09/07 16:20:50 UTC
[2/2] git commit: debian: Fix dependencies
debian: Fix dependencies
We depend on more packages and not ship these JAR files ourselfs
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/66492794
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/66492794
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/66492794
Branch: refs/heads/master
Commit: 664927948a3b2cf10320221db6247a4c20887ac2
Parents: cb0eb19
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Fri Sep 7 16:18:46 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Fri Sep 7 16:18:46 2012 +0200
----------------------------------------------------------------------
debian/cloud-deps.install | 4 ----
debian/control | 6 +++---
wscript_configure | 1 +
3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/66492794/debian/cloud-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install
index e11f7e0..370f5e2 100644
--- a/debian/cloud-deps.install
+++ b/debian/cloud-deps.install
@@ -15,9 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-/usr/share/java/commons-codec-1.6.jar
-/usr/share/java/commons-dbcp-1.4.jar
-/usr/share/java/commons-pool-1.6.jar
/usr/share/java/backport-util-concurrent-3.1.jar
/usr/share/java/ehcache-1.5.0.jar
/usr/share/java/mail-1.4.jar
@@ -30,7 +27,6 @@
/usr/share/java/xmlrpc-client-3.*.jar
/usr/share/java/jstl-1.2.jar
/usr/share/java/axis2-1.5.1.jar
-/usr/share/java/commons-discovery-0.5.jar
/usr/share/java/wsdl4j-1.6.2.jar
/usr/share/java/bcprov-jdk16-1.46.jar
/usr/share/java/jsch-0.1.42.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/66492794/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index e730bec..4a6399c 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Provides: vmops-deps
Conflicts: vmops-deps
Replaces: vmops-deps
Architecture: any
-Depends: openjdk-6-jre
+Depends: openjdk-6-jre, libcommons-discovery-java (>= 0.5), libcommons-dbcp-java (>= 1.4), libcommons-pool-java (>= 1.5.6), libcommons-codec-java (>= 1.5)
Description: CloudStack library dependencies
This package contains a number of third-party dependencies
not shipped by distributions, required to run the CloudStack
@@ -86,7 +86,7 @@ Provides: vmops-client
Conflicts: vmops-client
Replaces: vmops-client
Architecture: any
-Depends: openjdk-6-jre, cloud-deps (= ${source:Version}), cloud-utils (= ${source:Version}), cloud-server (= ${source:Version}), cloud-client-ui (= ${source:Version}), cloud-setup (= ${source:Version}), cloud-python (= ${source:Version}), tomcat6, libws-commons-util-java, libcommons-dbcp-java, libcommons-collections-java, libcommons-httpclient-java, sysvinit-utils, chkconfig, sudo, jsvc, python-mysqldb, python-paramiko, augeas-tools, genisoimage, cloud-system-iso, libmysql-java (>= 5.1)
+Depends: openjdk-6-jre, cloud-deps (= ${source:Version}), cloud-utils (= ${source:Version}), cloud-server (= ${source:Version}), cloud-client-ui (= ${source:Version}), cloud-setup (= ${source:Version}), cloud-python (= ${source:Version}), tomcat6, libws-commons-util-java, sysvinit-utils, chkconfig, sudo, jsvc, python-mysqldb, python-paramiko, augeas-tools, genisoimage, cloud-system-iso, libmysql-java (>= 5.1)
Description: CloudStack client
The CloudStack management server is the central point of coordination,
management, and intelligence in the CloudStack Cloud Stack. This package
@@ -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}), libcommons-httpclient-java, libcommons-collections-java, libcommons-dbcp-java, libcommons-pool-java, libcommons-logging-java, 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, 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, libcglib-java, libcommons-httpclient-java, libservlet2.5-java, liblog4j1.2-java, 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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/66492794/wscript_configure
----------------------------------------------------------------------
diff --git a/wscript_configure b/wscript_configure
index 2b253cf..8077cc5 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -42,6 +42,7 @@ systemjars = {
"commons-collections.jar",
# "commons-daemon.jar",
"commons-dbcp.jar",
+ "commons-codec.jar",
"commons-logging.jar",
"commons-logging-api.jar",
"commons-pool.jar",