[pkg-java] r8317 - in trunk/tomcat6/debian: . patches

[Torsten Werner]

Author: twerner
Date: 2009-06-05 21:43:24 +0000 (Fri, 05 Jun 2009)
New Revision: 8317

Removed:
   trunk/tomcat6/debian/patches/tcnative-ipv6-fix-43327.patch
Modified:
   trunk/tomcat6/debian/changelog
   trunk/tomcat6/debian/patches/deploy-webapps-build-xml.patch
   trunk/tomcat6/debian/patches/series
Log:
* new upstream release (Closes: #531873)
* Remove patch tcnative-ipv6-fix-43327.patch that has been applied upstream.
* Refresh other patches.

Modified: trunk/tomcat6/debian/changelog
===================================================================
--- trunk/tomcat6/debian/changelog	2009-06-05 21:24:03 UTC (rev 8316)
+++ trunk/tomcat6/debian/changelog	2009-06-05 21:43:24 UTC (rev 8317)
@@ -1,3 +1,11 @@
+tomcat6 (6.0.20-1) unstable; urgency=low
+
+  * new upstream release (Closes: #531873)
+  * Remove patch tcnative-ipv6-fix-43327.patch that has been applied upstream.
+  * Refresh other patches.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 05 Jun 2009 23:38:44 +0200
+
 tomcat6 (6.0.18-dfsg1-1) unstable; urgency=low
 
   [ Torsten Werner ]

Modified: trunk/tomcat6/debian/patches/deploy-webapps-build-xml.patch
===================================================================
--- trunk/tomcat6/debian/patches/deploy-webapps-build-xml.patch	2009-06-05 21:24:03 UTC (rev 8316)
+++ trunk/tomcat6/debian/patches/deploy-webapps-build-xml.patch	2009-06-05 21:43:24 UTC (rev 8317)
@@ -1,17 +1,17 @@
-Index: apache-tomcat-6.0.18-src/build.xml
+Index: tomcat6-6.0.20/build.xml
 ===================================================================
---- apache-tomcat-6.0.18-src.orig/build.xml	2008-07-22 02:01:29.000000000 +0200
-+++ apache-tomcat-6.0.18-src/build.xml	2008-08-21 12:16:57.000000000 +0200
-@@ -465,7 +465,7 @@
- 
+--- tomcat6-6.0.20.orig/build.xml	2009-05-14 01:15:28.000000000 +0200
++++ tomcat6-6.0.20/build.xml	2009-06-05 23:35:46.000000000 +0200
+@@ -437,7 +437,7 @@
+     building a tomcat release.</echo>
    </target>
+   
+-  <target name="deploy" depends="build-only,build-docs,warn.dbcp">
++  <target name="deploy" depends="build-only,build-docs,warn.dbcp,deploy-webapps">
  
--  <target name="deploy" depends="build-only,build-docs">
-+  <target name="deploy" depends="build-only,build-docs,deploy-webapps">
- 
      <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
              file="${tomcat-native.tar.gz}" />
-@@ -489,6 +489,13 @@
+@@ -463,6 +463,13 @@
        </fileset>
      </copy>
  
@@ -25,13 +25,14 @@
      <!-- Copy other regular webapps -->
      <copy todir="${tomcat.build}/webapps">
        <fileset dir="webapps">
-@@ -598,9 +605,6 @@
+@@ -576,10 +583,6 @@
        </fileset>
      </txt2html>
  
--  	<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" />
+-    <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" 
+-      failonerror="false"/>
 -    <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" />
 -
    </target>
- 	
+ 
    <target name="clean-depend"

Modified: trunk/tomcat6/debian/patches/series
===================================================================
--- trunk/tomcat6/debian/patches/series	2009-06-05 21:24:03 UTC (rev 8316)
+++ trunk/tomcat6/debian/patches/series	2009-06-05 21:43:24 UTC (rev 8317)
@@ -2,4 +2,3 @@
 disable-apr-loading.patch
 deploy-webapps-build-xml.patch
 use-commons-dbcp.patch
-tcnative-ipv6-fix-43327.patch

Deleted: trunk/tomcat6/debian/patches/tcnative-ipv6-fix-43327.patch
===================================================================
--- trunk/tomcat6/debian/patches/tcnative-ipv6-fix-43327.patch	2009-06-05 21:24:03 UTC (rev 8316)
+++ trunk/tomcat6/debian/patches/tcnative-ipv6-fix-43327.patch	2009-06-05 21:43:24 UTC (rev 8317)
@@ -1,15 +0,0 @@
-Index: tomcat6-6.0.18/java/org/apache/tomcat/util/net/AprEndpoint.java
-===================================================================
---- tomcat6-6.0.18.orig/java/org/apache/tomcat/util/net/AprEndpoint.java	2009-02-16 16:05:35.000000000 +0000
-+++ tomcat6-6.0.18/java/org/apache/tomcat/util/net/AprEndpoint.java	2009-02-16 16:06:38.000000000 +0000
-@@ -599,8 +599,8 @@
-         long inetAddress = Address.info(addressStr, family,
-                 port, 0, rootPool);
-         // Create the APR server socket
--        serverSock = Socket.create(family, Socket.SOCK_STREAM,
--                Socket.APR_PROTO_TCP, rootPool);
-+        serverSock = Socket.create(Address.getInfo(inetAddress).family,
-+                Socket.SOCK_STREAM, Socket.APR_PROTO_TCP, rootPool);
-         if (OS.IS_UNIX) {
-             Socket.optSet(serverSock, Socket.APR_SO_REUSEADDR, 1);
-         }