Merge lp:~james-page/ubuntu/natty/tomcat6/fix-662588 into lp:ubuntu/natty/tomcat6

Proposed by James Page on 2010-11-08
Status: Merged
Merge reported by: Thierry Carrez
Merged at revision: not available
Proposed branch: lp:~james-page/ubuntu/natty/tomcat6/fix-662588
Merge into: lp:ubuntu/natty/tomcat6
Diff against target: 41 lines (+10/-2)
3 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~james-page/ubuntu/natty/tomcat6/fix-662588
Reviewer Review Type Date Requested Status
Thierry Carrez (community) 2010-11-08 Approve on 2010-11-09
Review via email: mp+40327@code.launchpad.net

Description of the change

Amended debian/rules to utilise ant-nodeps.jar to support xslt/TraX processing.

To post a comment you must log in.
Thierry Carrez (ttx) wrote :

Looks good, uploading.

review: Approve

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-10-20 15:15:33 +0000
3+++ debian/changelog 2010-11-08 13:54:00 +0000
4@@ -1,3 +1,11 @@
5+tomcat6 (6.0.28-7ubuntu2) natty; urgency=low
6+
7+ * Build-depend on ant/ant-optional (1.8.1)
8+ * Amended debian/rules, fix xslt processing in ant 1.8.1 to
9+ fix FTBFS (LP: #662588)
10+
11+ -- James Page <james.page@canonical.com> Mon, 08 Nov 2010 13:19:04 +0000
12+
13 tomcat6 (6.0.28-7ubuntu1) natty; urgency=low
14
15 * Build-depend on ant1.7 / ant1.7-optional to fix FTBFS (LP: #662588)
16
17=== modified file 'debian/control'
18--- debian/control 2010-10-20 15:15:33 +0000
19+++ debian/control 2010-11-08 13:54:00 +0000
20@@ -6,7 +6,7 @@
21 Uploaders: Torsten Werner <twerner@debian.org>,
22 Ludovic Claude <ludovic.claude@laposte.net>, Michael Koch <konqueror@gmx.de>,
23 Damien Raude-Morvan <drazzib@debian.org>, Niels Thykier <niels@thykier.net>
24-Build-Depends: default-jdk, ant1.7-optional, debhelper (>= 7), po-debconf
25+Build-Depends: default-jdk, ant-optional, debhelper (>= 7), po-debconf
26 Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java
27 Standards-Version: 3.8.4
28 Homepage: http://tomcat.apache.org
29
30=== modified file 'debian/rules'
31--- debian/rules 2010-07-20 14:36:48 +0000
32+++ debian/rules 2010-11-08 13:54:00 +0000
33@@ -5,7 +5,7 @@
34 BLDLIB := output/build/lib
35 BLDBIN := output/build/bin
36 DEB_JARS_BASE := /usr/share/java
37-DEB_JARS := ant ant-launcher ant-trax
38+DEB_JARS := ant ant-launcher ant-trax ant-nodeps
39 DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
40 if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
41 if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \

Subscribers

People subscribed via source and target branches

to all changes: