From ba9640b5d474f4f75de75ccb523fafe0adf94f51 Mon Sep 17 00:00:00 2001
From: frank <frank@cloud.com>
Date: Mon, 12 Sep 2011 10:56:19 -0700
Subject: [PATCH] change debian build in line with opensource

---
 debian/cloud-client.install  |  7 ++++++-
 debian/cloud-deps.install    |  4 +++-
 debian/cloud-premium.install |  8 --------
 debian/control               | 19 -------------------
 4 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 debian/cloud-premium.install

diff --git a/debian/cloud-client.install b/debian/cloud-client.install
index 7c973ec5adf..a48f70e07e9 100644
--- a/debian/cloud-client.install
+++ b/debian/cloud-client.install
@@ -30,4 +30,9 @@
 /var/lib/cloud/mnt
 /var/lib/cloud/management
 /usr/bin/cloud-setup-management
-/usr/bin/cloud-update-xenserver-licenses
\ No newline at end of file
+/usr/bin/cloud-update-xenserver-licenses
+/usr/share/java/cloud-core-extras.jar
+/usr/share/java/cloud-server-extras.jar
+/usr/share/java/cloud-vmware-base.jar
+/etc/cloud/management/commands-ext.properties
+/etc/cloud/management/components-premium.xml
diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install
index 27ea19f792d..7f305c22022 100644
--- a/debian/cloud-deps.install
+++ b/debian/cloud-deps.install
@@ -18,4 +18,6 @@
 /usr/share/java/cloud-axis.jar
 /usr/share/java/cloud-commons-discovery.jar
 /usr/share/java/cloud-wsdl4j.jar
-/usr/share/java/cloud-premium/*.jar
+/usr/share/java/vmware*.jar
+/usr/share/java/cloud-jnetpcap.jar
+/usr/share/java/cloud-junit.jar
diff --git a/debian/cloud-premium.install b/debian/cloud-premium.install
deleted file mode 100644
index 882b5ce8c25..00000000000
--- a/debian/cloud-premium.install
+++ /dev/null
@@ -1,8 +0,0 @@
-/usr/share/java/cloud-core-extras.jar
-/usr/share/java/cloud-server-extras.jar
-/usr/share/java/cloud-vmware-base.jar
-/etc/cloud/management/commands-ext.properties
-/etc/cloud/management/components-premium.xml
-/usr/share/cloud/setup/create-database-premium.sql
-/usr/share/cloud/setup/create-schema-premium.sql
-/usr/lib/cloud/agent/premium-scripts/*
diff --git a/debian/control b/debian/control
index 95dec54df2c..74e4c459560 100644
--- a/debian/control
+++ b/debian/control
@@ -83,16 +83,6 @@ Description: Cloud.com daemonization utility
  process.  The Cloud.com Cloud Stack uses this to start the agent
  as a service.
 
-Package: cloud-premium-deps
-Provides: vmops-premium-deps
-Conflicts: vmops-premium-deps
-Replaces: vmops-premium-deps
-Architecture: any
-Depends: openjdk-6-jre
-Description: Cloud.com premium library dependencies
- This package contains the certified software components required to run
- the premium edition of the Cloud.com Cloud Stack.
-
 Package: cloud-core
 Provides: vmops-core
 Conflicts: vmops-core
@@ -181,15 +171,6 @@ Description: Cloud.com console proxy
  The Cloud.com console proxy is the service in charge of granting console
  access into virtual machines managed by the Cloud.com CloudStack.
 
-Package: cloud-premium
-Provides: vmops-premium, cloud-premium-plugin-zynga, cloud-premium-vendor-zynga
-Conflicts: vmops-premium, cloud-premium-plugin-zynga, cloud-premium-vendor-zynga
-Replaces: vmops-premium, cloud-premium-plugin-zynga, cloud-premium-vendor-zynga
-Architecture: any
-Depends: openjdk-6-jre, cloud-utils (= ${source:Version}), cloud-premium-deps (= ${source:Version})
-Description: Cloud.com premium components
- The Cloud.com premium components expand the range of features on your cloud stack.
-
 Package: cloud-usage
 Provides: vmops-usage
 Conflicts: vmops-usage