[tomcat7] 02/04: 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 e5d02a16e810129e6bd18a5adcd1d4cc07220d7e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 24 13:10:41 2017 +0100

    Refreshed the patches
---
 debian/changelog                                               |  7 +++++++
 .../0004-split-deploy-webapps-target-from-deploy-target.patch  |  4 ++--
 debian/patches/0010-debianize-build-xml.patch                  |  4 ++--
 debian/patches/0011-fix-classpath-lintian-warnings.patch       | 10 +++++-----
 .../0013-dont-look-for-build-properties-in-user-home.patch     |  2 +-
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db90326..e70b75b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat7 (7.0.74-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 16 Jan 2017 01:38:40 +0100
+
 tomcat7 (7.0.73-1) unstable; urgency=medium
 
   * New upstream release
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 5657f68..a61b210 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
@@ -3,7 +3,7 @@ Date: Mon, 28 Jun 2010 21:32:35 +0200
 Subject: [PATCH] split deploy-webapps target from deploy target
 --- a/build.xml
 +++ b/build.xml
-@@ -986,7 +986,7 @@
+@@ -991,7 +991,7 @@
      </xslt>
    </target>
  
@@ -12,7 +12,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"
-@@ -1024,6 +1024,10 @@
+@@ -1029,6 +1029,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index b2122ac..c29ed83 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
-@@ -635,7 +635,7 @@
+@@ -638,7 +638,7 @@
    <target name="compile" depends="compile-java6,check-java7,compile-java7" />
  
    <target name="compile-java6"
@@ -14,7 +14,7 @@ Last-Update: 2011-05-16
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
             debug="${compile.debug}"
-@@ -989,12 +989,14 @@
+@@ -994,12 +994,14 @@
    <target name="deploy" depends="package,build-docs,deploy-webapps,compile-webapp-examples"
            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 0583337..c48f51d 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: 2014-05-01
 
 --- a/build.xml
 +++ b/build.xml
-@@ -794,7 +794,8 @@
+@@ -799,7 +799,8 @@
      <!-- Jasper Implementation JAR File -->
      <jarIt jarfile="${jasper.jar}"
        filesDir="${tomcat.classes}"
@@ -15,7 +15,7 @@ Last-Update: 2014-05-01
  
      <!-- Jasper EL Implementation JAR File -->
      <jarIt jarfile="${jasper-el.jar}"
-@@ -802,8 +803,7 @@
+@@ -807,8 +808,7 @@
        filesId="files.jasper-el" />
  
      <!-- i18n JARs -->
@@ -25,7 +25,7 @@ Last-Update: 2014-05-01
        <fileset dir="${tomcat.classes}">
          <include name="**/LocalStrings_es.properties" />
        </fileset>
-@@ -811,9 +811,8 @@
+@@ -816,9 +816,8 @@
          fullpath="META-INF/NOTICE" />
        <zipfileset file="${tomcat.manifests}/default.license"
          fullpath="META-INF/LICENSE" />
@@ -37,7 +37,7 @@ Last-Update: 2014-05-01
        <fileset dir="${tomcat.classes}">
          <include name="**/LocalStrings_fr.properties" />
        </fileset>
-@@ -821,9 +820,8 @@
+@@ -826,9 +825,8 @@
          fullpath="META-INF/NOTICE" />
        <zipfileset file="${tomcat.manifests}/default.license"
          fullpath="META-INF/LICENSE" />
@@ -49,7 +49,7 @@ Last-Update: 2014-05-01
        <fileset dir="${tomcat.classes}">
          <include name="**/LocalStrings_ja.properties" />
        </fileset>
-@@ -831,7 +829,7 @@
+@@ -836,7 +834,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 4de2d7b..9252009 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
-@@ -505,7 +505,6 @@
+@@ -507,7 +507,6 @@
      <!-- Property that determines if manifests need updating -->
      <uptodate property="manifests.uptodate"
          targetfile="${tomcat.manifests}/default.manifest" >

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