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

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit 5acd4a70e73ff196a0de0db096f67103a19a3570
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Jul 16 17:37:39 2013 +0200

    New upstream release, patch refresh

diff --git a/debian/changelog b/debian/changelog
index aa913c6..e7ab3fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tomcat7 (7.0.42-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Tue, 16 Jul 2013 17:34:58 +0200
+
 tomcat7 (7.0.41-1) unstable; urgency=low
 
   * New upstream release (Closes: #712978).
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 9766058..ea0516e 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
-@@ -850,7 +850,7 @@
+@@ -851,7 +851,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"
-@@ -888,6 +888,10 @@
+@@ -889,6 +889,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index fe5767c..5c187e9 100644
--- a/debian/patches/0010-debianize-build-xml.patch
+++ b/debian/patches/0010-debianize-build-xml.patch
@@ -5,7 +5,7 @@ Last-Update: 2011-05-16
 
 --- a/build.xml
 +++ b/build.xml
-@@ -552,7 +552,7 @@
+@@ -553,7 +553,7 @@
      </copy>
    </target>
  
@@ -14,7 +14,7 @@ Last-Update: 2011-05-16
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
             debug="${compile.debug}"
-@@ -853,12 +853,14 @@
+@@ -854,12 +854,14 @@
    <target name="deploy" depends="package,build-docs,deploy-webapps"
            description="Default. Builds a working Tomcat instance">
  
diff --git a/debian/patches/0011-fix-classpath-lintian-warnings.patch b/debian/patches/0011-fix-classpath-lintian-warnings.patch
index ce6f6bd..d29bdad 100644
--- a/debian/patches/0011-fix-classpath-lintian-warnings.patch
+++ b/debian/patches/0011-fix-classpath-lintian-warnings.patch
@@ -5,7 +5,7 @@ Last-Update: 2011-05-16
 
 --- a/build.xml
 +++ b/build.xml
-@@ -685,7 +685,8 @@
+@@ -686,7 +686,8 @@
      <!-- Jasper Implementation JAR File -->
      <jarIt jarfile="${jasper.jar}"
        filesDir="${tomcat.classes}"
@@ -15,7 +15,7 @@ Last-Update: 2011-05-16
  
      <!-- Jasper EL Implementation JAR File -->
      <jarIt jarfile="${jasper-el.jar}"
-@@ -693,8 +694,7 @@
+@@ -694,8 +695,7 @@
        filesId="files.jasper-el" />
  
      <!-- i18n JARs -->
@@ -25,7 +25,7 @@ Last-Update: 2011-05-16
        <fileset dir="${tomcat.classes}">
          <include name="**/LocalStrings_es.properties" />
        </fileset>
-@@ -702,9 +702,8 @@
+@@ -703,9 +703,8 @@
          fullpath="META-INF/NOTICE" />
        <zipfileset file="${tomcat.manifests}/default.license"
          fullpath="META-INF/LICENSE" />
@@ -37,7 +37,7 @@ Last-Update: 2011-05-16
        <fileset dir="${tomcat.classes}">
          <include name="**/LocalStrings_fr.properties" />
        </fileset>
-@@ -712,9 +711,8 @@
+@@ -713,9 +712,8 @@
          fullpath="META-INF/NOTICE" />
        <zipfileset file="${tomcat.manifests}/default.license"
          fullpath="META-INF/LICENSE" />
@@ -49,7 +49,7 @@ Last-Update: 2011-05-16
        <fileset dir="${tomcat.classes}">
          <include name="**/LocalStrings_ja.properties" />
        </fileset>
-@@ -722,7 +720,7 @@
+@@ -723,7 +721,7 @@
          fullpath="META-INF/NOTICE" />
        <zipfileset file="${tomcat.manifests}/default.license"
          fullpath="META-INF/LICENSE" />
diff --git a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
index 183da9f..6b34b4b 100644
--- a/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
+++ b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
@@ -8,7 +8,7 @@ Subject: 0013-dont-look-for-build-properties-in-user-home
 
 --- a/build.xml
 +++ b/build.xml
-@@ -426,7 +426,6 @@
+@@ -427,7 +427,6 @@
      <!-- Property that determines if manifests need updating -->
      <uptodate property="manifests.uptodate"
          targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
index c1097fc..16c996b 100644
--- a/debian/patches/0017-use-jdbc-pool-default.patch
+++ b/debian/patches/0017-use-jdbc-pool-default.patch
@@ -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
-@@ -679,7 +679,7 @@ conn.close();
+@@ -684,7 +684,7 @@ conn.close();
  
      <p>The configuration properties for Tomcat's standard data source
      resource factory

-- 
tomcat7: Servlet and JSP engine