[tomcat6] 03/03: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat6.

commit 4fb04b211bc78e39ab4a2e08720a663218cda280
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 22 10:04:34 2014 +0200

    Refreshed the patches
---
 debian/changelog                                                 | 7 +++++++
 .../0004-split-deploy-webapps-target-from-deploy-target.patch    | 6 +++---
 debian/patches/0006-add-JARs-below-var-to-class-loader.patch     | 9 +++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 28c4fdc..79bb9bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat6 (6.0.41-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 22 May 2014 10:03:04 +0200
+
 tomcat6 (6.0.39-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
index 1dbce8c..9e1550d 100644
--- a/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
+++ b/debian/patches/0004-split-deploy-webapps-target-from-deploy-target.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target
 
 --- a/build.xml
 +++ b/build.xml
-@@ -491,7 +491,7 @@
+@@ -490,7 +490,7 @@
      building a tomcat release.</echo>
    </target>
  
@@ -17,7 +17,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target
  
      <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
              file="${tomcat-native.tar.gz}" />
-@@ -528,6 +528,13 @@
+@@ -527,6 +527,13 @@
        </fileset>
      </copy>
  
@@ -31,7 +31,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target
      <!-- Copy other regular webapps -->
      <copy todir="${tomcat.build}/webapps">
        <fileset dir="webapps">
-@@ -652,10 +659,6 @@
+@@ -649,10 +656,6 @@
        </fileset>
      </txt2html>
  
diff --git a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
index 23ec3da..7274e88 100644
--- a/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
+++ b/debian/patches/0006-add-JARs-below-var-to-class-loader.patch
@@ -6,11 +6,9 @@ Subject: [PATCH] add JARs below /var to class loader
  conf/catalina.properties |    6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/conf/catalina.properties b/conf/catalina.properties
-index dc2db35..5971437 100644
 --- a/conf/catalina.properties
 +++ b/conf/catalina.properties
-@@ -44,7 +44,7 @@ package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache
+@@ -46,7 +46,7 @@
  #     "foo/*.jar": Add all the JARs of the specified folder as class 
  #                  repositories
  #     "foo/bar.jar": Add bar.jar as a class repository
@@ -19,7 +17,7 @@ index dc2db35..5971437 100644
  
  #
  # List of comma-separated paths defining the contents of the "server" 
-@@ -57,7 +57,7 @@ common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/l
+@@ -59,7 +59,7 @@
  #     "foo/*.jar": Add all the JARs of the specified folder as class 
  #                  repositories
  #     "foo/bar.jar": Add bar.jar as a class repository
@@ -28,7 +26,7 @@ index dc2db35..5971437 100644
  
  #
  # List of comma-separated paths defining the contents of the "shared" 
-@@ -71,7 +71,7 @@ server.loader=
+@@ -73,7 +73,7 @@
  #     "foo/bar.jar": Add bar.jar as a class repository 
  # Please note that for single jars, e.g. bar.jar, you need the URL form
  # starting with file:.
@@ -37,4 +35,3 @@ index dc2db35..5971437 100644
  
  #
  # String cache configuration.
--- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat6.git