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

[James Page]

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

[Thierry Carrez (ttx)]

Looks good, uploading.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-20 15:15:33 +0000
+++ debian/changelog	2010-11-08 13:54:00 +0000
@@ -1,3 +1,11 @@
+tomcat6 (6.0.28-7ubuntu2) natty; urgency=low
+
+  * Build-depend on ant/ant-optional (1.8.1)
+  * Amended debian/rules, fix xslt processing in ant 1.8.1 to 
+    fix FTBFS (LP: #662588)
+
+ -- James Page <[e-mail]>  Mon, 08 Nov 2010 13:19:04 +0000
+
 tomcat6 (6.0.28-7ubuntu1) natty; urgency=low
 
   * Build-depend on ant1.7 / ant1.7-optional to fix FTBFS (LP: #662588)
 
=== modified file 'debian/control'
--- debian/control	2010-10-20 15:15:33 +0000
+++ debian/control	2010-11-08 13:54:00 +0000
@@ -6,7 +6,7 @@
 Uploaders: Torsten Werner <[e-mail]>,
  Ludovic Claude <[e-mail]>, Michael Koch <[e-mail]>,
  Damien Raude-Morvan <[e-mail]>, Niels Thykier <[e-mail]>
-Build-Depends: default-jdk, ant1.7-optional, debhelper (>= 7), po-debconf
+Build-Depends: default-jdk, ant-optional, debhelper (>= 7), po-debconf
 Build-Depends-Indep: maven-repo-helper (>> 1.0.1), libecj-java
 Standards-Version: 3.8.4
 Homepage: http://tomcat.apache.org
 
=== modified file 'debian/rules'
--- debian/rules	2010-07-20 14:36:48 +0000
+++ debian/rules	2010-11-08 13:54:00 +0000
@@ -5,7 +5,7 @@
 BLDLIB := output/build/lib
 BLDBIN := output/build/bin
 DEB_JARS_BASE := /usr/share/java
-DEB_JARS := ant ant-launcher ant-trax
+DEB_JARS := ant ant-launcher ant-trax ant-nodeps
 DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
 	if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
 	if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \