Hi Wido, Thanks for the link. Just sent it. After playing around a little bit, I found a couple of more issues caused by missing jar files and incorporated fixes for that as well.
Thanks! Tomoe On Tue, Jun 26, 2012 at 3:43 PM, Wido den Hollander <[email protected]> wrote: > On 06/26/2012 08:40 AM, Wido den Hollander wrote: > >> On 06/26/2012 03:11 AM, Tomoe Sugihara wrote: >> >>> Hi, >>> >>> I just tried to build debian packages from master branch of ASF repo, but >>> it was failing because of >>> obsolete files under "debian" directory. >>> >>> I was able to build with the patch below. Could someone review this and >>> hopefully apply it to the master? >>> >> >> Yes, these facts have been known for a long time now. >> >> Under Debian the sccs-info file doesn't seem to be generated and the >> cloud-daemonize tool was also migrated out. >> >> Could you sign off the patch and re-submit it with "git send-email" ? >> >> This way your name stays preserved when I apply the patch :) >> > > I forgot, see this wiki page: http://wiki.cloudstack.org/** > display/dev/Git+workflow+in+**the+brave+new+world#** > Gitworkflowinthebravenewworld-**Patches<http://wiki.cloudstack.org/display/dev/Git+workflow+in+the+brave+new+world#Gitworkflowinthebravenewworld-Patches> > > That should explain. > > Thanks! > > Wido > > > >> Thanks! >> >> Wido >> >> >>> Cheers, >>> Tomoe >>> >>> ------------------ >>> 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-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. >>> - >>> 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 >>> >>> >> >> > >
