[Pkg-telepathy-commits] [SCM] Butterfly packaging branch, debian, updated. debian/0.5.6-1-17-geefb2f3

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit d0eee9a3d26e7240e3a1cc7d32fd29aa2c018069
Author: Jonny Lamb <jonny at debian.org>
Date:   Sun Apr 4 00:04:18 2010 +0100

    debian/control: Added a conflicts on empathy << 2.30 due to the removal of network IDs from contact IDs.

diff --git a/debian/changelog b/debian/changelog
index c1df409..d996960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,12 @@ telepathy-butterfly (0.5.7-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/copyright: Updated.
   * debian/rules: Updated now that butterfly uses autoconf and automake.
-  * debian/control: Upped Standards-Version. (no changes)
+  * debian/control:
+    + Upped Standards-Version. (no changes)
+    + Added a conflicts on empathy << 2.30 due to the removal of network
+      IDs from contact IDs.
 
- -- Jonny Lamb <jonny at debian.org>  Sat, 03 Apr 2010 23:59:53 +0100
+ -- Jonny Lamb <jonny at debian.org>  Sun, 04 Apr 2010 00:03:09 +0100
 
 telepathy-butterfly (0.5.6-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c292f35..454782a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +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.4.2)
+Conflicts: empathy (<< 2.30)
 XB-Python-Version: ${python:Versions}
 Provides: telepathy-connection-manager
 Description: MSN connection manager for Telepathy

-- 
Butterfly packaging