prepare 2.31.6

diff --git a/NEWS b/NEWS
index f1b586e25f452959d8c5347209769d60ca157adf..7d8aa545d1497463f454d1361ef3075d38b2397c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,43 @@
+NEW in 2.31.6 (02/08/2010)
+=============
+
+The « Oh, and the toilets are free. Mind the gap please. » release.
+
+Empathy now depends on libfolks ≥ 0.1.11. This doesn't introduce any
+user-visible changes yet, but is the first step towards introducing
+meta-contact support to Empathy.
+
+The audio/video window now has a "details" pane containing some information
+about the call.
+
+Bugs fixed:
+ - Fixed #599166, Add a "details" pane in the sidebar (Guillaume Desmottes)
+ - Fixed #621629, live-search: should select first matching contact (Felix Kaser)
+ - Fixed #623714, Rebase Empathy upon libfolks (Travis Treitter, Philip Withnall)
+ - Fixed #624268, Empathy crash when opening a chat (Guillaume Desmottes)
+ - Fixed #624462, Empathy segv in event_manager_add (Marc-Antoine Perennou)
+ - Fixed #624599, show the date in messages coming from history (Nicolò Chieffo)
+ - Fixed #624650, no more GtkNotebookPage in GTK+ 3.0 (Danielle Madeley)
+ - Fixed #625826, EmpathyMapView should be a GtkWindow (Guillaume Desmottes)
+ - Fixed #624412, control centre plugin no longer builds against recent gnome-c-c (Danielle Madeley)
+
+Translations:
+ - Updated ar Translation (Khaled Hosny)
+ - Updated de Translation (Mario Blättermann)
+ - Updated es Translation (Jorge González)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated nn Translation (Torstein Adolf Winterseth)
+ - Updated sl Translation (Andrej Žnidaršič)
+ - Updated zh_CN Translation (Yunqiang Su, Aron Xu)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+Documentation translations:
+ - Updated gl Documentation translation (Fran Diéguez)
+ - Updated zh_CN Documentation translation (Aron Xu)
+
 NEW in 2.31.5.1 (13/07/2010)
 ===============
 

diff --git a/configure.ac b/configure.ac
index f9d6d41a614a107e59b1e577ed59f32a60dae51b..f02ca2a896ec48bf09b6ea90a73f55fd928275ce 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], [31])
-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],