[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 065564adeb43783557ac72e10e6b6297352403e9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 29 13:22:46 2014 +0200

    Refreshed the patches
---
 debian/changelog                                                      | 4 +++-
 debian/patches/0001-set-UTF-8-as-default-character-encoding.patch     | 2 +-
 debian/patches/0002-do-not-load-AJP13-connector-by-default.patch      | 2 +-
 debian/patches/0003-disable-APR-library-loading.patch                 | 2 +-
 .../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 +-
 8 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 34d5775..7f22501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-tomcat8 (8.0.12-2) UNRELEASED; urgency=medium
+tomcat8 (8.0.14-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Refreshed the patches
   * Build depend on libcglib3-java instead of libcglib-java
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 29 Sep 2014 12:41:52 +0200
diff --git a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
index 7cbdc8a..ba7e8b4 100644
--- a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
+++ b/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
@@ -2,7 +2,7 @@ Description: Set UTF-8 as default character encoding
 Author: Thomas Koch <thomas at koch.ro>
 --- a/conf/server.xml
 +++ b/conf/server.xml
-@@ -67,6 +67,7 @@
+@@ -68,6 +68,7 @@
      -->
      <Connector port="8080" protocol="HTTP/1.1"
                 connectionTimeout="20000"
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 888a4c7..6b6471e 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
-@@ -88,7 +88,9 @@
+@@ -89,7 +89,9 @@
      -->
  
      <!-- Define an AJP 1.3 Connector on port 8009 -->
diff --git a/debian/patches/0003-disable-APR-library-loading.patch b/debian/patches/0003-disable-APR-library-loading.patch
index fd18f6f..658fbba 100644
--- a/debian/patches/0003-disable-APR-library-loading.patch
+++ b/debian/patches/0003-disable-APR-library-loading.patch
@@ -2,7 +2,7 @@ Description: Disables APR library loading until we properly provide it.
 Author: Thierry Carrez <thierry.carrez at ubuntu.com>
 --- a/conf/server.xml
 +++ b/conf/server.xml
-@@ -24,7 +24,9 @@
+@@ -25,7 +25,9 @@
    <Listener className="org.apache.catalina.security.SecurityListener" />
    -->
    <!--APR library loader. Documentation at /docs/apr.html -->
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 000bd66..9e42dd1 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
-@@ -988,7 +988,7 @@
+@@ -989,7 +989,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"
-@@ -1026,6 +1026,10 @@
+@@ -1027,6 +1027,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index f205784..4324b72 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
-@@ -1338,8 +1338,10 @@
+@@ -1339,8 +1339,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."
-@@ -1398,7 +1400,7 @@
+@@ -1399,7 +1401,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 e4370ba..5679976 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
-@@ -639,7 +639,7 @@
+@@ -640,7 +640,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}"
-@@ -991,12 +991,14 @@
+@@ -992,12 +992,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 1ab43bf..7743212 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
-@@ -518,7 +518,6 @@
+@@ -519,7 +519,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