[tomcat8] 02/02: 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 b5ba49791a0638e068836b253063af8d5929c10e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 14 13:39:39 2014 +0200

    Refreshed the patches
---
 debian/changelog                                                      | 4 +++-
 .../patches/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 ++--
 debian/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, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3db8853..5dd4ac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-tomcat8 (8.0.9-2) UNRELEASED; urgency=medium
+tomcat8 (8.0.12-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Refreshed the patches
   * Depend on libecj-java >= 3.10.0 to support the new Java 8 syntax in JSPs
   * Install the missing tomcat-dbcp.jar in libtomcat8-java and use it as
     the default JDBC pool implementation instead of Commons DBCP.
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 652135a..000bd66 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
-@@ -985,7 +985,7 @@
+@@ -988,7 +988,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 @@
+@@ -1026,6 +1026,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index b95da31..f205784 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
-@@ -1326,8 +1326,10 @@
+@@ -1338,8 +1338,10 @@
  
    <target name="test" description="Runs the JUnit test cases"
            depends="test-bio,test-nio,test-nio2,test-apr,cobertura-report" >
@@ -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."
-@@ -1370,7 +1372,7 @@
+@@ -1398,7 +1400,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 4965d39..e4370ba 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
-@@ -636,7 +636,7 @@
+@@ -639,7 +639,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}"
-@@ -988,12 +988,14 @@
+@@ -991,12 +991,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 2ca314b..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
-@@ -515,7 +515,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 c83dc2f..d628e7d 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
-@@ -230,6 +230,7 @@
+@@ -233,6 +233,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