[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 6444822624d78da1bdeea20d05fee3e85526cdb5
Author: tony mancill <tmancill at debian.org>
Date:   Thu Mar 29 22:02:48 2012 -0700

    test with Conflicts

diff --git a/debian/changelog b/debian/changelog
index e118276..95da29f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
-tomcat6 (6.0.35-3) UNRELEASED; urgency=low
+tomcat6 (6.0.35-3) unstable; urgency=low
 
-  * Add Breaks and Replaces clauses to overwrite files in libservlet2.4-java.
-    (Closes: #666256).
+  * 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
 
diff --git a/debian/control b/debian/control
index 301086f..a754886 100644
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,7 @@ 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)
+Conflicts: 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