[tomcat8] 02/06: Refreshed the patches

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Apr 29 09:29:08 UTC 2014 

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 53cf70b8226c898914d2a486627117fd80142603
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 29 09:58:00 2014 +0200

    Refreshed the patches
---
 debian/changelog                                               |  7 +++++++
 .../patches/0002-do-not-load-AJP13-connector-by-default.patch  |  2 +-
 .../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 ++--
 .../0013-dont-look-for-build-properties-in-user-home.patch     |  2 +-
 debian/patches/0015_disable_test_TestCometProcessor.patch      | 10 +++++-----
 debian/patches/0019-add-distribution-to-error-page.patch       |  2 +-
 8 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8045bb4..260cdf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat8 (8.0.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 19 Mar 2014 22:39:42 +0100
+
 tomcat8 (8.0.3-1) unstable; urgency=medium
 
   [ Emmanuel Bourg ]
diff --git a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch
index fceffe1..888a4c7 100644
--- a/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch
+++ b/debian/patches/0002-do-not-load-AJP13-connector-by-default.patch
@@ -2,7 +2,7 @@ Description: Do not load AJP13 connector by default
 Author: Thierry Carrez <thierry.carrez at ubuntu.com>
 --- a/conf/server.xml
 +++ b/conf/server.xml
-@@ -87,7 +87,9 @@
+@@ -88,7 +88,9 @@
      -->
  
      <!-- Define an AJP 1.3 Connector on port 8009 -->
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 33ceb01..e3dad0e 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
-@@ -973,7 +973,7 @@
+@@ -986,7 +986,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"
-@@ -1011,6 +1011,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 d1c55b0..12387d4 100644
--- a/debian/patches/0005-skip-test-failures.patch
+++ b/debian/patches/0005-skip-test-failures.patch
@@ -3,10 +3,10 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -1312,8 +1312,10 @@
+@@ -1322,8 +1322,10 @@
  
    <target name="test" description="Runs the JUnit test cases"
-           depends="test-bio,test-nio,test-apr,cobertura-report" >
+           depends="test-bio,test-nio,test-nio2,test-apr,cobertura-report" >
 +    <!--
      <fail if="test.result.error" message='Some tests completed with an Error. See ${tomcat.build}/logs for details, search for "FAILED".' />
      <fail if="test.result.failure" message='Some tests completed with a Failure. See ${tomcat.build}/logs for details, search for "FAILED".' />
@@ -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."
-@@ -1349,7 +1351,7 @@
+@@ -1365,7 +1367,7 @@
                 description="The extension to use to distinguish the output"/>
  
      <sequential>
diff --git a/debian/patches/0010-debianize-build-xml.patch b/debian/patches/0010-debianize-build-xml.patch
index ca56aaa..7f15298 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
-@@ -628,7 +628,7 @@
+@@ -642,7 +642,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}"
-@@ -976,12 +976,14 @@
+@@ -989,12 +989,14 @@
    <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,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 46bb139..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
-@@ -500,7 +500,6 @@
+@@ -515,7 +515,6 @@
      <!-- Property that determines if manifests need updating -->
      <uptodate property="manifests.uptodate"
          targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0015_disable_test_TestCometProcessor.patch b/debian/patches/0015_disable_test_TestCometProcessor.patch
index 48281c2..f39fc16 100644
--- a/debian/patches/0015_disable_test_TestCometProcessor.patch
+++ b/debian/patches/0015_disable_test_TestCometProcessor.patch
@@ -2,19 +2,19 @@ Description: Disables TestCometProcessor.testConnectionClose()
 Author: tony mancill <tmancill at debian.org>
 --- a/test/org/apache/catalina/comet/TestCometProcessor.java
 +++ b/test/org/apache/catalina/comet/TestCometProcessor.java
-@@ -34,6 +34,7 @@
- 
+@@ -35,6 +35,7 @@
  import org.junit.Assert;
+ import org.junit.Assume;
  import org.junit.Test;
 +import org.junit.Ignore;
  
  import org.apache.catalina.Context;
  import org.apache.catalina.Wrapper;
-@@ -191,6 +192,7 @@
+@@ -188,6 +189,7 @@
      }
  
      @Test
 +    @Ignore("fails consistently on Debian/Linux")
      public void testConnectionClose() throws Exception {
- 
-         if (!isCometSupported()) {
+         Assume.assumeTrue(
+                 "This test is skipped, because this connector does not support Comet.",
diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch
index 6fae3fc..0feb9bb 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
-@@ -229,6 +229,7 @@
+@@ -232,6 +232,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

More information about the pkg-java-commits mailing list