[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.25.92-1-8-gc8eb84f

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit b6cf522656841ee0a2a1b0f964aeb867553ccd51
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Mar 18 12:49:00 2009 +0100

    Remove telepathy-stream-engine recommends and conflicts

diff --git a/debian/changelog b/debian/changelog
index 06c8fb7..ccbcd60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,9 @@ empathy (2.26.0-1) UNRELEASED; urgency=low
   * New Upstream Version
     - Bump libtelepathy-glib-dev build-dependency
     - Bump libempathy soname and adjust .symbols file
-  * debian/control: Bump Standards-Version to 3.8.1 (no further changes)
+  * debian/control:
+    - Bump Standards-Version to 3.8.1 (no further changes)
+    - Remove telepathy-stream-engine recommends and conflicts
 
  -- Laurent Bigonville <bigon at debian.org>  Tue, 17 Mar 2009 16:50:05 +0100
 
diff --git a/debian/control b/debian/control
index 3fbf7d0..285601f 100644
--- a/debian/control
+++ b/debian/control
@@ -43,9 +43,7 @@ Depends: ${shlibs:Depends},
          dbus-x11
 Recommends: telepathy-gabble,
             telepathy-salut,
-            telepathy-stream-engine,
             gvfs-backends
-Conflicts: telepathy-stream-engine (<< 0.5.2)
 Description: High-level library and user-interface for Telepathy
  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

-- 
Empathy packaging