Merge lp:~hudson-ubuntu/ubuntu/natty/libcommons-collections-java/bug-717157 into lp:ubuntu/natty/libcommons-collections-java

[James Page]

Minor packaging change to install maven artifacts to /usr/share/maven-repo.

Will submit back to Debian and link associated bug.

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-18 23:40:58 +0000
+++ debian/changelog	2011-02-11 14:42:55 +0000
@@ -1,3 +1,16 @@
+libcommons-collections-java (2.1.1-9ubuntu1) natty; urgency=low
+
+  * Enabled maven artifact deployment (LP: #717157):
+    - debian/control: Build-Depends-Indep added maven-repo-helper
+    - debian/rules: install maven artifacts and new target to retrieve
+      original POM file.
+    - debian/poms/commons-collections.pom: localised pom for maven
+    - debian/libcommons-collections-java.poms: pom reference locations
+  * Update Standards-Version: 3.9.1, no changes.
+  * Updated to source/format: 3.0 (quilt)
+
+ -- James Page <[e-mail]>  Fri, 11 Feb 2011 14:13:56 +0000
+
 libcommons-collections-java (2.1.1-9) unstable; urgency=low
 
   [ Onkar Shinde ]
 
=== modified file 'debian/control'
--- debian/control	2009-11-18 23:40:58 +0000
+++ debian/control	2011-02-11 14:42:55 +0000
@@ -1,11 +1,12 @@
 Source: libcommons-collections-java
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Arnaud Vandyck <[e-mail]>, Michael Koch <[e-mail]>
 Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, default-jdk
-Standards-Version: 3.8.3
+Build-Depends-Indep: ant, default-jdk, maven-repo-helper
+Standards-Version: 3.9.1
 
 Package: libcommons-collections-java
 Architecture: all
 
=== added file 'debian/libcommons-collections-java.poms'
--- debian/libcommons-collections-java.poms	1970-01-01 00:00:00 +0000
+++ debian/libcommons-collections-java.poms	2011-02-11 14:42:55 +0000
@@ -0,0 +1,1 @@
+debian/poms/commons-collections.pom
 
=== added file 'debian/maven.rules'
--- debian/maven.rules	1970-01-01 00:00:00 +0000
+++ debian/maven.rules	2011-02-11 14:42:55 +0000
@@ -0,0 +1,1 @@
+commons-collections commons-collections * s/2\..*/2.x/ * *
 
=== added directory 'debian/poms'
=== added file 'debian/poms/commons-collections.pom'
--- debian/poms/commons-collections.pom	1970-01-01 00:00:00 +0000
+++ debian/poms/commons-collections.pom	2011-02-11 14:42:55 +0000
@@ -0,0 +1,6 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>commons-collections</groupId>
+  <artifactId>commons-collections</artifactId>
+  <version>2.1.1</version>
+</project>
 \ No newline at end of file
 
=== modified file 'debian/rules'
--- debian/rules	2009-11-18 23:40:58 +0000
+++ debian/rules	2011-02-11 14:42:55 +0000
@@ -3,7 +3,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
@@ -11,6 +10,15 @@
 DEB_JARS := log4j-1.2 logkit servlet-2.3
 DEB_ANT_BUILD_TARGET := dist-jar doc
 
+MAVEN_REPO := http://repo1.maven.org/maven2
+PACKAGE    := commons-collections
+
 install/libcommons-collections-java::
 	install -m 644 dist/commons-collections-2.1.1.jar debian/libcommons-collections-java/usr/share/java/commons-collections-2.1.1.jar
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom dist/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
 
+get-orig-pom:
+	mkdir -p debian/poms
+	wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
+		$(MAVEN_REPO)/$(PACKAGE)/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2011-02-11 14:42:55 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)