prepare 3.6.0.1

diff --git a/NEWS b/NEWS
index a366ef24156e5df81bba13883d824cfb13bd5785..ad58bb6f550e9f7126a37c7d09ada1be95e8f40c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,42 @@
+NEW in 3.6.0.1 (03/10/2012)
+==============
+
+This new stable release fixes a bug preventing Empathy to connect an IM
+account having an invalid certificate.
+It also improves the performance of roster live search and should reduce the
+startup time of the chat window as well.
+
+Bugs fixed:
+ - Fixed #684528, Wrong status message when call is disconnected (Guillaume Desmottes)
+ - Fixed #684675, private-chat-$UUID rooms are created with default (i.e. public) settings (Guillaume Desmottes)
+ - Fixed #684783, Fail to popup wrong certificate dialog (Guillaume Desmottes)
+ - Fixed #684971, empathy-chat: loses multi personas in the the contact menu (Guillaume Desmottes)
+ - Fixed #685203, Crash when resuming from sleep (Guillaume Desmottes)
+ - Fixed #685278, Live search is pretty slow when groups are enabled (Guillaume Desmottes)
+
+Translations:
+ - Updated an Translation (Daniel Martinez Cucalon)
+ - Updated as Translation (Nilamdyuti Goswami)
+ - Updated be Translation (Ihar Hrachyshka)
+ - Updated bg Translation (Alexander Shopov)
+ - Updated ca Translation (Gil Forcada)
+ - Updated ca@valencia Translation (Carles Ferrando)
+ - Updated cs Translation (Marek Černocký)
+ - Updated el Translation (Tom Tryfonidis)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated hu Translation (Gabor Kelemen)
+ - Updated id Translation (Andika Triwidada)
+ - Updated it Translation (Milo Casagrande)
+ - Updated lt Translation (Žygimantas Beručka, Aurimas Černius)
+ - Updated pl Translation (Piotr Drąg)
+ - Updated pt Translation (Duarte Loreto)
+ - Updated ru Translation (Yuri Myasoedov)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated sr@latin Translation (Мирослав Николић)
+ - Updated sr Translation (Мирослав Николић)
+
 NEW in 3.6.0 (25/09/2012)
 ============
 

diff --git a/configure.ac b/configure.ac
index b427f24647e8591dea4bf8c5611013b497d87c8d..f422bafec446f6aff43d39955090b47aa30f8a97 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], [3])
 m4_define([empathy_minor_version], [6])
 m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [1])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],