X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=release.py;h=160650ed1c3992a944ac4b274d9674d57363fef2;hp=ffb25dea23d06c95ea3ccca9b141bf54a76a8642;hb=846cf36946ff8c36cf75678d9ed6552c33326228;hpb=c865d84deb0bb7c49f59ff6cd77064b6da86ff7f

diff --git a/release.py b/release.py
index ffb25dea..160650ed 100755
--- a/release.py
+++ b/release.py
@@ -9,7 +9,7 @@ import time
 from string import Template
 from optparse import OptionParser
 
-last_tag_patern = 'EMPATHY_2_27*'
+last_tag_pattern = 'EMPATHY_3_9*'
 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from:
@@ -67,7 +67,7 @@ class Project:
 			version_dir = self.package_version[:second]
 		self.package_dl_url = 'http://download.gnome.org/sources/%s/%s/' % (self.package_name.lower(), 
 										    version_dir)
-		tags_str = self.exec_cmd('git tag -l %s' % (last_tag_patern))
+		tags_str = self.exec_cmd('git tag -l %s' % (last_tag_pattern))
 		tags = tags_str.splitlines()
 		self.last_tag = tags[len(tags)-1]
 
@@ -88,12 +88,9 @@ class Project:
 	def get_md5sums(self):
 		md5sums = ''
 
-		cmd = 'md5sum %s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
+		cmd = 'md5sum %s-%s.tar.xz' % (self.package_name.lower(), self.package_version)
 		md5sums += self.exec_cmd(cmd)
 
-		cmd = 'md5sum %s-%s.tar.bz2' % (self.package_name.lower(), self.package_version)
-		md5sums += self.exec_cmd(cmd).strip()
-
 		return md5sums
 
 	def get_bugzilla_info(self):
@@ -161,9 +158,10 @@ class Project:
 		return translations
 
 	def get_bug_author(self, bug_number):
-		cmd = 'git log %s.. | grep -B 20 -E "(bug %s|#%s)"' \
+		cmd = 'git log %s.. | grep -B 20 -E \
+		      "(bug %s|#%s)|bugzilla.gnome.org/show_bug.cgi\?id=%s"' \
 		      ' | tac | grep ^Author: | head -1' \
-		      % (self.last_tag, bug_number, bug_number)
+		      % (self.last_tag, bug_number, bug_number, bug_number)
 		line = self.exec_cmd (cmd)
 		p1 = line.find(" ")
 		p2 = line.find("<")
@@ -219,7 +217,10 @@ class Project:
 			" - Updated %s Documentation translation (%s)\n")
 		bugs = self.get_bugs()
 
-		news = 'NEW in '+ self.package_version + '\n==============\n'
+		news = 'NEW in '+ self.package_version
+		line = '=' * len(news)
+		today = datetime.date.today()
+		news += ' (%s)\n%s\n' % (today.strftime('%d/%m/%Y'),line)
 		if bugs != '':
 			news += 'Bugs fixed:\n' + bugs + '\n'
 		if translations != '':
@@ -255,7 +256,7 @@ class Project:
 
 	def upload_tarball(self):
 		username = self._get_username()
-		tarball = '%s-%s.tar.gz' % (self.package_name.lower(), self.package_version)
+		tarball = '%s-%s.tar.xz' % (self.package_name.lower(), self.package_version)
 
 		cmd = 'scp %s %s@%s:' % (tarball, username, upload_server)
 		self.exec_cmd(cmd)
@@ -265,6 +266,7 @@ class Project:
 
 	def send_email(self):
 		notes = self.get_release_notes()
+                print notes
 		cmd = 'xdg-email ' \
 		      ' --cc telepathy@lists.freedesktop.org' \
 		      ' --subject "ANNOUNCE: Empathy %s"' \