[tomcat8] 02/03: 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 5ce1a7cc61e58539826eb787e77193698299c512
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Aug 24 00:24:33 2015 +0200

    Refreshed the patches
---
 debian/changelog                                                    | 4 +++-
 .../0004-split-deploy-webapps-target-from-deploy-target.patch       | 4 ++--
 debian/patches/0005-skip-test-failures.patch                        | 6 +++---
 debian/patches/0010-debianize-build-xml.patch                       | 4 ++--
 .../patches/0013-dont-look-for-build-properties-in-user-home.patch  | 2 +-
 debian/patches/0019-add-distribution-to-error-page.patch            | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00d1989..9ecc8e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-tomcat8 (8.0.24-2) UNRELEASED; urgency=medium
+tomcat8 (8.0.26-1) UNRELEASED; urgency=medium
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
   * Changed the authbind configuration to allow IPv6 connections (LP: #1443041)
   * Fixed an upgrade error when /etc/tomcat8/tomcat-users.xml is removed
     (LP: #1010791)
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 d379de1..ae1e4a5 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
-@@ -980,7 +980,7 @@
+@@ -977,7 +977,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"
-@@ -1019,6 +1019,10 @@
+@@ -1016,6 +1016,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index 80a9fa5..cac1b38 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
-@@ -1363,8 +1363,10 @@
+@@ -1360,8 +1360,10 @@
        </filterchain>
      </concat>
  
@@ -14,7 +14,7 @@ Forwarded: not-needed
    </target>
  
    <target name="test-bio" description="Runs the JUnit test cases for BIO. Does not stop on errors."
-@@ -1423,7 +1425,7 @@
+@@ -1420,7 +1422,7 @@
  
      <sequential>
        <mkdir dir="${test.reports}" />
@@ -22,4 +22,4 @@ Forwarded: not-needed
 +      <junit printsummary="yes" fork="yes" dir="." showoutput="no"
          errorproperty="test.result.error"
          failureproperty="test.result.failure"
-         haltonfailure="${test.haltonfailure}" >
+         haltonfailure="${test.haltonfailure}"
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 0d4b9e2..5d9fb80 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
-@@ -638,7 +638,7 @@
+@@ -635,7 +635,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}"
-@@ -983,12 +983,14 @@
+@@ -980,12 +980,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 171adc0..6bebe7b 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
-@@ -513,7 +513,6 @@
+@@ -510,7 +510,6 @@
      <!-- Property that determines if manifests need updating -->
      <uptodate property="manifests.uptodate"
          targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch
index c35d22d..a01d2b9 100644
--- a/debian/patches/0019-add-distribution-to-error-page.patch
+++ b/debian/patches/0019-add-distribution-to-error-page.patch
@@ -16,7 +16,7 @@ Bug-Debian: http://bugs.debian.org/729840
 \ No newline at end of file
 --- a/build.xml
 +++ b/build.xml
-@@ -232,6 +232,7 @@
+@@ -229,6 +229,7 @@
      <filter token="YEAR" value="${year}"/>
      <filter token="VERSION" value="${version}"/>
      <filter token="VERSION_NUMBER" value="${version.number}"/>

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