[Pkg-telepathy-commits] ./packages/unstable/empathy r121: Start the preperation of 0.23.1

[Sjoerd Simons]

------------------------------------------------------------
revno: 121
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: empathy
timestamp: Mon 2008-04-21 10:35:33 +0200
message:
  Start the preperation of 0.23.1
modified:
  changelog
  control
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-04-11 11:29:37 +0000
+++ b/changelog	2008-04-21 08:35:33 +0000
@@ -1,9 +1,14 @@
-empathy (0.22.1-2) UNRELEASED; urgency=low
+empathy (0.23.1-2) UNRELEASED; urgency=low
 
+  [ Laurent Bigonville ]
   * debian/control: Add telepathy-stream-engine as a recommends for empathy
     package
 
- -- Laurent Bigonville <bigon at bigon.be>  Fri, 11 Apr 2008 13:28:43 +0200
+  [ Sjoerd Simons ]
+  * New upstream release
+  * debian/control: Add conflict with older version of stream-engine
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 21 Apr 2008 10:34:57 +0200
 
 empathy (0.22.1-1) unstable; urgency=low
 

=== modified file 'control'
--- a/control	2008-04-11 11:29:37 +0000
+++ b/control	2008-04-21 08:35:33 +0000
@@ -35,6 +35,7 @@
 Recommends: telepathy-gabble,
             telepathy-salut,
             telepathy-stream-engine
+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