prepare 2.29.91.2 release

diff --git a/NEWS b/NEWS
index 8195fe51d18541f1e3031d5a5705110df43576f2..251941d7efbd2c14c2e7a51b647a9e30dde0a622 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,29 @@
+NEW in 2.29.91.2
+================
+
+The "No pony in this release" release.
+
+Some issues regarding the account assistant have been fixed,
+including a crash introduced in yesterday's release.
+
+Empathy should now cope better with buggy routers that prevent connecting
+to Google Talk. If you have experienced this issue, please see the Empathy FAQ
+for details: http://live.gnome.org/Empathy/FAQ
+
+Links in contacts status messages are now clickable.
+
+Bugs fixed:
+ - Fixed #525576, URL in contact's status are not clickable (Xavier Claessens)
+ - Fixed #601089, "Network Error" on any new Google Talk account (Guillaume Desmottes)
+ - Fixed #611753, "B)" and "B-)" both present the face-cool, not following the Icon Naming Spec (Guillaume Desmottes)
+ - Fixed #611792, Crash through empathy-accounts wizard (Sjoerd Simons)
+ - Fixed #611794, Empathy asserts if icon not available (Sjoerd Simons)
+ - Fixed #611817, Remove salut_created gconf key (Guillaume Desmottes)
+
+Translations:
+ - Updated ar Translation (Khaled Hosny)
+ - Updated de Translation (Mario Blättermann)
+

 NEW in 2.29.91.1
 ================
 
 NEW in 2.29.91.1
 ================
 

diff --git a/configure.ac b/configure.ac
index 6f9474d4fc5438265212c60abafec00f8dc206c1..6c77c57e8f277dc9c1d44b9a841f91dfbc198375 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl If not 1, append datestamp to the version number
 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], [29])
 m4_define([empathy_micro_version], [91])
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [29])
 m4_define([empathy_micro_version], [91])

-m4_define([empathy_nano_version], [1])
+m4_define([empathy_nano_version], [2])

 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],