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

[Jonny Lamb]

The following commit has been merged in the debian-squeeze branch:
commit f26097a712d5dbb102a1f657e14f696e0dbd1f09
Author: Jonny Lamb <jonny at debian.org>
Date:   Mon Sep 28 19:27:41 2009 +0100

    debian/control: Add Conflicts and Replaces fields to libempathy{30,-gtk28} packages to make upgrades easier. Thanks to Andres Salomon <dilinger at collabora.co.uk> for the "patch". (Closes: #548779)

diff --git a/debian/changelog b/debian/changelog
index cb62e00..f91228d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 empathy (2.28.0.1-2) UNRELEASED; urgency=low
 
   * Add libempathy30-dbg, libempathy-gtk28-dbg and empathy-dbg packages.
+  * debian/control: Add Conflicts and Replaces fields to
+    libempathy{30,-gtk28} packages to make upgrades easier. Thanks to
+    Andres Salomon <dilinger at collabora.co.uk> for the "patch".
+    (Closes: #548779)
 
- -- Jonny Lamb <jonny at debian.org>  Sat, 17 Oct 2009 12:32:49 +0100
+ -- Jonny Lamb <jonny at debian.org>  Sat, 17 Oct 2009 12:33:49 +0100
 
 empathy (2.28.0.1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b596053..e15fe74 100644
--- a/debian/control
+++ b/debian/control
@@ -112,6 +112,8 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          libempathy-common (= ${source:Version}),
          telepathy-mission-control-5
+Conflicts: libempathy14, libempathy23
+Replaces: libempathy14, libempathy23
 Description: High-level library and user-interface for Telepathy (low-level library)
  Instant messaging program supporting text, voice, video, file transfers
  and inter-application communication over many different protocols,
@@ -167,6 +169,8 @@ Architecture: all
 Section: doc
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Conflicts: libempathy-gtk14, libempathy-gtk19
+Replaces: libempathy-gtk14, libempathy-gtk19
 Description: High-level library and user-interface for Telepathy (GTK documentation)
  Instant messaging program supporting text, voice, video, file transfers
  and inter-application communication over many different protocols,

-- 
Empathy packaging