From 9b47833434f99ae5b5110f9bdb5a7b1d4f76d750 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Tue, 24 Jun 2008 09:14:12 +0000
Subject: INTEGRATION: CWS rt29 (1.1.6); FILE MERGED 2008/06/19 15:24:45 rt
 1.1.6.1: #i90893# List jakarta-servletapi-5/build.xml as ADDITIONAL_FILES

---
 tomcat/tomcat.patch | 71 ++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 36 deletions(-)

(limited to 'tomcat')

diff --git a/tomcat/tomcat.patch b/tomcat/tomcat.patch
index 133b67d69fba..1815660b1b5b 100644
--- a/tomcat/tomcat.patch
+++ b/tomcat/tomcat.patch
@@ -1,36 +1,35 @@
-*** /dev/null	2008-02-01 11:10:25.957002171 +0100
---- misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml	2008-02-01 16:10:27.000000000 +0100
-***************
-*** 0 ****
---- 1,31 ----
-+ <project name="jsr152 and jsr154 in Debian" default="debuild" basedir=".">
-+ 
-+   <target name="debuild"
-+    description="Build jsr154 and jsr152 for Debian (Default)">
-+     <echo message="Building Servlet 2.4 API"/>
-+     <ant antfile="jsr154/build.xml"
-+          target="dist"
-+          inheritAll="false"
-+     />
-+     <echo message="Building JSP 2.0 API"/>
-+     <ant antfile="jsr152/build.xml"
-+          target="dist"
-+          inheritAll="false"
-+     />
-+   </target>
-+ 
-+   <target name="clean" description="Clean">
-+     <echo message="Cleaning JSP 2.0 API"/>
-+     <ant antfile="jsr152/build.xml"
-+          target="clean"
-+          inheritAll="false"
-+     />
-+     <echo message="Cleaning Servlet 2.4 API"/>
-+     <ant antfile="jsr154/build.xml"
-+          target="clean"
-+          inheritAll="false"
-+     />
-+     <delete dir="tmp"/>
-+   </target>
-+ 
-+ </project>
+--- misc/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml	Thu Jun 19 16:03:59 2008
++++ misc/build/jakarta-tomcat-5.0.30-src/jakarta-servletapi-5/build.xml	Thu Jun 19 15:56:18 2008
+@@ -1,1 +1,31 @@
+-dummy
++<project name="jsr152 and jsr154 in Debian" default="debuild" basedir=".">
++
++  <target name="debuild"
++   description="Build jsr154 and jsr152 for Debian (Default)">
++    <echo message="Building Servlet 2.4 API"/>
++    <ant antfile="jsr154/build.xml"
++         target="dist"
++         inheritAll="false"
++    />
++    <echo message="Building JSP 2.0 API"/>
++    <ant antfile="jsr152/build.xml"
++         target="dist"
++         inheritAll="false"
++    />
++  </target>
++
++  <target name="clean" description="Clean">
++    <echo message="Cleaning JSP 2.0 API"/>
++    <ant antfile="jsr152/build.xml"
++         target="clean"
++         inheritAll="false"
++    />
++    <echo message="Cleaning Servlet 2.4 API"/>
++    <ant antfile="jsr154/build.xml"
++         target="clean"
++         inheritAll="false"
++    />
++    <delete dir="tmp"/>
++  </target>
++
++</project>
-- 
cgit v1.2.3