[Pkg-telepathy-commits] [SCM] Butterfly packaging branch, debian, updated. debian/0.5.13-1-6-g6832f68

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit 26ee9e8c007cebca7ac43033f4a249e9eaf940c6
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Sep 20 10:41:01 2010 +0200

    debian/control: Use Breaks instead of Conflitcs

diff --git a/debian/changelog b/debian/changelog
index 3c0ca2f..0fee68d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 telepathy-butterfly (0.5.14-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/control: Use Breaks instead of Conflitcs
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 20 Sep 2010 10:07:09 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 20 Sep 2010 10:40:55 +0200
 
 telepathy-butterfly (0.5.13-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 07a0ffd..b093a20 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-butterfly.git
 Package: telepathy-butterfly
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, python-dbus, python-gobject, python-telepathy (>= 0.15.17), python-papyon (>= 0.5.0)
-Conflicts: empathy (<< 2.30)
+Breaks: empathy (<< 2.30)
 XB-Python-Version: ${python:Versions}
 Recommends: python-libproxy (>= 0.3.1)
 Provides: telepathy-connection-manager

-- 
Butterfly packaging