telepathy-salut: Update make-release-mail from telepathy-glib master

[Simon McVittie]

Module: telepathy-salut
Branch: master
Commit: 764b9675887917a6f430b2ae9186714aa689bc65
URL:    http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=764b9675887917a6f430b2ae9186714aa689bc65

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Jan  4 11:36:36 2013 +0000

Update make-release-mail from telepathy-glib master

---

 tools/make-release-mail.py |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/make-release-mail.py b/tools/make-release-mail.py
index 5c42b47..b03ebd2 100644
--- a/tools/make-release-mail.py
+++ b/tools/make-release-mail.py
@@ -6,6 +6,15 @@
 # to <telepathy at lists.freedesktop.org>. I hope that you enjoy your stay.
 
 import sys
+import re
+
+def looks_like_a_header(line, package, version=None):
+    if version is None:
+        pattern = "^%s .* \(.*\)$" % package
+    else:
+        pattern = "^%s %s \(.*\)$" % (package, version)
+
+    return re.match(pattern, line) is not None
 
 def extract_description(package, version, news_path):
     release_name = []
@@ -15,7 +24,7 @@ def extract_description(package, version, news_path):
         lines = (line for line in f.readlines())
         for line in lines:
             # Find the 'telepathy-foo 0.1.2' header
-            if line.startswith("%s %s" % (package, version)):
+            if looks_like_a_header(line, package, version):
                 break
 
         # Skip the ====== line, and the first blank line
@@ -27,7 +36,7 @@ def extract_description(package, version, news_path):
         for line in lines:
             line = line.rstrip()
             # If we hit the next version header, we're done
-            if line.startswith(package):
+            if looks_like_a_header(line, package):
                 break
             # Else, if we hit a blank line and we're still reading the release
             # name, we're done with the release name.