You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/10/10 14:47:53 UTC
git commit: debian: Depend on dom4j from Ubuntu repository for AWS API
Updated Branches:
refs/heads/4.0 62ad5af4d -> e2288ad51
debian: Depend on dom4j from Ubuntu repository for AWS API
On my system I already had libdom4j-java installed and this lead to:
(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/dom4j-1.6.1.jar', which is also in package libdom4j-java 1.6.1+dfsg.2-5
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
../cloud-awsapi_4.0.0-incubating_amd64.deb
Since this JAR file is available from the Ubuntu repository we depend on it instead of packaging it ourselfs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e2288ad5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e2288ad5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e2288ad5
Branch: refs/heads/4.0
Commit: e2288ad51846a199aa76bc8e9a5169fd29e580b0
Parents: 62ad5af
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Wed Oct 10 14:41:25 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Wed Oct 10 14:41:25 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/e2288ad5/debian/cloud-awsapi.install
----------------------------------------------------------------------
diff --git a/debian/cloud-awsapi.install b/debian/cloud-awsapi.install
index 6faa4e6..b932886 100644
--- a/debian/cloud-awsapi.install
+++ b/debian/cloud-awsapi.install
@@ -26,7 +26,6 @@
/usr/share/java/neethi*.jar
/usr/share/java/CAStorSDK*.jar
/usr/share/java/commons-fileupload*.jar
-/usr/share/java/dom4j*.jar
/usr/share/java/json-simple*.jar
/usr/share/java/axiom-*.jar
/usr/share/java/antlr*.jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e2288ad5/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 6e45dad..1bca86c 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, libjaxp1.3-java (>= 1.3)
+Depends: openjdk-6-jre, tomcat6, libcommons-lang-java, libjaxp1.3-java (>= 1.3), libdom4j-java (>= 1.6.1)
Description: CloudStack AWS API wrapper
The CloudStack Amazon Webservices API wrapper