← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/0004-split-deploy-webapps-target-from-deploy-target.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/0004-split-deploy-webapps-target-from-deploy-target.patch
 
1
From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 
2
Date: Mon, 28 Jun 2010 21:32:35 +0200
 
3
Subject: [PATCH] split deploy-webapps target from deploy target
 
4
 
 
5
---
 
6
 build.xml |   13 ++++++++-----
 
7
 1 files changed, 8 insertions(+), 5 deletions(-)
 
8
 
 
9
diff --git a/build.xml b/build.xml
 
10
index 4073712..1e2ec83 100644
 
11
--- a/build.xml
 
12
+++ b/build.xml
 
13
@@ -469,7 +469,7 @@
 
14
     building a tomcat release.</echo>
 
15
   </target>
 
16
 
 
17
-  <target name="deploy" depends="build-only,build-docs,warn.dbcp">
 
18
+  <target name="deploy" depends="build-only,build-docs,warn.dbcp,deploy-webapps">
 
19
 
 
20
     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
 
21
             file="${tomcat-native.tar.gz}" />
 
22
@@ -505,6 +505,13 @@
 
23
       </fileset>
 
24
     </copy>
 
25
 
 
26
+    <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
 
27
+    <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
 
28
+
 
29
+  </target>
 
30
+
 
31
+  <target name="deploy-webapps" depends="build-only,build-docs">
 
32
+
 
33
     <!-- Copy other regular webapps -->
 
34
     <copy todir="${tomcat.build}/webapps">
 
35
       <fileset dir="webapps">
 
36
@@ -629,10 +636,6 @@
 
37
       </fileset>
 
38
     </txt2html>
 
39
 
 
40
-    <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
 
41
-      failonerror="false"/>
 
42
-    <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
 
43
-
 
44
   </target>
 
45
 
 
46
   <target name="clean-depend"
 
47
--