[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 cd7dd8417f3cdfd4a5d583ef48b8ba4224e08b65
Author: tony mancill <tmancill at debian.org>
Date:   Thu Apr 12 08:11:38 2012 -0700

    add dummy transitional package; take 2

diff --git a/debian/changelog b/debian/changelog
index 95da29f..687525c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 tomcat6 (6.0.35-3) unstable; urgency=low
 
+  [ Miguel Landaeta ]
   * Add Replaces and Conflicts for libservlet2.5-java to overwrite files
     in libservlet2.4-java.  (Closes: #666256).
 
- -- Miguel Landaeta <miguel at miguel.cc>  Thu, 29 Mar 2012 22:46:30 -0430
+  [ tony mancill ]
+  * Add libservlet2.4-java transitional package.
+
+ -- tony mancill <tmancill at debian.org>  Thu, 12 Apr 2012 08:10:57 -0700
 
 tomcat6 (6.0.35-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7c15fac..acf7a4d 100644
--- a/debian/control
+++ b/debian/control
@@ -82,9 +82,7 @@ Description: Servlet and JSP engine -- core libraries
 
 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)
+Depends: ${misc:Depends}, libservlet2.5-java
 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

-- 
tomcat6 packaging