debian: Depend on antlr from the Ubuntu repositories for AWS API

wido · wido · commit c446c459b9d2 · 2012-10-10T17:01:17.000+02:00
The antlr JAR files conflict with the Ubuntu packages for this JAR files.

Maven depends on this as well, so when you try to install cloud-awsapi on a system
with Maven installed, you get:

(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/antlr-2.7.7.jar', which is also in package libantlr-java 2.7.7+dfsg-3
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)
Errors were encountered while processing:
 cloud-awsapi_4.0.0-incubating_amd64.deb

antlr-2.7.7.jar is in classpath.conf, so we can depend on this package and it will be loaded
for AWS API
diff --git a/debian/cloud-awsapi.install b/debian/cloud-awsapi.install
@@ -27,7 +27,6 @@
 /usr/share/java/CAStorSDK*.jar
 /usr/share/java/json-simple*.jar
 /usr/share/java/axiom-*.jar
-/usr/share/java/antlr*.jar
 /usr/share/java/XmlSchema-*.jar
 /usr/share/java/woden*.jar
 /usr/share/java/xercesImpl*.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), libcommons-fileupload-java (>= 1.2)
+Depends: openjdk-6-jre, tomcat6, libcommons-lang-java, libjaxp1.3-java (>= 1.3), libdom4j-java (>= 1.6.1), libcommons-fileupload-java (>= 1.2), libantlr-java (>= 2.7.7)
 Description: CloudStack AWS API wrapper
  The CloudStack Amazon Webservices API wrapper
