[Pkg-telepathy-commits] [SCM] Empathy packaging branch, ubuntu, updated. ubuntu/2.26.0.1-0ubuntu1-7-ge4aa467

[Laurent Bigonville]

The following commit has been merged in the ubuntu branch:
commit e4aa46779b1ed61270764e408393cbaab16f5bca
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Tue Apr 14 12:03:07 2009 +0200

    Merge from debian unstable
    
    * 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 6da04e8..200e982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+empathy (2.26.1-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>  Tue, 14 Apr 2009 12:00:26 +0200
+
 empathy (2.26.1-1) unstable; urgency=low
 
   * New upstream release

-- 
Empathy packaging