[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.27.3-1-6-ge0ad214

Laurent Bigonville bigon at bigon.be
Tue Jun 23 09:08:59 UTC 2009


The following commit has been merged in the debian branch:
commit c49154ed55b5553a1826623a507696c62869101c
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun Jun 21 17:32:51 2009 +0200

    Drop all conflicts, packages not even in old-stable anymore

diff --git a/debian/changelog b/debian/changelog
index ccd89e4..7d7334d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 empathy (2.27.3-2) UNRELEASED; urgency=low
 
   * debian/rules: Remove duplicate include
-  * Bump Standards-Version (no further changes)
+  * debian/control:
+    - Bump Standards-Version (no further changes)
+    - Drop all conflicts, packages not even in old-stable anymore
 
- -- Laurent Bigonville <bigon at debian.org>  Fri, 19 Jun 2009 11:47:16 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Sun, 21 Jun 2009 17:24:43 +0200
 
 empathy (2.27.3-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index b09ddfb..30de524 100644
--- a/debian/control
+++ b/debian/control
@@ -59,8 +59,6 @@ Description: High-level library and user-interface for Telepathy
 Package: libempathy-common
 Architecture: all
 Section: misc
-Conflicts: empathy (<< 0.12-1), libempathy-gtk-common (<< 0.21.5.2)
-Replaces: empathy (<< 0.12-1)
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: High-level library and user-interface for Telepathy (library common files)
@@ -81,8 +79,6 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          libempathy-common (= ${source:Version}),
          telepathy-mission-control
-Conflicts: cohoba,
-           gossip-telepathy
 Description: High-level library and user-interface for Telepathy (low-level library)
  Empathy consists of a rich set of reusable instant messaging widgets, and a
  GNOME client using those widgets. It uses Telepathy and Nokia's Mission
@@ -146,8 +142,6 @@ Description: High-level library and user-interface for Telepathy (GTK documentat
 Package: libempathy-gtk-common
 Architecture: all
 Section: misc
-Conflicts: empathy (<< 0.12-1)
-Replaces: empathy (<< 0.12-1)
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          gnome-icon-theme

-- 
Empathy packaging



More information about the Pkg-telepathy-commits mailing list