[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 16910c5486266b95cfa3163f0de0ef9bf21d8175
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Aug 28 09:47:28 2015 +0200

    Refreshed the patches
---
 debian/changelog                                | 4 +++-
 debian/patches/0017-use-jdbc-pool-default.patch | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 57c2a0c..3f8d3e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-tomcat7 (7.0.63-2) UNRELEASED; urgency=medium
+tomcat7 (7.0.64-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Install the missing WebSocket jars in /usr/share/tomcat7/lib/
     (Closes: #787220, LP: #1326687)
   * Changed the authbind configuration to allow IPv6 connections (LP: #1443041)
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
index 452fcbb..8369d35 100644
--- a/debian/patches/0017-use-jdbc-pool-default.patch
+++ b/debian/patches/0017-use-jdbc-pool-default.patch
@@ -31,7 +31,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
        <code>javax.sql.DataSource</code>. If not specified the default of
 -      <code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code> is used
 +      <code>org.apache.tomcat.jdbc.pool.DataSourceFactory</code> is used
-       which is a package renamed (to avoid conflictions) copy of
+       which is a package renamed (to avoid conflicts) copy of
        <a href="http://commons.apache.org/dbcp">Apache Commons DBCP</a>.</p>
      </property>
 --- a/webapps/docs/jndi-resources-howto.xml

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