Merge remote-tracking branch 'origin/telepathy-logger-0.6'

4 files changed, 32 insertions, 16 deletions

diff --git a/NEWS b/NEWS
index c39bdf4..33f2201 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,24 @@
-telepathy-logger 0.5.0 (UNRELEASED)
+telepathy-logger 0.6.1 (UNRELEASED)
 ===================================
 
 ...
 
+telepathy-logger 0.6.0 (2012-10-29)
+===================================
+
+This is the start of a new stable branch.
+
+There was never a development release in the 0.5 series so there are
+no changes there. Here is the summary of particularly noteworthy
+changes since 0.4:
+
+• telepathy-glib 0.19.2 is now required and deprecated telepathy-glib
+  usage has been removed.
+
+• Multiple introspection problems have been fixed. (fd.o#50361)
+
+• Streamed Media channel support has been removed.
+
 telepathy-logger 0.4.0 (2012-04-03)
 ===================================
 
diff --git a/configure.ac b/configure.ac
index a21953d..7b41691 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_define([tpl_major_version], [0])
-m4_define([tpl_minor_version], [4])
-m4_define([tpl_micro_version], [999])
+m4_define([tpl_minor_version], [6])
+m4_define([tpl_micro_version], [0])
 m4_define([tpl_nano_version], [1])
 
 # If Tpl library source has changed since last release, increment revision
@@ -8,12 +8,12 @@ m4_define([tpl_nano_version], [1])
 #  increment current and set revision to 0
 # If interfaces have been added since last release, increment age
 # If interfaces have been removed since last release, set age to 0
-m4_define([tpl_lt_current], [4])
-m4_define([tpl_lt_revision], [1])
+m4_define([tpl_lt_current], [5])
+m4_define([tpl_lt_revision], [0])
 m4_define([tpl_lt_age], [2])
 
 # The same for the extensions library produced by --enable-public-extensions
-m4_define([tpl_ext_lt_current], [2])
+m4_define([tpl_ext_lt_current], [3])
 m4_define([tpl_ext_lt_revision], [0])
 m4_define([tpl_ext_lt_age], [0])
 
diff --git a/tools/make-release-mail.py b/tools/make-release-mail.py
index b03ebd2..786b6dc 100644
--- a/tools/make-release-mail.py
+++ b/tools/make-release-mail.py
@@ -62,8 +62,8 @@ def main(package, version, news_path):
     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
+tarball: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.bz2
+signature: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.bz2.asc
 git: %(git_url)s/%(package)s
 
 %(details)s""".strip().rstrip() % {
diff --git a/tools/telepathy.am b/tools/telepathy.am
index f696ef3..5e78dfd 100644
--- a/tools/telepathy.am
+++ b/tools/telepathy.am
@@ -42,14 +42,14 @@ else
 	@exit 2;
 endif
 
-%.tar.gz.asc: %.tar.gz
+%.tar.bz2.asc: %.tar.bz2
 	$(AM_V_GEN)gpg --detach-sign --armor $@
 
-@PACKAGE@-@VERSION@.tar.gz: _is-release-check check distcheck
+@PACKAGE@-@VERSION@.tar.bz2: _is-release-check check distcheck
 
 maintainer-prepare-release: _is-release-check all distcheck release-mail
 	git tag -s @PACKAGE@-@VERSION@ -m @PACKAGE@' '@VERSION@
-	gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.gz
+	gpg --detach-sign --armor @PACKAGE@-@VERSION@.tar.bz2
 
 release-mail: NEWS
 	$(AM_V_GEN)(python $(top_srcdir)/tools/make-release-mail.py \
@@ -59,13 +59,13 @@ release-mail: NEWS
 maintainer-upload-release: _maintainer-upload-release
 
 _maintainer-upload-release-check: _is-release-check
-	test -f @PACKAGE@-@VERSION@.tar.gz
-	test -f @PACKAGE@-@VERSION@.tar.gz.asc
-	gpg --verify @PACKAGE@-@VERSION@.tar.gz.asc
+	test -f @PACKAGE@-@VERSION@.tar.bz2
+	test -f @PACKAGE@-@VERSION@.tar.bz2.asc
+	gpg --verify @PACKAGE@-@VERSION@.tar.bz2.asc
 
 _maintainer-upload-release: _maintainer-upload-release-check
-	rsync -vzP @PACKAGE@-@VERSION@.tar.gz telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz
-	rsync -vzP @PACKAGE@-@VERSION@.tar.gz.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.gz.asc
+	rsync -vzP @PACKAGE@-@VERSION@.tar.bz2 telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.bz2
+	rsync -vzP @PACKAGE@-@VERSION@.tar.bz2.asc telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/releases/@PACKAGE@/@PACKAGE@-@VERSION@.tar.bz2.asc
 
 maintainer-make-release: maintainer-prepare-release maintainer-upload-release
 	@echo "Now:"