Merge lp:~hudson-ubuntu/ubuntu/natty/xom/hudson-fixes into lp:ubuntu/natty/xom

[James Page]

Package now installs Maven artifacts to /usr/share/maven-repo

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-25 20:16:46 +0000
+++ debian/changelog	2011-02-09 11:51:30 +0000
@@ -1,3 +1,15 @@
+xom (1.2.1-2ubuntu1) natty; urgency=low
+
+  * Enabled maven artifact deployment (LP: #715684):
+    - debian/control: Build-Depends-Indep added maven-repo-helper
+    - debian/rules: install maven artifacts and new target to retrieve
+      original POM file.
+    - debian/poms/xom.pom: localised pom for maven
+    - debian/libxom-java.poms: pom reference locations
+  * Update Standards-Version: 3.9.1, no changes.
+
+ -- James Page <[e-mail]>  Wed, 05 Jan 2011 14:59:38 +0000
+
 xom (1.2.1-2) unstable; urgency=low
 
   * Convert patches to dep3 format.
 
=== modified file 'debian/control'
--- debian/control	2010-02-25 20:16:46 +0000
+++ debian/control	2011-02-09 11:51:30 +0000
@@ -1,12 +1,14 @@
 Source: xom
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
 Uploaders: Stephan Michels <[e-mail]>, Varun Hiremath <[e-mail]>, Kumar Appaiah <[e-mail]>
 Build-Depends: debhelper (>= 5), cdbs
 Build-Depends-Indep: ant, default-jdk, junit (>= 3.8.1),
- libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1)
-Standards-Version: 3.8.4
+ libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1),
+ maven-repo-helper
+Standards-Version: 3.9.1
 Homepage: http://www.xom.nu/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xom
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xom
 
=== added file 'debian/libxom-java.poms'
--- debian/libxom-java.poms	1970-01-01 00:00:00 +0000
+++ debian/libxom-java.poms	2011-02-09 11:51:30 +0000
@@ -0,0 +1,1 @@
+debian/poms/xom.pom
 
=== added directory 'debian/poms'
=== added file 'debian/poms/xom.pom'
--- debian/poms/xom.pom	1970-01-01 00:00:00 +0000
+++ debian/poms/xom.pom	2011-02-09 11:51:30 +0000
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <name>XOM</name>
+  <version>1.2.1</version>
+  <description>The XOM Dual Streaming/Tree API for Processing XML</description>
+  <url>http://xom.nu</url>
+  <licenses>
+    <license>
+      <name>The GNU Lesser General Public License, Version 2.1</name>
+      <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>https://xom.dev.java.net/source/browse/xom/</url>
+  </scm>
+  
+  <artifactId>xom</artifactId>
+  <!--  previously used group ID -->
+  <groupId>xom</groupId>
+
+  <inceptionYear>2002</inceptionYear>
+
+  <mailingLists>
+    <mailingList>
+      <name>XOM Interest Mailing List</name>
+      <archive>http://lists.ibiblio.org/pipermail/xom-interest/</archive>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <name>Elliotte Rusty Harold</name>
+      <id>elharo</id>
+      <email>[e-mail]</email>
+      <organization>Cafe au Lait</organization>
+    </developer>
+  </developers>
+
+  <dependencies>
+    <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.3.03</version>
+        <type>jar</type>
+    </dependency>  
+    <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.8.0</version>
+        <type>jar</type>
+    </dependency>  
+    <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>2.7.0</version>
+        <type>jar</type>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+  </build>  
+  
+</project>  
 
=== modified file 'debian/rules'
--- debian/rules	2010-02-25 20:16:46 +0000
+++ debian/rules	2011-02-09 11:51:30 +0000
@@ -6,6 +6,8 @@
 JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_JARS		:= xercesImpl xalan xml-apis jaxen saxpath junit
 DEB_ANT_BUILD_TARGET	:= jar samples javadoc
+PACKAGE                 := xom
+MAVEN_REPO              := http://repo1.maven.org/maven2
 
 clean::
 	-find -name '*.class' | xargs $(RM)
@@ -16,6 +18,8 @@
 	dh_link -plibxom-java usr/share/java/xom-$(DEB_UPSTREAM_VERSION).jar usr/share/java/xom.jar
 	install -m644 build/xom-samples.jar debian/libxom-java/usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar
 	dh_link -plibxom-java usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar usr/share/java/xom-samples.jar
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom build/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar 
 
 install/libxom-java-doc::
 	dh_installdocs -plibxom-java-doc build/apidocs
@@ -23,4 +27,11 @@
 get-orig-source:
 	-uscan --upstream-version 0 --rename	
 
-DEB_PHONY_RULES += get-orig-source
+get-orig-pom:
+	mkdir -p debian/poms
+	wget  -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
+		$(MAVEN_REPO)/xom/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+
+
+
+DEB_PHONY_RULES += get-orig-source get-orig-pom