[tomcat8] 02/03: New upstream release (8.0.9) 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 18af9e1e2178d6e07778055f18b33c4a9d969ca9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 24 21:27:42 2014 +0200

    New upstream release (8.0.9)
    Refreshed the patches
---
 debian/changelog                                                  | 4 +++-
 .../0004-split-deploy-webapps-target-from-deploy-target.patch     | 8 ++++----
 debian/patches/0005-skip-test-failures.patch                      | 4 ++--
 debian/patches/0010-debianize-build-xml.patch                     | 6 +++---
 .../0013-dont-look-for-build-properties-in-user-home.patch        | 2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a68fe6b..5c27d03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-tomcat8 (8.0.8-2) UNRELEASED; urgency=medium
+tomcat8 (8.0.9-1) UNRELEASED; urgency=medium
 
   [ Emmanuel Bourg ]
+  * New upstream release
+    - Refreshed the patches
   * Search for OpenJDK 8 and Oracle JDKs when starting the server
   * Removed the dependency on the non existent java-7-runtime package
   * Fixed a link still pointing to the Tomcat 7 documentation in README.Debian
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 8c5674f..652135a 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,16 +3,16 @@ 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 @@
+@@ -985,7 +985,7 @@
      </xslt>
    </target>
  
--  <target name="deploy" depends="package,build-docs,build-tomcat-jdbc"
-+  <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,deploy-webapps"
+-  <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
++  <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples,deploy-webapps"
            description="Default. Builds a working Tomcat instance">
  
      <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-@@ -1022,6 +1022,10 @@
+@@ -1023,6 +1023,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index db96dd4..b95da31 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
-@@ -1318,8 +1318,10 @@
+@@ -1326,8 +1326,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."
-@@ -1362,7 +1364,7 @@
+@@ -1370,7 +1372,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 1fe6c7f..4965d39 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 @@
+@@ -636,7 +636,7 @@
      </copy>
    </target>
  
@@ -14,8 +14,8 @@ Last-Update: 2011-05-16
      <!-- Compile internal server components -->
      <javac srcdir="java" destdir="${tomcat.classes}"
             debug="${compile.debug}"
-@@ -987,12 +987,14 @@
-   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,deploy-webapps"
+@@ -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 3d73d85..2ca314b 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
-@@ -514,7 +514,6 @@
+@@ -515,7 +515,6 @@
      <!-- Property that determines if manifests need updating -->
      <uptodate property="manifests.uptodate"
          targetfile="${tomcat.manifests}/default.manifest" >

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