summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk>2010-12-03 15:37:00 -0500
committerLouis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk>2010-12-03 15:51:12 -0500
commita6c7b3230e0a6ad54e5e4d3e77f025d6cb32dd67 (patch)
tree7e973c2ab2f286f6e42d4ba6fff7d4fa2988153f
parent09e130714de2b3ca75517ae615c2daadc1563e9b (diff)
-rw-r--r--NEWS19
-rw-r--r--configure.ac2
-rwxr-xr-xtelepathy-butterfly2
3 files changed, 21 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 800e461..7465088 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+telepathy-butterfly-0.5.15 (2010-12-03)
+=======================================
+
+Dependencies:
+ * telepathy-python 0.15.19
+ * papyon 0.5.3
+
+Enhancements:
+
+ * Implement Protocol interface
+ * Remove undrafted interfaces (moved to tp-python)
+
+Fixes:
+
+ * Normalize and ensure handles per connection
+ * Fix detection of A/V capabilities (downgrade)
+ * Add proper flags to contact publish list
+ * Misc fixes to media and file transfer channels
+
telepathy-butterfly-0.5.14 (2010-09-10)
=======================================
diff --git a/configure.ac b/configure.ac
index b7ace33..7522fe3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ m4_define(telepathy_butterfly_released, 1)
dnl The telepathy-python version number (must actually be numeric at the moment)
m4_define(telepathy_butterfly_major_version, 0)
m4_define(telepathy_butterfly_minor_version, 5)
-m4_define(telepathy_butterfly_micro_version, 14)
+m4_define(telepathy_butterfly_micro_version, 15)
m4_define(telepathy_butterfly_maybe_datestamp,
m4_esyscmd([if test x]telepathy_butterfly_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
diff --git a/telepathy-butterfly b/telepathy-butterfly
index 75e8332..438eb99 100755
--- a/telepathy-butterfly
+++ b/telepathy-butterfly
@@ -25,7 +25,7 @@ import os
import sys
import logging
-version = (0, 5, 14)
+version = (0, 5, 15)
if sys.version_info < (2, 5):
print >> sys.stderr, 'Critical: python >= 2.5 required. Exiting.'