Prepare for release 0.21.5.2

svn path=/trunk/; revision=566

diff --git a/NEWS b/NEWS
index ffef5052c73201c380fe6682128a461c647e7bd4..3258e90a35019edfe9caf5c434dcb4b3bd28221e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+NEW in 0.21.5.2
+==============
+ - Update API documentation generator. (xclaesse).
+ - Update python binding for new API. (xclaesse).
+ - Rename BlockType to EMPATHY_CHAT_VIEW_BLOCK to respect namespace (xclaesse).
+ - Change EMPATHY_AVATAR_CHOOSER_TYPE to EMPATHY_TYPE_AVATAR_CHOOSER (xclaesse).
+ - Ignore ssl errors for gtalk profile by default otherwise it won't connect. (xclaesse).
+
+Bugs fixed:
+ - Fixed #509656, crash in Empathy Instant Messenger: Nothing. I was viewing s... (xclaesse)
+
+Translations:
+ - Updated ja Translation (Takeshi AIHANA).
+ - Updated sv Translation (Daniel Nylander).
+

 NEW in 0.21.5.1
 ==============
  - Fix release.py script to give correct author of fixed bug.
 NEW in 0.21.5.1
 ==============
  - Fix release.py script to give correct author of fixed bug.

diff --git a/configure.ac b/configure.ac
index 0855913276cbdbcc2b9f9ee0d31a2a6f65cc883d..73478b8549b1aad2e141a4ce09bfb89da79d12bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.21.6, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 0.21.5.2, http://bugzilla.gnome.org/browse.cgi?product=empathy)

 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB

diff --git a/release.py b/release.py
index 967f4c03123d9e4a0f50cfc1f5a2f99946ced65f..b7f3208f1ff029f04222d44c9955a8b5e43d1ae8 100755 (executable)
--- a/release.py
+++ b/release.py
@@ -7,7 +7,7 @@ import csv
 import datetime
 from string import Template
 
 import datetime
 from string import Template
 

-prev_tag = 'EMPATHY_0_21_4'
+prev_tag = 'EMPATHY_0_21_5_1'

 username = 'xclaesse'
 upload_server = 'master.gnome.org'
 template = '''\
 username = 'xclaesse'
 upload_server = 'master.gnome.org'
 template = '''\