[tomcat8] 03/03: New upstream release (8.0.0-RC3) Refreshed the patches

Mon Sep 30 22:24:58 UTC 2013

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

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

commit 18ee3b28410df47b35e84f8710c3801075c30eab
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Oct 1 00:23:50 2013 +0200

    New upstream release (8.0.0-RC3)
    Refreshed the patches
---
 debian/changelog                                     |    2 +-
 ...it-deploy-webapps-target-from-deploy-target.patch |    4 ++--
 debian/patches/0005-skip-test-failures.patch         |    4 ++--
 debian/patches/0010-debianize-build-xml.patch        |    4 ++--
 ...dont-look-for-build-properties-in-user-home.patch |    2 +-
 debian/patches/0017-use-jdbc-pool-default.patch      |    4 ++--
 debian/patches/0018-fix-manager-webapp.patch         |   18 +++++++++---------
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b152254..59d4f3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
+tomcat8 (8.0.0~RC3-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release (Closes: #722675)
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 3e29b20..6a141c3 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
-@@ -920,7 +920,7 @@
+@@ -931,7 +931,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"
-@@ -958,6 +958,10 @@
+@@ -969,6 +969,10 @@
        </fileset>
      </copy>
  
diff --git a/debian/patches/0005-skip-test-failures.patch b/debian/patches/0005-skip-test-failures.patch
index c7135c3..2a85d55 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
-@@ -1241,8 +1241,10 @@
+@@ -1255,8 +1255,10 @@
  
    <target name="test" description="Runs the JUnit test cases"
            depends="test-bio,test-nio,test-apr" >
@@ -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."
-@@ -1278,7 +1280,7 @@
+@@ -1292,7 +1294,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 9152a72..7f2ee2d 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
-@@ -598,7 +598,7 @@
+@@ -603,7 +603,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}"
-@@ -923,12 +923,14 @@
+@@ -934,12 +934,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 03d2d5b..8c81afe 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
-@@ -470,7 +470,6 @@
+@@ -475,7 +475,6 @@
      <!-- Property that determines if manifests need updating -->
      <uptodate property="manifests.uptodate"
          targetfile="${tomcat.manifests}/default.manifest" >
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
index ab18dbc..f45f147 100644
--- a/debian/patches/0017-use-jdbc-pool-default.patch
+++ b/debian/patches/0017-use-jdbc-pool-default.patch
@@ -22,7 +22,7 @@ Forwarded: not-needed
          Package + ".OpenEjbFactory";
 --- a/webapps/docs/config/systemprops.xml
 +++ b/webapps/docs/config/systemprops.xml
-@@ -595,9 +595,7 @@
+@@ -587,9 +587,7 @@
      <property name="javax.sql.DataSource.Factory">
        <p>The class name of the factory to use to create resources of type
        <code>javax.sql.DataSource</code>. If not specified the default of
@@ -35,7 +35,7 @@ Forwarded: not-needed
      <property name="javax.mail.Session.Factory">
 --- a/webapps/docs/jndi-resources-howto.xml
 +++ b/webapps/docs/jndi-resources-howto.xml
-@@ -684,7 +684,7 @@
+@@ -658,7 +658,7 @@
  
      <p>The configuration properties for Tomcat's standard data source
      resource factory
diff --git a/debian/patches/0018-fix-manager-webapp.patch b/debian/patches/0018-fix-manager-webapp.patch
index 59931a7..78ef7a6 100644
--- a/debian/patches/0018-fix-manager-webapp.patch
+++ b/debian/patches/0018-fix-manager-webapp.patch
@@ -17,18 +17,18 @@ Last-Update: 2013-08-01
  </Context>
 --- a/webapps/docs/manager-howto.xml
 +++ b/webapps/docs/manager-howto.xml
-@@ -72,7 +72,7 @@
+@@ -71,7 +71,7 @@
+ <code>$CATALINA_BASE/conf/[enginename]/[hostname]</code> folder. Here is an
  example:</p>
- <pre>
- <Context privileged="true" antiResourceLocking="false"
--         docBase="${catalina.home}/webapps/manager">
-+         docBase="${catalina.home}/../tomcat8-admin/manager">
-   <Valve className="org.apache.catalina.valves.RemoteAddrValve"
-          allow="127\.0\.0\.1" />
- </Context>
+ <source><![CDATA[<Context privileged="true" antiResourceLocking="false"
+-         docBase="${catalina.home}/webapps/manager">
++         docBase="${catalina.home}/../tomcat8-admin/manager">
+   <Valve className="org.apache.catalina.valves.RemoteAddrValve"
+          allow="127\.0\.0\.1" />
+ </Context>]]></source>
 --- a/conf/catalina.policy
 +++ b/conf/catalina.policy
-@@ -196,14 +196,14 @@
+@@ -202,14 +202,14 @@
  // - default CATALINA_HOME == CATALINA_BASE
  // - CATALINA_HOME != CATALINA_BASE, per instance Manager in CATALINA_BASE
  // - CATALINA_HOME != CATALINA_BASE, shared Manager in CATALINA_HOME

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

