Updated Branches: refs/heads/4.0 f20d6369e -> 62ad5af4d
debian: Do not package xml-apis for AWS API This conflicts with with libjaxp1.3-java on Ubuntu systems. libjaxp1.3-java is installed when maven is installed, so on my local system I got: root@gateway:/usr/src# dpkg -i cloud-awsapi_4.0.0-incubating_amd64.deb (Reading database ... 68888 files and directories currently installed.) Unpacking cloud-awsapi (from cloud-awsapi_4.0.0-incubating_amd64.deb) ... dpkg: error processing cloud-awsapi_4.0.0-incubating_amd64.deb (--install): trying to overwrite '/usr/share/java/xml-apis-1.3.04.jar', which is also in package libjaxp1.3-java 1.3.05-2ubuntu2 dpkg-deb: error: subprocess paste was killed by signal (Broken pipe) Errors were encountered while processing: cloud-awsapi_4.0.0-incubating_amd64.deb root@gateway:/usr/src# This prevents you from installing the AWS API on a Ubuntu machine which also has Maven installed. The classpath is still generated by WAF which looks in the deps/ directory and will find the same JAR file there as what's in the Deb package we depend on. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/62ad5af4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/62ad5af4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/62ad5af4 Branch: refs/heads/4.0 Commit: 62ad5af4d4b6f0738362e67ea099ddaf2629e4b7 Parents: f20d636 Author: Wido den Hollander <[email protected]> Authored: Wed Oct 10 14:13:55 2012 +0200 Committer: Wido den Hollander <[email protected]> Committed: Wed Oct 10 14:13:55 2012 +0200 ---------------------------------------------------------------------- debian/cloud-awsapi.install | 1 - debian/control | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/62ad5af4/debian/cloud-awsapi.install ---------------------------------------------------------------------- diff --git a/debian/cloud-awsapi.install b/debian/cloud-awsapi.install index 9304eb3..6faa4e6 100644 --- a/debian/cloud-awsapi.install +++ b/debian/cloud-awsapi.install @@ -33,5 +33,4 @@ /usr/share/java/XmlSchema-*.jar /usr/share/java/woden*.jar /usr/share/java/xercesImpl*.jar -/usr/share/java/xml-apis*.jar /usr/share/java/javassist*.jar http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/62ad5af4/debian/control ---------------------------------------------------------------------- diff --git a/debian/control b/debian/control index 6158cec..6e45dad 100644 --- a/debian/control +++ b/debian/control @@ -120,6 +120,6 @@ Description: CloudStack commandline tool Package: cloud-awsapi Provides: cloud-awsapi Architecture: any -Depends: openjdk-6-jre, tomcat6, libcommons-lang-java +Depends: openjdk-6-jre, tomcat6, libcommons-lang-java, libjaxp1.3-java (>= 1.3) Description: CloudStack AWS API wrapper The CloudStack Amazon Webservices API wrapper
