debian: Depend on libcommons-fileupload-java for AWS API

wido · wido · commit 38dca7c9c3db · 2012-10-10T14:54:05.000+02:00
This JAR is also provided by a Ubuntu package and is the version we depend on with Maven.

By adding this JAR to wscript_configure it is added to the classpath so the AWS API will be able to use it.

Not having this will result in a conflict in a package conflict

During build time we will build against the version fetched by Maven, but runtime we will use the one from
the Ubuntu repository.
diff --git a/debian/cloud-awsapi.install b/debian/cloud-awsapi.install
@@ -25,7 +25,6 @@
 /usr/share/java/axis2-*.jar
 /usr/share/java/neethi*.jar
 /usr/share/java/CAStorSDK*.jar
-/usr/share/java/commons-fileupload*.jar
 /usr/share/java/json-simple*.jar
 /usr/share/java/axiom-*.jar
 /usr/share/java/antlr*.jar
diff --git 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), libdom4j-java (>= 1.6.1)
+Depends: openjdk-6-jre, tomcat6, libcommons-lang-java, libjaxp1.3-java (>= 1.3), libdom4j-java (>= 1.6.1), libcommons-fileupload-java (>= 1.2)
 Description: CloudStack AWS API wrapper
  The CloudStack Amazon Webservices API wrapper
diff --git a/wscript_configure b/wscript_configure
@@ -47,6 +47,7 @@ systemjars = {
 		"commons-logging-api.jar",
 		"commons-pool.jar",
 		"commons-httpclient.jar",
+		"commons-fileupload.jar",
 		"ws-commons-util.jar",
 		"mysql-connector-java.jar",
 	),
