[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian-squeeze, updated. debian/2.30.2-1-6-gc645e4c

[Laurent Bigonville]

The following commit has been merged in the debian-squeeze branch:
commit 8108bb76d3968a1dbab56a2604db2aa2c16d0897
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Oct 11 14:33:21 2010 +0200

    Use Breaks instead of Conflicts (per policy §7.4)

diff --git a/debian/changelog b/debian/changelog
index 57823ff..5657f82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 empathy (2.30.3-1) UNRELEASED; urgency=low
 
   * New upstream release
-  * debian/control: Bump Standards-Version to 3.9.1
+  * debian/control:
+    - Bump Standards-Version to 3.9.1
+    - Use Breaks instead of Conflicts (per policy §7.4)
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 11 Oct 2010 13:26:19 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 11 Oct 2010 14:04:04 +0200
 
 empathy (2.30.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6ec1c70..22182fc 100644
--- a/debian/control
+++ b/debian/control
@@ -110,7 +110,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