[Pkg-telepathy-commits] [SCM] MC 5 packaging branch, debian, updated. debian/5.2.0-1-3-g7d790a4

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit 37d262c68dc929bf8c6a5d63989fcf9fa41634ff
Author: Jonny Lamb <jonny at debian.org>
Date:   Wed Aug 26 12:53:45 2009 +0100

    debian/control: Added conflicts on telepathy-mission-control.
    
    Signed-off-by: Jonny Lamb <jonny at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 175ad20..12358cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 telepathy-mission-control-5 (5.2.0-2) UNRELEASED; urgency=low
 
-  * debian/control: Added myself to Uploaders.
+  * debian/control:
+    + Added myself to Uploaders.
+    + Added conflicts on telepathy-mission-control.
 
- -- Jonny Lamb <jonny at debian.org>  Wed, 26 Aug 2009 12:52:51 +0100
+ -- Jonny Lamb <jonny at debian.org>  Wed, 26 Aug 2009 12:53:20 +0100
 
 telepathy-mission-control-5 (5.2.0-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 8b7f508..5ccd0ff 100644
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,7 @@ Homepage: http://telepathy.freedesktop.org/wiki/
 Package: telepathy-mission-control-5
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: telepathy-mission-control
 Description: management daemon for Telepathy real-time communication framework
  Telepathy Mission Control 5 is an account manager and channel dispatcher for
  the Telepathy framework, allowing user interfaces and other clients

-- 
MC 5 packaging