[SCM] tomcat6 packaging branch, master, updated. debian/6.0.35-2-7-g2cfc46b

[tony mancill]

The following commit has been merged in the master branch:
commit 50030567461fca10c85e601b87994afcbe4da874
Author: tony mancill <tmancill at debian.org>
Date:   Thu Apr 12 08:06:24 2012 -0700

    add dummy transitional package

diff --git a/debian/control b/debian/control
index a754886..7c15fac 100644
--- a/debian/control
+++ b/debian/control
@@ -80,6 +80,16 @@ Description: Servlet and JSP engine -- core libraries
  This package contains the Tomcat core classes which can be used by other
  Java applications to embed Tomcat.
 
+Package: libservlet2.4-java
+Architecture: all
+Depends: ${misc:Depends}
+Replaces: libservlet2.4-java (<= 5.5.33-1)
+Conflicts: libservlet2.4-java (<= 5.5.33-1)
+Description: Transitional package for libservlet2.5-java
+ This is a transitional package to facilitate upgrading from
+ libservlet2.4-java to libservlet2.5-java, and can be safely
+ removed after the installation is complete.
+
 Package: libservlet2.5-java
 Architecture: all
 Depends: ${misc:Depends}

-- 
tomcat6 packaging