← Back to branch summary

~ubuntu-branches/ubuntu/maverick/tomcat6/maverick

« back to all changes in this revision

Viewing changes to debian/patches/deploy-webapps-build-xml.patch

  • Committer: Bazaar Package Importer
  • Author(s): Torsten Werner
  • Date: 2010-06-28 21:41:31 UTC
  • mfrom: (2.2.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100628214131-3wktukpb3lgdf83h
Tags: 6.0.26-5
http://bugs.debian.org/587447
* Convert patches to dep3 format.
* Backport security fix from trunk to fix CVE-2010-1157. (Closes: #587447)
* Set urgency to medium due to the security fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/deploy-webapps-build-xml.patch
1
 
--- a/build.xml
2
 
+++ b/build.xml
3
 
@@ -494,7 +494,7 @@
4
 
     building a tomcat release.</echo>
5
 
   </target>
6
 
 
7
 
-  <target name="deploy" depends="build-only,build-docs,warn.dbcp">
8
 
+  <target name="deploy" depends="build-only,build-docs,warn.dbcp,deploy-webapps">
9
 
 
10
 
     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
11
 
             file="${tomcat-native.tar.gz}" />
12
 
@@ -530,6 +530,13 @@
13
 
       </fileset>
14
 
     </copy>
15
 
 
16
 
+    <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
17
 
+    <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
18
 
+
19
 
+  </target>
20
 
+
21
 
+  <target name="deploy-webapps" depends="build-only,build-docs">
22
 
+
23
 
     <!-- Copy other regular webapps -->
24
 
     <copy todir="${tomcat.build}/webapps">
25
 
       <fileset dir="webapps">
26
 
@@ -654,10 +661,6 @@
27
 
       </fileset>
28
 
     </txt2html>
29
 
 
30
 
-    <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
31
 
-      failonerror="false"/>
32
 
-    <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
33
 
-
34
 
   </target>
35
 
 
36
 
   <target name="clean-depend"