[tomcat8] 02/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 tomcat8.

commit afe796ab8179f899b47176969d0d327fd49787ae
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 27 22:53:52 2015 +0100

    Refreshed the patches
---
 debian/changelog                                   |  7 +++++++
 .../0006-add-JARs-below-var-to-class-loader.patch  | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46b973c..e965caa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat8 (8.0.18-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 27 Jan 2015 22:45:26 +0100
+
 tomcat8 (8.0.17-1) experimental; urgency=medium
 
   * New upstream release
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 f29bc08..6105e29 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
@@ -3,28 +3,28 @@ Date: Mon, 28 Jun 2010 21:32:57 +0200
 Subject: [PATCH] add JARs below /var to class loader
 --- a/conf/catalina.properties
 +++ b/conf/catalina.properties
-@@ -48,7 +48,7 @@
- #
- # Note: Values are enclosed in double quotes ("...") in case either the
+@@ -50,7 +50,7 @@
  #       ${catalina.base} path or the ${catalina.home} path contains a comma.
+ #       Because double quotes are used for quoting, the double quote character
+ #       may not appear in a path.
 -common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar"
 +common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","${catalina.home}/common/classes","${catalina.home}/common/*.jar"
  
  #
  # List of comma-separated paths defining the contents of the "server"
-@@ -61,7 +61,7 @@
- #     "foo/*.jar": Add all the JARs of the specified folder as class
- #                  repositories
- #     "foo/bar.jar": Add bar.jar as a class repository
+@@ -68,7 +68,7 @@
+ #       ${catalina.base} path or the ${catalina.home} path contains a comma.
+ #       Because double quotes are used for quoting, the double quote character
+ #       may not appear in a path.
 -server.loader=
 +server.loader=${catalina.home}/server/classes,${catalina.home}/server/*.jar
  
  #
  # List of comma-separated paths defining the contents of the "shared"
-@@ -75,7 +75,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:.
+@@ -87,7 +87,7 @@
+ #       ${catalina.base} path or the ${catalina.home} path contains a comma.
+ #       Because double quotes are used for quoting, the double quote character
+ #       may not appear in a path.
 -shared.loader=
 +shared.loader=${catalina.home}/shared/classes,${catalina.home}/shared/*.jar
  

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