[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.31.2-2-15-g927e880

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit c9d189c9e471aee5603447ba052e0ee5f225de22
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Jul 7 23:43:09 2010 +0200

    debian/control: Use Breaks instead of Conflicts

diff --git a/debian/changelog b/debian/changelog
index b912749..3355b36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,10 @@ empathy (2.31.4-1) UNRELEASED; urgency=low
   * New upstream release
     - debian/control: Adjust build-dependencies
   * Bump Standards-Version to 3.9.0 (no further changes)
+    - debian/control: Use Breaks instead of Conflicts
   * debian/empathy.install: Install dconf schema instead of the gconf one
 
- -- Laurent Bigonville <bigon at debian.org>  Wed, 07 Jul 2010 23:28:01 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 07 Jul 2010 23:40:44 +0200
 
 empathy (2.30.1.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6fe7d67..3dd00f2 100644
--- a/debian/control
+++ b/debian/control
@@ -112,7 +112,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, empathy-common (= ${source:Version})
 Recommends: nautilus-sendto (>= 2.28.2-2)
 Replaces: nautilus-sendto (<< 2.28.2-2)
-Conflicts: nautilus-sendto (<< 2.28.2-2)
+Breaks: nautilus-sendto (<< 2.28.2-2)
 Description: GNOME multi-protocol chat and call client (nautilus-sendto plugin)
  Instant messaging program supporting text, voice, video, file transfers
  and inter-application communication over many different protocols,

-- 
Empathy packaging