[Pkg-mongodb-maintainers] [pkg-mongodb] 37/394: added conflicts with mongodb-1.2

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository pkg-mongodb.

commit 01ba71576763796426441f478f65b5a6d74a1406
Author: Antonin Kral <a.kral at bobek.cz>
Date:   Wed Feb 17 11:56:03 2010 +0100

    added conflicts with mongodb-1.2
---
 debian/changelog | 7 +++++++
 debian/control   | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7a0f275..34d3d1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mongodb (1.3.1-4) unstable; urgency=low
+
+  * added conflicts with mongodb-1.2
+    Please refer to Bug #570148 for clarification.
+
+ -- Antonin Kral <A.Kral at sh.cvut.cz>  Wed, 17 Feb 2010 11:54:37 +0100
+
 mongodb (1.3.1-3) unstable; urgency=low
 
   * [ff792f5] Reordered Build-Depends to enable automated with buildd
diff --git a/debian/control b/debian/control
index 53f42af..93befec 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,8 @@ Homepage: http://www.mongodb.org
 
 Package: mongodb
 Architecture: i386 amd64
+Replaces: mongodb-1.2
+Conflicts: mongodb-1.2
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, xulrunner-dev
 Description: An object/document-oriented database
  MongoDB is a high-performance, open source, schema-free 

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