[tomcat8] 03/04: Removed 0001-set-UTF-8-as-default-character-encoding.patch (fixed upstream)

[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 877f785305bc13bddba39355b279e83b4da8bcab
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Sep 19 09:34:06 2016 +0200

    Removed 0001-set-UTF-8-as-default-character-encoding.patch (fixed upstream)
---
 debian/changelog                                             |  1 +
 .../0001-set-UTF-8-as-default-character-encoding.patch       | 12 ------------
 .../0002-do-not-load-AJP13-connector-by-default.patch        |  2 +-
 debian/patches/series                                        |  1 -
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7be68c..02ebfd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ tomcat8 (8.0.37-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+  * Removed 0001-set-UTF-8-as-default-character-encoding.patch (fixed upstream)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 19 Sep 2016 09:20:39 +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
deleted file mode 100644
index ba7e8b4..0000000
--- a/debian/patches/0001-set-UTF-8-as-default-character-encoding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Set UTF-8 as default character encoding
-Author: Thomas Koch <thomas at koch.ro>
---- a/conf/server.xml
-+++ b/conf/server.xml
-@@ -68,6 +68,7 @@
-     -->
-     <Connector port="8080" protocol="HTTP/1.1"
-                connectionTimeout="20000"
-+               URIEncoding="UTF-8"
-                redirectPort="8443" />
-     <!-- A "Connector" using the shared thread pool-->
-     <!--
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 6b6471e..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
-@@ -89,7 +89,9 @@
+@@ -88,7 +88,9 @@
      -->
  
      <!-- Define an AJP 1.3 Connector on port 8009 -->
diff --git a/debian/patches/series b/debian/patches/series
index 1e5dd81..e68024e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-set-UTF-8-as-default-character-encoding.patch
 0002-do-not-load-AJP13-connector-by-default.patch
 0003-disable-APR-library-loading.patch
 0004-split-deploy-webapps-target-from-deploy-target.patch

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