CVS tomcat5/debian/patches

[Arnaud Vandyck]

Update of /cvsroot/pkg-java/tomcat5/debian/patches
In directory haydn:/tmp/cvs-serv2062/patches

Modified Files:
	06_dont_build_servlet_api_and_jsp_api.patch 
Added Files:
	00_struts-config-upstream.unpatch 
	06_dont_build_servlet_api_and_jsp_api2.patch 
	06_dont_build_servlet_api_and_jsp_api3.patch 
	13_j-t-5_dont_build_and_fix_webapps.patch 
	14_j-t-5_dont_copy_deployer_howto.patch 
Log Message:
now it builds but the package is not done yet

--- /cvsroot/pkg-java/tomcat5/debian/patches/06_dont_build_servlet_api_and_jsp_api.patch	2005/05/14 12:32:07	1.1
+++ /cvsroot/pkg-java/tomcat5/debian/patches/06_dont_build_servlet_api_and_jsp_api.patch	2005/06/03 20:43:29	1.2
@@ -1,13 +1,22 @@
---- jakarta-tomcat-5/build.xml.orig	2005-05-06 00:22:54.000000000 +0200
-+++ jakarta-tomcat-5/build.xml	2005-05-06 00:23:27.000000000 +0200
-@@ -492,8 +492,8 @@
+--- jakarta-tomcat-5/build.xml~	2005-05-14 16:42:58.000000000 +0200
++++ jakarta-tomcat-5/build.xml	2005-05-14 16:47:10.000000000 +0200
+@@ -83,6 +83,7 @@
+     <mkdir dir="${tomcat.build}/server/lib" />
+     <mkdir dir="${tomcat.build}/common/lib" />
  
-   <target name="build-depends" depends="init"
-           description="Builds various dependent components - APIs, commons-el, commons-modeler, daemon">
--    <antcall target="build-servletapi"/>
--    <antcall target="build-jspapi"/>
-+    <!-- <antcall target="build-servletapi"/> -->
-+    <!-- <antcall target="build-jspapi"/> -->
++<!--
+     <uptodate property="servletapi.build.notrequired"
+               targetfile="${servlet-api.jar}">
+       <srcfiles dir="${api.home}/jsr154/src" includes="**" />
+@@ -92,6 +93,11 @@
+               targetfile="${jsp-api.jar}">
+       <srcfiles dir="${api.home}/jsr152/src" includes="**" />
+     </uptodate>
++-->
++    <property name="servletapi.build.notrequired"
++              value="false"/>
++    <property name="jspapi.build.notrequired"
++              value="false"/>
  
-     <!-- <antcall target="build-commons-modeler" /> -->
-     <!-- <antcall target="build-commons-daemon"  /> -->
+     <uptodate property="tomcatutil.build.notrequired"
+               targetfile="${tomcat.build}/server/lib/tomcat-util.jar">