[SCM] tomcat6 packaging branch, squeeze-security, updated. debian/6.0.35-1-3-g4ab53f3

[tony mancill]

The following commit has been merged in the squeeze-security branch:
commit 4ab53f3cfebd05bcae1d7f86c646eec013eeee61
Author: tony mancill <tmancill at debian.org>
Date:   Thu Jan 19 12:16:47 2012 -0800

    prepare security upload; remove tomcat6-extras

diff --git a/debian/changelog b/debian/changelog
index d769eab..98fed24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 tomcat6 (6.0.35-1+squeeze1) stable-security; urgency=high
 
   * Upload to stable security for CVE-2011-4858, among others.
+  * Adjust d/control to more closely match squeeze:
+    - remove tomcat6-extras binary package (would be NEW in squeeze)
+    - remove JRE from tomcat6-common Depends
 
- -- tony mancill <tmancill at debian.org>  Thu, 05 Jan 2012 11:08:57 -0800
+ -- tony mancill <tmancill at debian.org>  Thu, 19 Jan 2012 12:16:17 -0800
 
 tomcat6 (6.0.35-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 293b36e..bd92a35 100644
--- a/debian/control
+++ b/debian/control
@@ -130,14 +130,3 @@ Description: Servlet and JSP engine -- documentation
  server environment for Java code to run.
  .
  This package contains the online documentation web application.
-
-Package: tomcat6-extras
-Architecture: all
-Depends: tomcat6-common (>= ${source:Version}), ${misc:Depends}
-Description: Servlet and JSP engine -- additional components
- Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
- specifications from Sun Microsystems, and provides a "pure Java" HTTP web
- server environment for Java code to run.
- .
- This package contains additional ("extra") component libraries.
- (Currently only catalina-jmx-remote.jar.)

-- 
tomcat6 packaging