[tomcat8] 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 tomcat8.

commit fa04b4e08ae456be9f156fe71e952f56c02eeabe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Dec 18 09:49:07 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index b0ac240..4e4ddda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat8 (8.0.30-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 18 Dec 2015 09:48:39 +0100
+
 tomcat8 (8.0.28-1) unstable; 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 d379de1..0691178 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 @@
+@@ -985,7 +985,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 @@
+@@ -1024,6 +1024,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index 63cb716..dce102c 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 @@
+@@ -1368,8 +1368,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 @@
+@@ -1428,7 +1430,7 @@
  
      <sequential>
        <mkdir dir="${test.reports}" />
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index 0d4b9e2..40af512 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 @@
+@@ -643,7 +643,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 @@
+@@ -988,12 +988,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..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
-@@ -513,7 +513,6 @@
+@@ -518,7 +518,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 7d83ee1..2a2596a 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
-@@ -231,6 +231,7 @@
+@@ -236,6 +236,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