incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject git commit: debian: Remove Google GSON from cloud-agent-deps and depend on cloud-deps
Date Fri, 14 Sep 2012 13:05:31 GMT
Updated Branches:
  refs/heads/master d9f095042 -> 465e0466c


debian: Remove Google GSON from cloud-agent-deps and depend on cloud-deps

Both the Agent and Server require Google GSON. This is not available from
the Ubuntu repositories, so we have to package it ourselfs.

Due to the fact that people might choose to run the Hypervisor on the same
host as the management server we can't have cloud-agent-deps conflict with cloud-deps

cloud-agent-deps now depends on cloud-deps so the hypervisor has Google GSON 1.7.1

This results in a number of extra JAR files to be installed on the hypervisor.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/465e0466
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/465e0466
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/465e0466

Branch: refs/heads/master
Commit: 465e0466c388e2b6a8036386cf513d37403adfed
Parents: d9f0950
Author: Wido den Hollander <wido@widodh.nl>
Authored: Fri Sep 14 15:03:17 2012 +0200
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Fri Sep 14 15:03:17 2012 +0200

----------------------------------------------------------------------
 debian/cloud-agent-deps.install |    1 -
 debian/control                  |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/465e0466/debian/cloud-agent-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-agent-deps.install b/debian/cloud-agent-deps.install
index cd8db2a..b05b7d1 100644
--- a/debian/cloud-agent-deps.install
+++ b/debian/cloud-agent-deps.install
@@ -15,5 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/usr/share/java/gson-1.7.1.jar
 /usr/share/java/libvirt-0.4.9.jar

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/465e0466/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index a264bfc..265c050 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Description: CloudStack library dependencies
 
 Package: cloud-agent-deps
 Architecture: any
-Depends: openjdk-6-jre
+Depends: openjdk-6-jre, cloud-deps (= ${source:Version})
 Description: CloudStack agent library dependencies
  This package contains a number of third-party dependencies
  not shipped by distributions, required to run the CloudStack


Mime
View raw message