prepare 2.91.6

diff --git a/NEWS b/NEWS
index 7f482978bd71320b68fab850608ccc83be6f65cc..58c34cd41bfd098ac171e5b47cd1d8f2236c8b46 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,42 @@
+NEW in 2.91.6 (01/02/2011)
+=============
+
+Empathy can now search for contacts on the server!
+It can also now save the password of protected rooms.
+
+Dependencies:
+
+ • folks ≥ 0.3.4
+ • telepathy-glib ≥ 0.13.11
+
+Bugs fixed:
+ - Fixed #601577, Add a throbber in the info bar when joining a room protected room (Jonny Lamb)
+ - Fixed #601578, Add "Firefox style" info bar to save room password (Jonny Lamb)
+ - Fixed #606947, support Contact Search API (Emilio Pozuelo Monfort)
+ - Fixed #609419, Display "typing" icon in muc contacts list (Chandni Verma)
+ - Fixed #609420, Don't display "typing" icon in muc tabs (Chandni Verma)
+ - Fixed #631101, Enforce a format for birthday (Vitaly Minko)
+ - Fixed #634853, Empathy does not allow Yahoo server to be added to account. (Guillaume Desmottes)
+ - Fixed #637322, empathy-chat crashes when trying to send a file (Guillaume Desmottes)
+ - Fixed #637839, Send video button greyed out but Video->Video On menu not (Guillaume Desmottes)
+ - Fixed #637847, Adjust for Folks avatar and presence interface renames (Travis Reitter)
+ - Fixed #639302, Incoming message sound played twice (Guillaume Desmottes)
+ - Fixed #640295, main-window: use line-wrap for "no match" label (Diego Escalante Urrelo)
+ - Fixed #640411, Crash when trying to create an ICQ account (Guillaume Desmottes)
+ - Fixed #640532, Rename and clean-up EmpathyIdle (Guillaume Desmottes)
+ - Fixed #640751, Mark a non-user-visible string as untranslatable. (Will Thompson)
+
+Translations:
+ - Updated ar Translation (Khaled Hosny)
+ - Updated cs Translation (Marek Černocký)
+ - Updated de Translation (Mario Blättermann)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated et Translation (Ivar Smolin)
+ - Updated eu Translation (Inaki Larranaga Murgoitio)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated ru Translation (Yuri Myasoedov)
+
 NEW in 2.91.5.1 (18/01/2011)
 ===============
 

diff --git a/configure.ac b/configure.ac
index 985549a3c90b602340e40861fe28926821b1bb3e..70dcb10cd5cbf1a4e8624abcc7985db05e34dc1c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [91])
-m4_define([empathy_micro_version], [5])
-m4_define([empathy_nano_version], [1])
+m4_define([empathy_micro_version], [6])
+m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],