[plexus-containers] 14/35: Add versioned Conflicts: libplexus-container-default-java. (Closes: #542055)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master-1.0
in repository plexus-containers.

commit bac38662d18947d1b63d29f419eccd93bed54f13
Author: Torsten Werner <twerner at debian.org>
Date:   Mon Aug 17 18:21:22 2009 +0000

    Add versioned Conflicts: libplexus-container-default-java. (Closes:
    #542055)
---
 debian/changelog | 7 +++++++
 debian/control   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0036092..58e0d32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plexus-containers (1.0~beta3.0.7-3) unstable; urgency=low
+
+  * Add versioned Conflicts: libplexus-container-default-java. (Closes:
+    #542055)
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 17 Aug 2009 20:14:42 +0200
+
 plexus-containers (1.0~beta3.0.7-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 86d6d7b..accbc38 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Package: libplexus-containers-java
 Architecture: all
 Depends: ${misc:Depends}, libgoogle-collections-java,
  libplexus-classworlds-java, libplexus-utils-java, libxbean-java
+Conflicts: libplexus-container-default-java (<= 1.0-alpha-9-stable-1-2)
 Description: utilities for the Plexus framework
  The Plexus project provides a full software stack for creating and executing
  software projects. Based on the Plexus container, the applications can

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