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
[19/50] [abbrv] git commit: debian: Depend on jsch from the repository
debian: Depend on jsch from the repository
This way we don't need to distribute the JAR in cloud-deps
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/be003267
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/be003267
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/be003267
Branch: refs/heads/javelin
Commit: be003267cbd961bf2b339812a7bc98911aac2153
Parents: af59f01
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Sep 11 13:31:50 2012 +0200
Committer: Alex Huang <al...@citrix.com>
Committed: Tue Sep 11 17:38:14 2012 -0700
----------------------------------------------------------------------
debian/cloud-deps.install | 1 -
debian/control | 2 +-
wscript_configure | 1 +
3 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/be003267/debian/cloud-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install
index 04e96dc..d338e60 100644
--- a/debian/cloud-deps.install
+++ b/debian/cloud-deps.install
@@ -28,5 +28,4 @@
/usr/share/java/axis2-1.5.1.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
/usr/share/java/jasypt-1.*.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/be003267/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index f1e30d3..9c438de 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, libcglib-java (>= 2.2.2)
+Depends: openjdk-6-jre, python, libcglib-java (>= 2.2.2), libjsch-java (>= 0.1.42)
Description: CloudStack utility library
The CloudStack utility libraries provide a set of Java classes used
in the CloudStack environment.
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/be003267/wscript_configure
----------------------------------------------------------------------
diff --git a/wscript_configure b/wscript_configure
index dcea410..337fca7 100644
--- a/wscript_configure
+++ b/wscript_configure
@@ -91,6 +91,7 @@ systemjars = {
"ecj.jar",
"cglib.jar",
"asm3.jar",
+ "jsch.jar",
"jetty.jar",
"jetty-util.jar",
"jetty-start-daemon.jar",