[Pkg-telepathy-commits] [SCM] Empathy packaging branch, ubuntu, updated. ubuntu/2.25.92-1ubuntu1-11-gd2c69fc

[Laurent Bigonville]

The following commit has been merged in the ubuntu branch:
commit 2d585534fd06a774700dfecbdcf55afd74ce245f
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Mar 18 13:27:28 2009 +0100

    Merge from debian unstable, remaining changes:
    
    * Merge from debian unstable, remaining changes:
      - Add Recommends on telepathy-butterfly and telepathy-haze
      - Add Suggests on telepathy-idle

diff --git a/debian/changelog b/debian/changelog
index 857dbb7..a47847a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+empathy (2.26.0-1ubuntu1) UNRELEASED; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Add Recommends on telepathy-butterfly and telepathy-haze
+    - Add Suggests on telepathy-idle
+
+ -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 18 Mar 2009 13:26:35 +0100
+
 empathy (2.26.0-1) unstable; urgency=low
 
   * New Upstream Version
@@ -12,7 +20,7 @@ empathy (2.26.0-1) unstable; urgency=low
 
 empathy (2.25.92-1ubuntu1) jaunty; urgency=low
 
-  * Merge from debian experimental, remaining changes:
+  * Merge from debian unstable, remaining changes:
     - Add Recommends on telepathy-butterfly and telepathy-haze
     - Add Suggests on telepathy-idle
   * Fix FTBFS with python >= 2.6

-- 
Empathy packaging