prepare 3.0 releaseEMPATHY_3_0_0

2 files changed, 51 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index a7935ec91..624ef98f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,50 @@
+NEW in 3.0.0 (04/04/2011)
+============
+
+The "Et un, et deux, et trois, zéro !" release.
+
+Here we go, this is GNOME 3.0 release of Empathy.
+
+The biggest change since 2.91.93 is a better integration of Empathy's
+notification in gnome-shell: calls, file transfers and room invitations
+notifications should now be properly displayed with the 3.0 version of
+the Shell.
+
+We strongly recommend distributions shipping this version to update to
+telepathy-logger 0.2.8 as well.
+
+Once again, GNOME's translation team did an outstanding job. Thanks to them
+this new major release of Empathy is usable in more than 50 languages!
+
+Bugs fixed:
+ - Fixed #646010, ft-manager: make sure the scrolled window expands in the dialog height (Cosimo Cecchi)
+ - Fixed #646097, Shouldn't format notification header (Guillaume Desmottes)
+ - Fixed #646691, Fails to build with -Werror (Danilo Segan)
+ - Fixed #638951, Conversation windows resize after being shown (Guillaume Desmottes)
+ - Fixed #645932, Hard to accept incoming calls and file transfer (Guillaume Desmottes)
+
+Translations:
+ - Updated ca Translation (Jordi Serratosa)
+ - Updated da Translation (Kenneth Nielsen)
+ - Updated de Translation (Wolfgang Stöggl)
+ - Updated el Translation (George Stefanakis)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated eu Translation (Inaki Larranaga Murgoitio)
+ - Updated gu Translation (Sweta Kothari)
+ - Updated ja Translation (OKANO Takayoshi)
+ - Updated nl Translation (Hannie Dumoleyn)
+ - Updated pt_BR Translation (Rodrigo Padula de Oliveira)
+ - Updated ru Translation (Leonid Kanter)
+ - Updated sk Translation (Pavol Klačanský)
+ - Updated sr@latin Translation (Branko Kokanović)
+ - Updated sr Translation (Branko Kokanović)
+ - Updated tr Translation (Baris Cicek)
+ - Updated vi Translation (Nguyễn Thái Ngọc Duy)
+
+Documentation translations:
+ - Updated de Documentation translation (Wolfgang Stöggl, Hendrik Richter, Mario Blättermann)
+ - Updated es Documentation translation (Jorge González)
+
 NEW in 2.91.93 (28/03/2011)
 ==============
 
diff --git a/configure.ac b/configure.ac
index dcfc62a0e..a8acade61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 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], [93])
+m4_define([empathy_major_version], [3])
+m4_define([empathy_minor_version], [0])
+m4_define([empathy_micro_version], [0])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'