[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.39-1-3-g34eaec6

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 34eaec62f4b272f5a1c48fa04f788412ec45d099
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Fri May 10 20:33:21 2013 -0300

    Prepare release 7.0.40-1

diff --git a/debian/changelog b/debian/changelog
index 7968631..db05b17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat7 (7.0.40-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Refresh patches:
+    - 0015_disable_test_TestCometProcessor.patch
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Fri, 10 May 2013 19:10:36 -0300
+
 tomcat7 (7.0.39-1) unstable; urgency=low
 
   * Upload to unstable for jessie release cycle.
diff --git a/debian/patches/0015_disable_test_TestCometProcessor.patch b/debian/patches/0015_disable_test_TestCometProcessor.patch
index c42570a..5fa28f6 100644
--- a/debian/patches/0015_disable_test_TestCometProcessor.patch
+++ b/debian/patches/0015_disable_test_TestCometProcessor.patch
@@ -1,14 +1,14 @@
 --- a/test/org/apache/catalina/comet/TestCometProcessor.java
 +++ b/test/org/apache/catalina/comet/TestCometProcessor.java
-@@ -29,6 +29,7 @@
- import javax.servlet.http.HttpSession;
+@@ -34,6 +34,7 @@ import static org.junit.Assert.fail;
  
- import junit.framework.Assert;
+ import org.junit.Assert;
+ import org.junit.Test;
 +import org.junit.Ignore;
  
- import static org.junit.Assert.assertEquals;
- import static org.junit.Assert.assertTrue;
-@@ -192,6 +193,7 @@
+ import org.apache.catalina.Context;
+ import org.apache.catalina.Wrapper;
+@@ -191,6 +192,7 @@ public class TestCometProcessor extends
      }
  
      @Test

-- 
tomcat7: Servlet and JSP engine