[Pkg-telepathy-commits] [telepathy-glib] 10/10: New upstream stable release

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib.

commit e5a42fe9278d2147749aefd48272a254b56fbfff
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Mar 26 16:02:55 2014 +0000

    New upstream stable release
---
 debian/changelog                                   |  7 ++
 ...-method-call-results-regression-in-0.23.1.patch | 74 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ad2d60..66522a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+telepathy-glib (0.24.0-1) unstable; urgency=low
+
+  * New upstream stable release
+    - drop patch, applied upstream
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 26 Mar 2014 16:02:04 +0000
+
 telepathy-glib (0.23.3-1) unstable; urgency=low
 
   * New upstream release (release candidate for 0.24.0)
diff --git a/debian/patches/0001-Don-t-leak-method-call-results-regression-in-0.23.1.patch b/debian/patches/0001-Don-t-leak-method-call-results-regression-in-0.23.1.patch
deleted file mode 100644
index fd491a1..0000000
--- a/debian/patches/0001-Don-t-leak-method-call-results-regression-in-0.23.1.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Tue, 18 Mar 2014 13:51:16 +0000
-Subject: Don't leak method call results (regression in 0.23.1)
-
-Commit 7ffbde3f used common code for two blocks that were not actually
-the same. dbus-glib method calls give the caller a new reference
-to the results, whereas dbus-glib signals do not. As a result,
-the method-call case needs to either free the results, or get them
-freed by giving ownership to the GValueArray. I chose to give
-ownership.
-
-Reviewed-by: Guillaume Desmottes
-Origin: upstream, 0.23.4, commit:164cf33347e03e3d04f013ec7f710d991825cd66
----
- tools/glib-client-gen.py |  6 +++---
- tools/libglibcodegen.py  | 21 +++++++++++++++++++++
- 2 files changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/tools/glib-client-gen.py b/tools/glib-client-gen.py
-index a0fecf0..b7edbc0 100644
---- a/tools/glib-client-gen.py
-+++ b/tools/glib-client-gen.py
-@@ -29,8 +29,8 @@ from getopt import gnu_getopt
- 
- from libtpcodegen import file_set_contents, key_by_name, u
- from libglibcodegen import (Signature, type_to_gtype,
--        get_docstring, xml_escape, get_deprecated, copy_into_gvalue)
--
-+        get_docstring, xml_escape, get_deprecated, copy_into_gvalue,
-+        move_into_gvalue)
- 
- NS_TP = "http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
- 
-@@ -545,7 +545,7 @@ class Generator(object):
-                 self.b('  g_value_unset (args->values + %d);' % i)
-                 self.b('  g_value_init (args->values + %d, %s);' % (i, gtype))
- 
--                self.b('  ' + copy_into_gvalue('args->values + %d' % i,
-+                self.b('  ' + move_into_gvalue('args->values + %d' % i,
-                     gtype, marshaller, name))
- 
-             self.b('  tp_proxy_pending_call_v0_take_results (user_data, '
-diff --git a/tools/libglibcodegen.py b/tools/libglibcodegen.py
-index 0b703a5..5c76f07 100644
---- a/tools/libglibcodegen.py
-+++ b/tools/libglibcodegen.py
-@@ -171,6 +171,27 @@ def type_to_gtype(s):
-     # we just don't know ..
-     raise Exception("don't know the GType for " + s)
- 
-+def move_into_gvalue(gvaluep, gtype, marshaller, name):
-+    if gtype == 'G_TYPE_STRING':
-+        return 'g_value_take_string (%s, %s);' % (gvaluep, name)
-+    elif marshaller == 'BOXED':
-+        return 'g_value_take_boxed (%s, %s);' % (gvaluep, name)
-+    elif gtype == 'G_TYPE_UCHAR':
-+        return 'g_value_set_uchar (%s, %s);' % (gvaluep, name)
-+    elif gtype == 'G_TYPE_BOOLEAN':
-+        return 'g_value_set_boolean (%s, %s);' % (gvaluep, name)
-+    elif gtype == 'G_TYPE_INT':
-+        return 'g_value_set_int (%s, %s);' % (gvaluep, name)
-+    elif gtype == 'G_TYPE_UINT':
-+        return 'g_value_set_uint (%s, %s);' % (gvaluep, name)
-+    elif gtype == 'G_TYPE_INT64':
-+        return 'g_value_set_int (%s, %s);' % (gvaluep, name)
-+    elif gtype == 'G_TYPE_UINT64':
-+        return 'g_value_set_uint64 (%s, %s);' % (gvaluep, name)
-+    elif gtype == 'G_TYPE_DOUBLE':
-+        return 'g_value_set_double (%s, %s);' % (gvaluep, name)
-+    else:
-+        raise AssertionError("Don't know how to put %s in a GValue" % gtype)
- 
- def copy_into_gvalue(gvaluep, gtype, marshaller, name):
-     if gtype == 'G_TYPE_STRING':
diff --git a/debian/patches/series b/debian/patches/series
index 93a108d..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-Don-t-leak-method-call-results-regression-in-0.23.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib.git