[tomcat8] 02/05: 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 d9c54995c9798033349843466a259436b7e4ff53
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 6 11:12:08 2017 +0100

    Refreshed the patches
---
 debian/changelog                                                      | 4 +++-
 .../patches/0004-split-deploy-webapps-target-from-deploy-target.patch | 4 ++--
 debian/patches/0005-skip-test-failures.patch                          | 2 +-
 debian/patches/0010-debianize-build-xml.patch                         | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a70bfbf..65c6ef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-tomcat8 (8.5.9-3) UNRELEASED; urgency=medium
+tomcat8 (8.5.10-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Recommend Java 8 in /etc/default/tomcat8
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 20 Dec 2016 19:29:17 +0100
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 01b4bae..5f4eb75 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
-@@ -984,7 +984,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"
-@@ -1023,6 +1023,10 @@
+@@ -1030,6 +1030,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index c3bdc1f..e1230d0 100644
--- a/debian/patches/0005-skip-test-failures.patch
+++ b/debian/patches/0005-skip-test-failures.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -1361,8 +1361,10 @@
+@@ -1368,8 +1368,10 @@
        </filterchain>
      </concat>
  
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index c679d72..b56850b 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 @@
+@@ -642,7 +642,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}"
-@@ -987,12 +987,14 @@
+@@ -994,12 +994,14 @@
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
            description="Default. Builds a working Tomcat instance">
  

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