[SCM] tomcat6 packaging branch, master, updated. debian/6.0.35-2-1-g1f3e537

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 1f3e537b47fd705f2dc662a21c7d90e1f24b607a
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Thu Mar 29 22:49:43 2012 -0430

    Add Breaks and Replaces on libservlet2.4-java

diff --git a/debian/changelog b/debian/changelog
index 9184ae4..e118276 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat6 (6.0.35-3) UNRELEASED; urgency=low
+
+  * Add Breaks and Replaces clauses to overwrite files in libservlet2.4-java.
+    (Closes: #666256).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 29 Mar 2012 22:46:30 -0430
+
 tomcat6 (6.0.35-2) unstable; urgency=low
 
   [ tony mancill ]
diff --git a/debian/control b/debian/control
index 53a4ea8..301086f 100644
--- a/debian/control
+++ b/debian/control
@@ -83,6 +83,8 @@ Description: Servlet and JSP engine -- core libraries
 Package: libservlet2.5-java
 Architecture: all
 Depends: ${misc:Depends}
+Replaces: libservlet2.4-java (<= 5.5.33-1)
+Breaks: libservlet2.4-java (<= 5.5.33-1)
 Description: Servlet 2.5 and JSP 2.1 Java API classes
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Sun Microsystems, and provides a "pure Java" HTTP web

-- 
tomcat6 packaging