r2401 - in trunk/tomcat5.5/debian: . patches

[Arnaud Vandyck]

Author: avdyk
Date: 2006-09-12 13:11:02 +0000 (Tue, 12 Sep 2006)
New Revision: 2401

Removed:
   trunk/tomcat5.5/debian/patches/07_fix_jasper_directory.patch
Modified:
   trunk/tomcat5.5/debian/changelog
   trunk/tomcat5.5/debian/control
   trunk/tomcat5.5/debian/rules
Log:
head -n7 debian/changelog

Modified: trunk/tomcat5.5/debian/changelog
===================================================================
--- trunk/tomcat5.5/debian/changelog	2006-09-12 10:34:06 UTC (rev 2400)
+++ trunk/tomcat5.5/debian/changelog	2006-09-12 13:11:02 UTC (rev 2401)
@@ -1,3 +1,11 @@
+tomcat5.5 (5.5.17-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control: added tomcat5.5 dependency against ecj-boostrap so
+    there is a jsp compiler closes: #384062).
+
+ -- Arnaud Vandyck <avdyk at debian.org>  Tue, 12 Sep 2006 14:42:58 +0200
+
 tomcat5.5 (5.5.15-1) experimental; urgency=low
 
   * Arnaud Vandyck <avdyk at debian.org>:

Modified: trunk/tomcat5.5/debian/control
===================================================================
--- trunk/tomcat5.5/debian/control	2006-09-12 10:34:06 UTC (rev 2400)
+++ trunk/tomcat5.5/debian/control	2006-09-12 13:11:02 UTC (rev 2401)
@@ -9,7 +9,7 @@
 
 Package: tomcat5.5
 Architecture: all
-Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) | java2-runtime, libtomcat5.5-java (>= ${Source-Version}), tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.33-1) | apache2-common
+Depends: java-gcj-compat-dev (>= 1.0.30-5) | kaffe (>= 2:1.1.6-3) | java2-runtime, libtomcat5.5-java (>= ${Source-Version}), tomcat5.5-webapps (>= ${Source-Version}), tomcat5.5-admin (>= ${Source-Version}), adduser (>= 3.34), apache-utils (>= 1.3.33-1) | apache2-common, ecj-bootstrap
 Suggests: java-virtual-machine, libapache-mod-jk | libapache2-mod-jk
 Description: Java Servlet 2.4 engine with JSP 2.0 support
  Apache Tomcat 5 is the reference implementation for the Java Servlet 2.4

Deleted: trunk/tomcat5.5/debian/patches/07_fix_jasper_directory.patch
===================================================================
--- trunk/tomcat5.5/debian/patches/07_fix_jasper_directory.patch	2006-09-12 10:34:06 UTC (rev 2400)
+++ trunk/tomcat5.5/debian/patches/07_fix_jasper_directory.patch	2006-09-12 13:11:02 UTC (rev 2401)
@@ -1,11 +0,0 @@
---- build.xml.orig	2006-01-03 16:15:02.000000000 +0100
-+++ build.xml	2006-01-27 10:07:46.000000000 +0100
-@@ -36,7 +36,7 @@
-   <property name="catalina.home" 
-            value="${basedir}/${catalina.project}"/>
-   <property name="jasper.home"
--           value="${basedir}/${jasper.project}"/>
-+           value="${basedir}/${jasper.project}/jasper2"/>
-   <property name="jtc.home"
-            value="${basedir}/${jtc.project}"/>
-   <property name="tomcat.home"

Modified: trunk/tomcat5.5/debian/rules
===================================================================
--- trunk/tomcat5.5/debian/rules	2006-09-12 10:34:06 UTC (rev 2400)
+++ trunk/tomcat5.5/debian/rules	2006-09-12 13:11:02 UTC (rev 2401)
@@ -6,7 +6,7 @@
 TOMCAT_BUILD       := build/build
 CATALINA_SRCDIR    := container
 CONNECTORS_SRCDIR  := connectors
-JASPAER_SRCDIR     := jasper
+JASPER_SRCDIR     := jasper
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk