prepare 3.3.2

diff --git a/NEWS b/NEWS
index 53bf2fdb382e712633d22a747fe43101572b78c6..b3cc0a9e78baa3f580fa8655bc7f0b1582e09815 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,48 @@
+NEW in 3.3.2 (21/11/2011)
+============
+
+Dependencies:
+
+ • telepathy-glib ≥ 0.17.0
+ • telepathy-farsight ≥ 0.0.18
+ • telepathy-farstream ≥ 0.1.2 (optional)
+
+Bugs fixed:
+ - Fixed #662504, Cannot quit empathy (Guillaume Desmottes)
+ - Fixed #646682, Support InsufficientBalance error (Emilio Pozuelo Monfort)
+ - Fixed #652544, Add X-FACEBOOK-PLATFORM and X-MESSENGER-OAUTH2 support (Xavier Claessens)
+ - Fixed #654430, Add support for video control interface to empathy-call (Nicolas Dufresne, Sjoerd Simons)
+ - Fixed #661805, Use tp-glib blocking API (Guillaume Desmottes)
+ - Fixed #662604, In a conversation window, Contact → Add Contact… selects the wrong account (Guillaume Desmottes)
+ - Fixed #662609, EmpathyAccountChooser clean up (Guillaume Desmottes)
+ - Fixed #662727, new-call/new-convo dialogs should listen to capabilities changes (Danielle Madeley)
+ - Fixed #662843, invite dialog looks stupid on IRC (Guillaume Desmottes)
+ - Fixed #662903, Empathy uses deprecated GTK widgets (potential build errors) (Guillaume Desmottes)
+ - Fixed #662995, Fix for misaligned 16x16 app icon (Michael Monreal)
+ - Fixed #663327, Stop using EmpathyContactManager to add and remove contacts (Guillaume Desmottes)
+ - Fixed #663442, Make GOA optional (Danielle Madeley)
+ - Fixed #663563, Shouldn't offer to send socket files (Guillaume Desmottes)
+ - Fixed #663567, Status icon is miss aligned in infobar (Danielle Madeley)
+ - Fixed #663763, Some contact/invidiual misc patches (Guillaume Desmottes)
+ - Fixed #663842, Don't do extra audio-processing for raw Contents (Sjoerd Simons)
+ - Fixed #664313, call-window opens very small the first time (Ken VanDine)
+
+Translations:
+ - Updated cs Translation (Marek Černocký)
+ - Updated de Translation (Christian Kirbach)
+ - Updated et Translation (Mattias Põldaru)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated lt Translation (Algimantas Margevičius)
+ - Updated my Translation (Thura Hlaing)
+ - Updated sl Translation (Matej Urbančič)
+ - Updated tr Translation (Muhammet Kara)
+ - Updated zh_HK Translation (Cheng-Chia Tseng)
+ - Updated zh_TW Translation (Cheng-Chia Tseng)
+
+Documentation translations:
+ - Updated ca Documentation translation (Gil Forcada)
+ - Updated pl Documentation translation (Aleksander Łukasiewicz)
+

 NEW in 3.3.1 (24/10/2011)
 ============
 
 NEW in 3.3.1 (24/10/2011)
 ============
 

diff --git a/configure.ac b/configure.ac
index 1e647535e1c23bb1b04b6a2c8879b0efe41d6aee..95a16c5695e4c4b8e16b73f2b148bdf551259540 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 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], [3])
 m4_define([empathy_minor_version], [3])
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [3])

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

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

diff --git a/release.py b/release.py
index 0a4d2675c64637720d350db3392cdc635b6b189c..5d5dc62620d21423760f67c9345478a3f1e373b2 100755 (executable)
--- a/release.py
+++ b/release.py
@@ -9,7 +9,7 @@ import time
 from string import Template
 from optparse import OptionParser
 
 from string import Template
 from optparse import OptionParser
 

-last_tag_pattern = 'EMPATHY_3_2*'
+last_tag_pattern = 'EMPATHY_3_3*'

 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from:
 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from: