[tomcat7] 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 tomcat7.

commit e62f237ed4939234b8b366e2f3c1193c5b406ca8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 6 10:25:15 2014 +0200

    Refreshed the patches
---
 debian/changelog                                                 | 3 ++-
 debian/patches/0017-use-jdbc-pool-default.patch                  | 2 +-
 debian/patches/0020-disable-java8-support-with-jdtcompiler.patch | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 799d17f..d225755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-tomcat7 (7.0.55-2) UNRELEASED; urgency=medium
+tomcat7 (7.0.56-1) UNRELEASED; urgency=medium
 
+  * New upstream release
   * Install the extra jar catalina-jmx-remote.jar (Closes: #719921)
   * Removed the note about the authbind IPv6 incompatibility
     in /etc/defaults/tomcat7
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
index 97ecf55..4579047 100644
--- a/debian/patches/0017-use-jdbc-pool-default.patch
+++ b/debian/patches/0017-use-jdbc-pool-default.patch
@@ -25,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          Package + ".OpenEjbFactory";
 --- a/webapps/docs/config/systemprops.xml
 +++ b/webapps/docs/config/systemprops.xml
-@@ -581,7 +581,7 @@
+@@ -584,7 +584,7 @@
      <property name="javax.sql.DataSource.Factory">
        <p>The class name of the factory to use to create resources of type
        <code>javax.sql.DataSource</code>. If not specified the default of
diff --git a/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch b/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
index 798bc66..a8fe9b9 100644
--- a/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
+++ b/debian/patches/0020-disable-java8-support-with-jdtcompiler.patch
@@ -2,9 +2,9 @@ Description: Drop Java 8 support in JSP files until the Eclipse compiler is upda
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
 
---- tomcat7-7.0.53.orig/java/org/apache/jasper/compiler/JDTCompiler.java
-+++ tomcat7-7.0.53/java/org/apache/jasper/compiler/JDTCompiler.java
-@@ -333,9 +333,6 @@ public class JDTCompiler extends org.apa
+--- a/java/org/apache/jasper/compiler/JDTCompiler.java
++++ b/java/org/apache/jasper/compiler/JDTCompiler.java
+@@ -342,9 +342,6 @@
              } else if(opt.equals("1.7")) {
                  settings.put(CompilerOptions.OPTION_Source,
                               CompilerOptions.VERSION_1_7);
@@ -14,7 +14,7 @@ Forwarded: no
              } else {
                  log.warn("Unknown source VM " + opt + " ignored.");
                  settings.put(CompilerOptions.OPTION_Source,
-@@ -377,11 +374,6 @@ public class JDTCompiler extends org.apa
+@@ -386,11 +383,6 @@
                               CompilerOptions.VERSION_1_7);
                  settings.put(CompilerOptions.OPTION_Compliance,
                          CompilerOptions.VERSION_1_7);

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