Fix authors for fixed bugs in NEWS and release.py, Bump ABI version and prepare for 0.21.5.1 releaseEMPATHY_0_21_5_1

svn path=/trunk/; revision=553

3 files changed, 63 insertions, 59 deletions

diff --git a/NEWS b/NEWS
index 6fb216366..ffef5052c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,43 +1,47 @@
+NEW in 0.21.5.1
+==============
+ - Fix release.py script to give correct author of fixed bug.
+ - Fix NEWS file with correct authors
+ - BUMP ABI version, forgot that for release 0.21.5
+
 NEW in 0.21.5
 ==============
-- Adding a release.py script that uses git.
-- Add SIP icon picked from pidgin.
-- Cleanup icons: Regenerate icons from SVG at 16, 22, 24, 32 and 48 size.
-  Change xmpp-link-local icon from apple's to the avahi icon. Still missing SVG
-  for im-message, im-message-new and user-typing.
-- Add avatar token in logs and load avatar from cache when getting logs messages.
-- Reset status message when coming back from away and the status was manually
-  set to away.
-- Update profiles based on N810's.
-- Remove ChangeLog and po/ChangeLog, new release script uses git logs and
-  generates ChangeLog file from git.
-- Add .gitignore files.
-- Chandlers leaves when there is no more channels to handle.
-- Set call window title to contact name
-- Import Gossip's chat theme system and simplify it a bit.
+ - Adding a release.py script that uses git.
+ - Add SIP icon picked from pidgin.
+ - Cleanup icons: Regenerate icons from SVG at 16, 22, 24, 32 and 48 size.
+   Change xmpp-link-local icon from apple's to the avahi icon. Still missing SVG
+   for im-message, im-message-new and user-typing.
+ - Add avatar token in logs and load avatar from cache when getting logs messages.
+ - Reset status message when coming back from away and the status was manually
+   set to away.
+ - Update profiles based on N810's.
+ - Remove ChangeLog and po/ChangeLog, new release script uses git logs and
+   generates ChangeLog file from git.
+ - Add .gitignore files.
+ - Chandlers leaves when there is no more channels to handle.
+ - Set call window title to contact name
+ - Import Gossip's chat theme system and simplify it a bit.
 
 Bugs fixed:
-- Fixed #466960, status icon tooltip doesn't change when status changes (xclaesse)
-- Fixed #508520, :0 smiley conversion shouldn't happen for times (xclaesse)
-- Fixed #499885, Automatically connect at session start (xclaesse)
-- Fixed #507656, "make valgrind" broken (xclaesse)
-- Fixed #459520, Can't remove a group (xclaesse)
-- Fixed #447851, Wider list of participants in group chat/IRC channel (xclaesse)
-- Fixed #505622, add "check" framework support (xclaesse)
-- Fixed #490153, Join _New... icon (xclaesse)
-- Fixed #502932, Text selection in Accounts window (xclaesse)
+ - Fixed #466960, status icon tooltip doesn't change when status changes (xclaesse)
+ - Fixed #508520, :0 smiley conversion shouldn't happen for times (xclaesse)
+ - Fixed #499885, Automatically connect at session start (Carl-Anton Ingmarsson)
+ - Fixed #507656, "make valgrind" broken (Guillaume Desmottes)
+ - Fixed #459520, Can't remove a group (David Turner)
+ - Fixed #447851, Wider list of participants in group chat/IRC channel (Rohit Agrawal)
+ - Fixed #505622, add "check" framework support (Guillaume Desmottes)
+ - Fixed #490153, Join _New... icon (Michael Monreal)
+ - Fixed #502932, Text selection in Accounts window (xclaesse)
 
 Translations:
-- Updated Spanish Translation (jorgegonz).
-- Updated Norwegian bokmål Translation (kmaraas).
-- Updated Occitan Translation (ymarcheg).
-- Updated French Translation (claudep).
-- Updated Swedish Translation (dnylande).
-- Updated Spanish Translation (jorgegonz).
-- Updated Brazilian Portuguese Translation (leonardof).
-- Updated Basque Translation (dooteo).
-- Updated Arabic Translation (djihed).
-- Updated Norwegian bokmål Translation (kmaraas).
+ - Updated Spanish Translation (jorgegonz).
+ - Updated Norwegian bokmål Translation (kmaraas).
+ - Updated Occitan Translation (ymarcheg).
+ - Updated French Translation (claudep).
+ - Updated Swedish Translation (dnylande).
+ - Updated Brazilian Portuguese Translation (leonardof).
+ - Updated Basque Translation (dooteo).
+ - Updated Arabic Translation (djihed).
 
 NEW in 0.21.4:
 =============
diff --git a/configure.ac b/configure.ac
index 6b4735cc2..31fd17016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Empathy, 0.21.5, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+AC_INIT(Empathy, 0.21.5.1, http://bugzilla.gnome.org/browse.cgi?product=empathy)
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
@@ -9,12 +9,12 @@ AC_COPYRIGHT([
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=8
-LIBEMPATHY_AGE=1
+LIBEMPATHY_CURRENT=9
+LIBEMPATHY_AGE=2
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=8
-LIBEMPATHY_GTK_AGE=1
+LIBEMPATHY_GTK_CURRENT=9
+LIBEMPATHY_GTK_AGE=0
 LIBEMPATHY_GTK_REVISION=0
 
 AC_SUBST(LIBEMPATHY_CURRENT)
diff --git a/release.py b/release.py
index 7076e617a..967f4c031 100755
--- a/release.py
+++ b/release.py
@@ -35,13 +35,13 @@ class Commit:
 	date = ''
 	message = ''
 	bug = ''
-	summary = ''
 	translation = False
 
 	def parse(self):
-		if self.message[len(self.message) - 1] == ')':
-			p1 = self.message.rfind('(')
-			self.author = self.message[p1+1:len(self.message) - 1]
+		p1 = self.message.rfind('(')
+		p2 = self.message.rfind (')')
+		if len(self.message) - p2 <= 2:
+			self.author = self.message[p1+1:p2]
 			self.message = self.message[:p1]
 
 		p1 = self.message.find('#')
@@ -58,10 +58,9 @@ class Commit:
 	                match = lang_re.match(self.message)
 			if match:
 				lang = match.group('name').strip()				
-				self.summary = "Updated " + lang + " Translation"
-			else:
-				self.summary = self.message
-			self.summary += ' (' + self.author + ').'
+				self.message = "Updated " + lang + " Translation"
+
+		self.message += ' (' + self.author + ').'
 
 		return self.bug
 
@@ -233,7 +232,7 @@ class Project:
 
 			for co in commits:
 				if co.bug == bug_number:
-					co.summary = 'Fixed #%s, %s (%s)' % (co.bug, description, co.author)
+					co.message = 'Fixed #%s, %s (%s)' % (co.bug, description, co.author)
 					break
 		return commits
 
@@ -253,12 +252,13 @@ class Project:
 		others = ''
 		commits = self.get_commits()
 		for co in commits:
-			if co.summary == '':
-				others += '- ' + co.message + '\n'
-			elif co.translation == False:
-				bugs += '- ' + co.summary + '\n'
-			else :
-				translations += '- ' + co.summary + '\n'
+
+			if co.translation == True:
+				translations += ' - ' + co.message + '\n'
+			elif co.bug != '':
+				bugs += ' - ' + co.message + '\n'
+			else:
+				others += ' - ' + co.message + '\n'
 				
 		news = 'NEW in '+ self.package_version + '\n==============\n' 
 		news += others + '\nBugs fixed:\n' + bugs + '\nTranslations:\n' + translations + '\n'
@@ -272,10 +272,10 @@ class Project:
 
 	def upload_tarball(self):
 		tarball = '%s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
-                
+
 		cmd = 'scp %s %s@%s:' % (tarball, username, upload_server)
 		self.exec_cmd(cmd)
-                
+
 		cmd = 'ssh %s@%s install-module -u %s' % (username, upload_server, tarball)
 		self.exec_cmd(cmd)
 
@@ -284,6 +284,6 @@ class Project:
 		self.upload_tarball()
 		print self.get_release_notes()
 
-
-project = Project()
-print project.get_release_notes()
+p = Project()
+#p.write_news()
+#p.release()