[SCM] jenkins-xstream packaging branch, master, updated. debian/1.3.1-jenkins-9-2-2-g4ade924

[James Page]

The following commit has been merged in the master branch:
commit 5635b7bf70285e2f19a79e4a9c10afaf7c097783
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jun 12 22:06:19 2012 +0100

    Imported Debian patch 1.3.1-jenkins-9-2ubuntu1

diff --git a/debian/changelog b/debian/changelog
index 8badab7..3be9fa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+jenkins-xstream (1.3.1-jenkins-9-2ubuntu1) quantal; urgency=low
+
+  * Fix FTBFS with openjdk-7 as default-jdk (LP: #888948):
+    - d/patches/java7-compat.patch: Add additional profile for Java 7 
+      to ensure that xstream module is built.
+  * d/rules: Remove surplus maven artifact handling.
+
+ -- James Page <james.page at ubuntu.com>  Tue, 12 Jun 2012 22:06:19 +0100
+
 jenkins-xstream (1.3.1-jenkins-9-2) unstable; urgency=low
 
   * Fix FTBFS: Update woodstox artifact name to woodstox-core-lgpl; 
diff --git a/debian/control b/debian/control
index 030493b..407807f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: jenkins-xstream
 Section: java
 Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: James Page <james.page at ubuntu.com>
 DM-Upload-Allowed: yes
 Build-Depends:
diff --git a/debian/libjenkins-xstream-java.poms b/debian/libjenkins-xstream-java.poms
index 8ae44f5..4669af1 100644
--- a/debian/libjenkins-xstream-java.poms
+++ b/debian/libjenkins-xstream-java.poms
@@ -24,4 +24,4 @@
 #     temporarily for certain artifacts such as Javadoc jars.
 #
 pom.xml
-xstream/pom.xml --java-lib --usj-name=jenkins-xstream 
+xstream/pom.xml --java-lib --usj-name=jenkins-xstream
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
new file mode 100644
index 0000000..d7da7e7
--- /dev/null
+++ b/debian/patches/java7-compat.patch
@@ -0,0 +1,20 @@
+Index: jenkins-xstream/pom.xml
+===================================================================
+--- jenkins-xstream.orig/pom.xml	2012-06-12 22:00:53.775305000 +0100
++++ jenkins-xstream/pom.xml	2012-06-12 22:13:29.437152274 +0100
+@@ -26,6 +26,15 @@
+   <!-- xstream-builder is currently JDK 5 only -->
+   <profiles>
+     <profile>
++      <id>jdk17</id>
++      <activation>
++        <jdk>1.7</jdk>
++      </activation>
++      <modules>
++        <module>xstream</module>
++      </modules>
++    </profile>
++    <profile>
+       <id>jdk16</id>
+       <activation>
+         <jdk>1.6</jdk>
diff --git a/debian/patches/series b/debian/patches/series
index 69d2f17..2298012 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 build.patch
 sax.patch
+java7-compat.patch
diff --git a/debian/rules b/debian/rules
index 3f1d2f4..b76c54a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,18 +5,5 @@ include /usr/share/cdbs/1/class/maven.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
-DEB_MAVEN_INSTALL_TO_USJ := false
-PACKAGE := jenkins-xstream
-JAR := xstream
-
-# Install branch specific named version in /usr/share/java
-# This works around the fact that maven-debian-helper does
-# not pass --usj-name from debian/*.poms
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java --usj-name=$(PACKAGE) --java-lib -l xstream/pom.xml \
-       xstream/target/$(JAR)-$(DEB_UPSTREAM_VERSION).jar
-	jh_classpath -plib$(PACKAGE)-java
-
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

-- 
jenkins-xstream packaging