[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.40-2-3-g1296627

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 1296627a5d8f36fb2d2512e50c431f4dc889b4dd
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jun 19 18:09:05 2013 +0200

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index d30f31e..ba1399f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat7 (7.0.41-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Wed, 19 Jun 2013 18:06:49 +0200
+
 tomcat7 (7.0.40-2) unstable; urgency=low
 
   * Fix deployment of POMs for libservlet-3.0-java JARs into javax
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 ee9e692..9766058 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
-@@ -832,7 +832,7 @@
+@@ -850,7 +850,7 @@
      </xslt>
    </target>
  
@@ -17,7 +17,7 @@ Subject: [PATCH] split deploy-webapps target from deploy target
            description="Default. Builds a working Tomcat instance">
  
      <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-@@ -870,6 +870,10 @@
+@@ -888,6 +888,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 4feca9f..fe5767c 100644
--- a/debian/patches/0010-debianize-build-xml.patch
+++ b/debian/patches/0010-debianize-build-xml.patch
@@ -14,7 +14,7 @@ Last-Update: 2011-05-16
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
             debug="${compile.debug}"
-@@ -835,12 +835,14 @@
+@@ -853,12 +853,14 @@
    <target name="deploy" depends="package,build-docs,deploy-webapps"
            description="Default. Builds a working Tomcat instance">
  
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
index 4425d6e..c1097fc 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
-@@ -578,7 +578,7 @@
+@@ -581,7 +581,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
@@ -36,7 +36,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      </property>
 --- a/webapps/docs/jndi-resources-howto.xml
 +++ b/webapps/docs/jndi-resources-howto.xml
-@@ -667,7 +667,7 @@ conn.close();
+@@ -679,7 +679,7 @@ conn.close();
  
      <p>The configuration properties for Tomcat's standard data source
      resource factory

-- 
tomcat7: Servlet and JSP engine