[pkg-java] r13101 - trunk/tomcat6/debian

[Thierry Carrez]

Author: ttx-guest
Date: 2010-11-23 16:12:51 +0000 (Tue, 23 Nov 2010)
New Revision: 13101

Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/rules
Log:
Fix build failure (missing TraXLiaison class) by adding ant-nodeps
to the classpath.

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2010-11-23 15:45:54 UTC (rev 13100)
+++ trunk/tomcat6/debian/changelog	2010-11-23 16:12:51 UTC (rev 13101)
@@ -6,6 +6,8 @@
   * Do not fail to purge if /etc/tomcat6 was manually removed (LP: #648619)
   * Add missing -p option in start-stop-daemon when starting tomcat6 to avoid
     failing to start due to /bin/bash running (LP: #632554)
+  * Fix build failure (missing TraXLiaison class) by adding ant-nodeps
+    to the classpath.
 
   [ tony mancill ]
   * Use debconf to determine tomcat6 user and group to delete upon purge.
@@ -13,7 +15,7 @@
   * Add tomcat-native to Suggests: for tomcat6 binary pacakge. 
     Thanks to Eddy Petrisor  (Closes: #600590)
 
- -- Thierry Carrez (ttx) <thierry.carrez at ubuntu.com>  Tue, 23 Nov 2010 16:39:31 +0100
+ -- Thierry Carrez (ttx) <thierry.carrez at ubuntu.com>  Tue, 23 Nov 2010 16:52:35 +0100
 
 tomcat6 (6.0.28-7) unstable; urgency=low
 

Modified: trunk/tomcat6/debian/rules
===================================================================
--- trunk/tomcat6/debian/rules	2010-11-23 15:45:54 UTC (rev 13100)
+++ trunk/tomcat6/debian/rules	2010-11-23 16:12:51 UTC (rev 13101)
@@ -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; \