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/11 13:32:40 UTC

git commit: debian: Depend on jsch from the repository

Updated Branches:
  refs/heads/master a84ec1218 -> e7ff6ecd7


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/e7ff6ecd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e7ff6ecd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e7ff6ecd

Branch: refs/heads/master
Commit: e7ff6ecd77f53c85738adaff49e15ae166c69461
Parents: a84ec12
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Tue Sep 11 13:31:50 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Sep 11 13:31:50 2012 +0200

----------------------------------------------------------------------
 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/e7ff6ecd/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/e7ff6ecd/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/e7ff6ecd/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",