[tomcat8] 04/05: Marked libtomcat8-java as conflicting with libtomcat7-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat8.

commit 8361bcce65f1b9037bfec58eb1bb76e20492d498
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 13 00:03:28 2013 +0200

    Marked libtomcat8-java as conflicting with libtomcat7-java
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fbe3981..34064df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
     - Updated the watch file to match the Tomcat 8 releases
     - Refreshed the patches
     - Updated debian/copyright
+  * Marked libtomcat8-java as conflicting with libtomcat7-java
   * Use XZ compression for the upstream tarball
   * Replaced Sun Microsystems with Oracle
 
diff --git a/debian/control b/debian/control
index afae2c3..1e388f7 100644
--- a/debian/control
+++ b/debian/control
@@ -70,7 +70,7 @@ Depends: libecj-java,
          libcommons-pool-java,
          libcommons-dbcp-java,
          libservlet3.1-java (>= ${source:Version}), ${misc:Depends}
-Conflicts: libtomcat6-java
+Conflicts: libtomcat6-java, libtomcat7-java
 Suggests: tomcat8 (>= ${source:Version})
 Description: Servlet and JSP engine -- core libraries
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git