[tomcat8] 08/10: 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 tomcat8.

commit 1a83c5a3709ccba8729fb86f1c6ae93c137fa714
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 17 17:39:32 2017 +0200

    Refreshed the patches
---
 debian/changelog                                                      | 2 +-
 .../patches/0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++--
 debian/patches/0010-debianize-build-xml.patch                         | 4 ++--
 debian/patches/0013-dont-look-for-build-properties-in-user-home.patch | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 92fb091..7b822a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tomcat8 (8.5.19-1) UNRELEASED; urgency=medium
+tomcat8 (8.5.21-1) UNRELEASED; urgency=medium
 
   * Team upload.
 
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 dd1d745..7bc6495 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
-@@ -1004,7 +1004,7 @@
+@@ -1003,7 +1003,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"
-@@ -1043,6 +1043,10 @@
+@@ -1042,6 +1042,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 32606a6..7f48d8d 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
-@@ -655,7 +655,7 @@
+@@ -654,7 +654,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}"
-@@ -1007,12 +1007,14 @@
+@@ -1006,12 +1006,14 @@
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
            description="Default. Builds a working Tomcat instance">
  
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 e297c9d..1ab43bf 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
@@ -3,7 +3,7 @@ Date: Mon, 9 Jul 2012 20:53:38 +0000
 Subject: 0013-dont-look-for-build-properties-in-user-home
 --- a/build.xml
 +++ b/build.xml
-@@ -517,7 +517,6 @@
+@@ -518,7 +518,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/tomcat8.git