[tomcat8] 02/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 0bf62b0b14dd185354d1c06a5955e2ed44626caf
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 4 10:47:00 2017 +0200

    Refreshed the patches
---
 debian/changelog                                                  | 8 +++++++-
 .../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, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a10073..775f535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
-tomcat8 (8.5.16-2) UNRELEASED; urgency=medium
+tomcat8 (8.5.17-1) UNRELEASED; urgency=medium
 
   * Team upload.
+
+  [ Emmanuel Bourg ]
+  * New upstream release
+    - Refreshed the patches
+
+  [ Miguel Landaeta ]
   * Remove myself from uploaders. (Closes: #871892)
   * Update copyright info.
 
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 099c2cf..a2ed091 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
-@@ -994,7 +994,7 @@
+@@ -995,7 +995,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"
-@@ -1033,6 +1033,10 @@
+@@ -1034,6 +1034,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index 9d6d772..82796b6 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
-@@ -1371,8 +1371,10 @@
+@@ -1372,8 +1372,10 @@
        </filterchain>
      </concat>
  
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 092e0cf..a7d7504 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
-@@ -645,7 +645,7 @@
+@@ -646,7 +646,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}"
-@@ -997,12 +997,14 @@
+@@ -998,12 +998,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