Merge branch 'telepathy-mission-control-5.16'

3 files changed, 38 insertions, 8 deletions

diff --git a/NEWS b/NEWS
index c8a7e4f9..9f235cf0 100644
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,24 @@ Fixes:
   suspending" on systems with either systemd-logind, or a reimplementation
   with the same D-Bus API. (fd.o #70458, Simon)
 
+
+telepathy-mission-control 5.16.5 (2019-09-15)
+=============================================
+
+The "magic number three" release.
+
+Enhancements:
+
+• Port build tools to Python 3
+
+Fixes:
+
+• Fix memory leak in get_parameter_of_known_type() (Slava Monich)
+• Fix autoconnection of accounts with always_dispatch=true (Martin Klapetek)
+• Fix crash on any of the active connection managers disappears
+  from dbus (Tiago Salem Herrmann)
+
+
 telepathy-mission-control 5.16.4 (2016-09-02)
 =============================================
 
diff --git a/tools/make-release-mail.py b/tools/make-release-mail.py
index 2bd7c2bc..33438382 100644
--- a/tools/make-release-mail.py
+++ b/tools/make-release-mail.py
@@ -6,6 +6,15 @@
 # to <telepathy@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,19 +24,19 @@ 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
-        lines.next()
-        lines.next()
+        next(lines)
+        next(lines)
 
         got_release_name = False
 
         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.
@@ -45,30 +54,33 @@ def extract_description(package, version, news_path):
     return ('\n'.join(release_name), '\n'.join(details).rstrip())
 
 BASE_URL = 'http://telepathy.freedesktop.org/releases'
+GIT_URL = 'http://cgit.freedesktop.org/telepathy'
 
 def main(package, version, news_path):
     release_name, details = extract_description(package, version, news_path)
 
-    print """
+    print("""
 %(release_name)s
 
 tarball: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz
 signature: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz.asc
+git: %(git_url)s/%(package)s
 
 %(details)s""".strip().rstrip() % {
         'base_url': BASE_URL,
+        'git_url': GIT_URL,
         'package': package,
         'version': version,
         'release_name': release_name,
         'details': details,
-    }
+    })
 
 if __name__ == '__main__':
     try:
         package, version, news_path = sys.argv[1:]
 
         main(package, version, news_path)
-    except ValueError, e:
+    except ValueError as e:
         sys.stderr.write(
             'Usage: %s package-name package.version.number path/to/NEWS\n' %
             sys.argv[0])
diff --git a/tools/telepathy.am b/tools/telepathy.am
index 20ff0be1..c919995d 100644
--- a/tools/telepathy.am
+++ b/tools/telepathy.am
@@ -55,7 +55,7 @@ maintainer-prepare-release:
 	$(MAKE) all
 	$(MAKE) distcheck
 	$(MAKE) release-mail
-	git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@
+	cd $(srcdir) && git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@
 	gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz
 
 release-mail: NEWS