[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.29.1-1-10-gca8b8f4

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit ca8b8f40ad3b3f16574e89efaf1e0b00c1b43811
Merge: 62b8a67561a0ba1593a9cec29556a6f8fd3481e1 666f985f16eb56c019186c49e633494b4e5e9205
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sat Nov 14 21:08:50 2009 +0100

    Merge branch 'debian-squeeze' into debian
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index d3cd475,5b590a5..3ae9a71
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
 +empathy (2.29.1-1) UNRELEASED; urgency=low
 +
-   * 
++  * Merge with debian unstable
 +
-  -- Laurent Bigonville <bigon at debian.org>  Sat, 14 Nov 2009 19:41:35 +0100
++ -- Laurent Bigonville <bigon at debian.org>  Sat, 14 Nov 2009 21:07:32 +0100
++
+ empathy (2.28.1.1-4) unstable; urgency=low
+ 
+   * Add symbols file for arch where geoclue support is disabled
+ 
+  -- Laurent Bigonville <bigon at debian.org>  Sat, 14 Nov 2009 20:45:54 +0100
  
  empathy (2.28.1.1-3) unstable; urgency=low
  
@@@ -16,20 -16,6 +22,20 @@@ empathy (2.28.1.1-2) unstable; urgency=
  
   -- Laurent Bigonville <bigon at debian.org>  Wed, 11 Nov 2009 22:56:43 +0100
  
 +empathy (2.29.1-1) experimental; urgency=low
 +
 +  * New upstream release
 +    - Drop megaphone applet
 +    - Drop libempathy, libempathy-gtk and python-empathy packages
 +    - Rename empathy-doc to empathy-common (Closes: #547904)
 +  * debian/control:
 +    - Fix typo
 +    - packet -> package
 +    - Add Recommends on yelp for empathy-common (Closes: #553524)
 +  * Move GConf schema to empathy package
 +
 + -- Laurent Bigonville <bigon at debian.org>  Wed, 04 Nov 2009 18:27:30 +0100
 +
  empathy (2.28.1.1-1) unstable; urgency=low
  
    * New upstream bugfix release

-- 
Empathy packaging