From 36d0458e502f48714c58c993b0e6fd0b13a3a11e Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Mon, 29 Oct 2012 22:15:33 +0100 Subject: NEWS: summary for 0.6.0 Signed-off-by: Jonny Lamb --- NEWS | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index c39bdf4..2b59be5 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,18 @@ -telepathy-logger 0.5.0 (UNRELEASED) +telepathy-logger 0.6.0 (UNRELEASED) =================================== -... +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) =================================== -- cgit v1.2.1 From 9acede9cb4e7d0c154032dfc63198782adde901f Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Wed, 29 Aug 2012 11:54:21 -0400 Subject: Fix distcheck, missing file in clean list --- extensions/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/Makefile.am b/extensions/Makefile.am index e7248eb..a7c263b 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -56,6 +56,7 @@ BUILT_SOURCES = \ CLEANFILES = \ $(BUILT_SOURCES) \ + $(gen_headers:.h=-gtk-doc.h) \ $(pkgconfig_DATA) \ $(NULL) -- cgit v1.2.1 From 6b9494268d300f98a8bf9e72280608431aeb7f49 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Fri, 10 Aug 2012 16:52:11 +0200 Subject: log-store-xml: Filter out duplicate dates in get_dates Fixes: https://bugs.freedesktop.org/53345 --- telepathy-logger/log-store-xml.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c index bde4ca5..cf6a2f9 100644 --- a/telepathy-logger/log-store-xml.c +++ b/telepathy-logger/log-store-xml.c @@ -920,6 +920,7 @@ log_store_xml_get_dates (TplLogStore *store, { TplLogStoreXml *self = (TplLogStoreXml *) store; GList *dates = NULL; + GList *l; gchar *directory = NULL; GDir *dir = NULL; GString *pattern = NULL; @@ -972,6 +973,18 @@ log_store_xml_get_dates (TplLogStore *store, g_free (str); } + /* Filter out duplicate dates in-place */ + for (l = dates; g_list_next (l) != NULL; l = g_list_next (l)) + { + GList *next = g_list_next (l); + + if (g_date_compare ((GDate *) next->data, (GDate *) l->data) == 0) + { + g_date_free ((GDate *) next->data); + l = g_list_delete_link (l, next); + } + } + out: g_free (directory); -- cgit v1.2.1 From 99520a298e4c913c889c0ef60e5311a692578825 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 30 Oct 2012 10:00:49 +0100 Subject: tools: expect a tar.bz2 not a tar.gz This is an ugly patch but it'll do for now. Signed-off-by: Jonny Lamb --- tools/make-release-mail.py | 4 ++-- tools/telepathy.am | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) 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:" -- cgit v1.2.1 From 4f5b655aa1e8f9027403c2c518c68fc8b8232c81 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 28 Aug 2012 16:01:41 +0200 Subject: tools: Remove telepathy-glib-env from version control It is generated during the build. --- tools/telepathy-glib-env | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 tools/telepathy-glib-env diff --git a/tools/telepathy-glib-env b/tools/telepathy-glib-env deleted file mode 100755 index 8cc2995..0000000 --- a/tools/telepathy-glib-env +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -abs_top_builddir="/home/xclaesse/programmation/telepathy-logger" -export abs_top_builddir -LD_LIBRARY_PATH="${abs_top_builddir}/telepathy-glib/.libs${LD_LIBRARY_PATH:+":${LD_LIBRARY_PATH}"}" -export LD_LIBRARY_PATH -G_DEBUG="fatal_criticals,fatal_warnings${G_DEBUG:+",${G_DEBUG}"}" -export G_DEBUG - -exec "$@" -- cgit v1.2.1 From 8e68b2dc5d9c8d293d08e08e868bb259ba298ec6 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Tue, 28 Aug 2012 14:33:15 -0400 Subject: Add missing file in gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0cd3df0..e0f2d86 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ tags /telepathy-logger-*.tar.bz2.asc /telepathy-logger-*/ /xmldocs.make +/tools/telepathy-glib-env /data/*.client /data/*.service -- cgit v1.2.1 From 3bda9376a541ccbdccb478ac154cc0daed156dda Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Mon, 29 Oct 2012 22:16:21 +0100 Subject: version 0.6.0 Signed-off-by: Jonny Lamb --- NEWS | 2 +- configure.ac | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 2b59be5..40e0fb5 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -telepathy-logger 0.6.0 (UNRELEASED) +telepathy-logger 0.6.0 (2012-10-29) =================================== This is the start of a new stable branch. diff --git a/configure.ac b/configure.ac index a21953d..2d59e24 100644 --- a/configure.ac +++ b/configure.ac @@ -1,19 +1,19 @@ m4_define([tpl_major_version], [0]) -m4_define([tpl_minor_version], [4]) -m4_define([tpl_micro_version], [999]) -m4_define([tpl_nano_version], [1]) +m4_define([tpl_minor_version], [6]) +m4_define([tpl_micro_version], [0]) +m4_define([tpl_nano_version], [0]) # If Tpl library source has changed since last release, increment revision # If interfaces have been added, removed or changed since last release, # 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]) -- cgit v1.2.1 From e901fbf2baf78e65616daf7a5f37b5ae4d0072bf Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 30 Oct 2012 10:09:33 +0100 Subject: start on version 0.6.1 Signed-off-by: Jonny Lamb --- NEWS | 5 +++++ configure.ac | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 40e0fb5..33f2201 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ +telepathy-logger 0.6.1 (UNRELEASED) +=================================== + +... + telepathy-logger 0.6.0 (2012-10-29) =================================== diff --git a/configure.ac b/configure.ac index 2d59e24..7b41691 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ m4_define([tpl_major_version], [0]) m4_define([tpl_minor_version], [6]) m4_define([tpl_micro_version], [0]) -m4_define([tpl_nano_version], [0]) +m4_define([tpl_nano_version], [1]) # If Tpl library source has changed since last release, increment revision # If interfaces have been added, removed or changed since last release, -- cgit v1.2.1