incubator-cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Wido den Hollander <w...@widodh.nl>
Subject Re: [PATCH] Fix broken debian packaging
Date Tue, 26 Jun 2012 09:07:59 GMT
On 06/26/2012 10:59 AM, Tomoe Sugihara wrote:
> Signed-off-by: Tomoe Sugihara <tomoe@midokura.com>
> ---
>   debian/cloud-deps.install   |    2 +-
>   debian/cloud-server.install |    4 ++++
>   debian/cloud-utils.install  |    1 -
>   debian/control              |   21 ---------------------
>   4 files changed, 5 insertions(+), 23 deletions(-)
>
> diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install
> index 9381a48..f0f7235 100644
> --- a/debian/cloud-deps.install
> +++ b/debian/cloud-deps.install
> @@ -17,7 +17,7 @@
>   /usr/share/java/cloud-jstl-1.2.jar
>   /usr/share/java/cloud-axis.jar
>   /usr/share/java/cloud-commons-discovery.jar
> -/usr/share/java/cloud-wsdl4j.jar
> +/usr/share/java/cloud-wsdl4j-1.6.2.jar
>   /usr/share/java/cloud-bcprov-jdk16-1.45.jar
>   /usr/share/java/cloud-jsch-0.1.42.jar
>   /usr/share/java/cloud-iControl.jar
> diff --git a/debian/cloud-server.install b/debian/cloud-server.install
> index 98380cb..7055ff5 100644
> --- a/debian/cloud-server.install
> +++ b/debian/cloud-server.install
> @@ -1,3 +1,7 @@
>   /usr/share/java/cloud-server.jar
>   /usr/share/java/cloud-ovm.jar
> +/usr/share/java/cloud-dp-user-dispersing.jar
> +/usr/share/java/cloud-plugin-srx.jar
> +/usr/share/java/cloud-plugin-f5.jar
> +/usr/share/java/cloud-plugin-netscaler.jar
>   /etc/cloud/server/*
> diff --git a/debian/cloud-utils.install b/debian/cloud-utils.install
> index b552626..5f1ea2f 100644
> --- a/debian/cloud-utils.install
> +++ b/debian/cloud-utils.install
> @@ -1,6 +1,5 @@
>   /usr/share/java/cloud-utils.jar
>   /usr/share/java/cloud-api.jar
> -/usr/share/doc/cloud/sccs-info
>   /usr/share/doc/cloud/version-info
>   /usr/share/doc/cloud/configure-info
>   /usr/bin/cloud-sccs
> diff --git a/debian/control b/debian/control
> index 517366d..0a9df5a 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -73,16 +73,6 @@ Description: CloudStack agent scripts
>    will participate in your cloud -- this is a requirement for the CloudStack
>    agent.
>
> -Package: cloud-daemonize
> -Provides: vmops-daemonize
> -Conflicts: vmops-daemonize
> -Replaces: vmops-daemonize
> -Architecture: any
> -Description: CloudStack daemonization utility
> - This package contains a program that daemonizes the specified
> - process.  The CloudStack Cloud Stack uses this to start the agent
> - as a service.

I just checked, but we are still using the daemonize binary in the init 
scripts for the agent, usage and console-proxy are still using the 
daemonize binary.

However, in wscript_build the compiling for the binary is commented out.

How do we proceed with this?

Wido

> -
>   Package: cloud-core
>   Provides: vmops-core
>   Conflicts: vmops-core
> @@ -93,17 +83,6 @@ Description: CloudStack core library
>    The CloudStack core libraries provide a set of Java classes used
>    in the CloudStack Cloud Stack.
>
> -Package: cloud-test
> -Provides: vmops-test
> -Conflicts: vmops-test
> -Replaces: vmops-test
> -Architecture: any
> -Depends: openjdk-6-jre, wget, cloud-utils (= ${source:Version}), cloud-deps (= ${source:Version})
> -Description: CloudStack test suite
> - The CloudStack test package contains a suite of automated tests
> - that the very much appreciated QA team at CloudStack constantly
> - uses to help increase the quality of the Cloud Stack.
> -
>   Package: cloud-client
>   Provides: vmops-client
>   Conflicts: vmops-client
>



Mime
View raw message