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

wido · wido · commit 465e0466c388 · 2012-09-14T15:03:17.000+02:00
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.
diff --git 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
diff --git 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
