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

Proposed by James Page on 2011-02-09
Status: Merged
Merged at revision: 10
Proposed branch: lp:~hudson-ubuntu/ubuntu/natty/xom/hudson-fixes
Merge into: lp:ubuntu/natty/xom
Diff against target: 158 lines (+100/-4)
5 files modified
debian/changelog (+12/-0)
debian/control (+5/-3)
debian/libxom-java.poms (+1/-0)
debian/poms/xom.pom (+70/-0)
debian/rules (+12/-1)
To merge this branch: bzr merge lp:~hudson-ubuntu/ubuntu/natty/xom/hudson-fixes
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-02-09 Pending
Review via email: mp+49044@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-25 20:16:46 +0000
3+++ debian/changelog 2011-02-09 11:51:30 +0000
4@@ -1,3 +1,15 @@
5+xom (1.2.1-2ubuntu1) natty; urgency=low
6+
7+ * Enabled maven artifact deployment (LP: #715684):
8+ - debian/control: Build-Depends-Indep added maven-repo-helper
9+ - debian/rules: install maven artifacts and new target to retrieve
10+ original POM file.
11+ - debian/poms/xom.pom: localised pom for maven
12+ - debian/libxom-java.poms: pom reference locations
13+ * Update Standards-Version: 3.9.1, no changes.
14+
15+ -- James Page <james.page@canonical.com> Wed, 05 Jan 2011 14:59:38 +0000
16+
17 xom (1.2.1-2) unstable; urgency=low
18
19 * Convert patches to dep3 format.
20
21=== modified file 'debian/control'
22--- debian/control 2010-02-25 20:16:46 +0000
23+++ debian/control 2011-02-09 11:51:30 +0000
24@@ -1,12 +1,14 @@
25 Source: xom
26 Section: java
27 Priority: optional
28-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
29+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
30+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
31 Uploaders: Stephan Michels <stephan@apache.org>, Varun Hiremath <varun@debian.org>, Kumar Appaiah <akumar@debian.org>
32 Build-Depends: debhelper (>= 5), cdbs
33 Build-Depends-Indep: ant, default-jdk, junit (>= 3.8.1),
34- libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1)
35-Standards-Version: 3.8.4
36+ libxerces2-java, libxalan2-java, libjaxen-java (>= 1.1),
37+ maven-repo-helper
38+Standards-Version: 3.9.1
39 Homepage: http://www.xom.nu/
40 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xom
41 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/xom
42
43=== added file 'debian/libxom-java.poms'
44--- debian/libxom-java.poms 1970-01-01 00:00:00 +0000
45+++ debian/libxom-java.poms 2011-02-09 11:51:30 +0000
46@@ -0,0 +1,1 @@
47+debian/poms/xom.pom
48
49=== added directory 'debian/poms'
50=== added file 'debian/poms/xom.pom'
51--- debian/poms/xom.pom 1970-01-01 00:00:00 +0000
52+++ debian/poms/xom.pom 2011-02-09 11:51:30 +0000
53@@ -0,0 +1,70 @@
54+<?xml version="1.0"?>
55+<project xmlns="http://maven.apache.org/POM/4.0.0"
56+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
57+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
58+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
59+ <modelVersion>4.0.0</modelVersion>
60+ <packaging>jar</packaging>
61+ <name>XOM</name>
62+ <version>1.2.1</version>
63+ <description>The XOM Dual Streaming/Tree API for Processing XML</description>
64+ <url>http://xom.nu</url>
65+ <licenses>
66+ <license>
67+ <name>The GNU Lesser General Public License, Version 2.1</name>
68+ <url>http://www.gnu.org/licenses/lgpl-2.1.html</url>
69+ <distribution>repo</distribution>
70+ </license>
71+ </licenses>
72+ <scm>
73+ <url>https://xom.dev.java.net/source/browse/xom/</url>
74+ </scm>
75+
76+ <artifactId>xom</artifactId>
77+ <!-- previously used group ID -->
78+ <groupId>xom</groupId>
79+
80+ <inceptionYear>2002</inceptionYear>
81+
82+ <mailingLists>
83+ <mailingList>
84+ <name>XOM Interest Mailing List</name>
85+ <archive>http://lists.ibiblio.org/pipermail/xom-interest/</archive>
86+ </mailingList>
87+ </mailingLists>
88+
89+ <developers>
90+ <developer>
91+ <name>Elliotte Rusty Harold</name>
92+ <id>elharo</id>
93+ <email>elharo@ibiblio.org</email>
94+ <organization>Cafe au Lait</organization>
95+ </developer>
96+ </developers>
97+
98+ <dependencies>
99+ <dependency>
100+ <groupId>xml-apis</groupId>
101+ <artifactId>xml-apis</artifactId>
102+ <version>1.3.03</version>
103+ <type>jar</type>
104+ </dependency>
105+ <dependency>
106+ <groupId>xerces</groupId>
107+ <artifactId>xercesImpl</artifactId>
108+ <version>2.8.0</version>
109+ <type>jar</type>
110+ </dependency>
111+ <dependency>
112+ <groupId>xalan</groupId>
113+ <artifactId>xalan</artifactId>
114+ <version>2.7.0</version>
115+ <type>jar</type>
116+ </dependency>
117+ </dependencies>
118+
119+ <build>
120+ <sourceDirectory>src</sourceDirectory>
121+ </build>
122+
123+</project>
124
125=== modified file 'debian/rules'
126--- debian/rules 2010-02-25 20:16:46 +0000
127+++ debian/rules 2011-02-09 11:51:30 +0000
128@@ -6,6 +6,8 @@
129 JAVA_HOME := /usr/lib/jvm/default-java
130 DEB_JARS := xercesImpl xalan xml-apis jaxen saxpath junit
131 DEB_ANT_BUILD_TARGET := jar samples javadoc
132+PACKAGE := xom
133+MAVEN_REPO := http://repo1.maven.org/maven2
134
135 clean::
136 -find -name '*.class' | xargs $(RM)
137@@ -16,6 +18,8 @@
138 dh_link -plibxom-java usr/share/java/xom-$(DEB_UPSTREAM_VERSION).jar usr/share/java/xom.jar
139 install -m644 build/xom-samples.jar debian/libxom-java/usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar
140 dh_link -plibxom-java usr/share/java/xom-samples-$(DEB_UPSTREAM_VERSION).jar usr/share/java/xom-samples.jar
141+ mh_installpoms -plib$(PACKAGE)-java
142+ mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).pom build/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
143
144 install/libxom-java-doc::
145 dh_installdocs -plibxom-java-doc build/apidocs
146@@ -23,4 +27,11 @@
147 get-orig-source:
148 -uscan --upstream-version 0 --rename
149
150-DEB_PHONY_RULES += get-orig-source
151+get-orig-pom:
152+ mkdir -p debian/poms
153+ wget -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
154+ $(MAVEN_REPO)/xom/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
155+
156+
157+
158+DEB_PHONY_RULES += get-orig-source get-orig-pom

Subscribers

People subscribed via source and target branches