[Pkg-telepathy-commits] [empathy] 11/12: Remove patch, applied upstream

[Simon McVittie]

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

smcv pushed a commit to branch telepathy1
in repository empathy.

commit f9d7d5daa39c2eeb7bf3cb0406b94f53047f71b4
Author: Simon McVittie <smcv at debian.org>
Date:   Wed May 14 12:04:01 2014 +0100

    Remove patch, applied upstream
---
 ...entally-linking-to-telepathy-logger-s-pri.patch | 37 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 38 deletions(-)

diff --git a/debian/patches/0001-Avoid-accidentally-linking-to-telepathy-logger-s-pri.patch b/debian/patches/0001-Avoid-accidentally-linking-to-telepathy-logger-s-pri.patch
deleted file mode 100644
index 027877e..0000000
--- a/debian/patches/0001-Avoid-accidentally-linking-to-telepathy-logger-s-pri.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1b4ec57cc8544f6db3d7776f10716ad342969da6 Mon Sep 17 00:00:00 2001
-From: Simon McVittie <simon.mcvittie at collabora.co.uk>
-Date: Thu, 3 Apr 2014 20:06:26 +0100
-Subject: [PATCH] Avoid accidentally linking to telepathy-logger's private API
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=727162
----
- libempathy/action-chain-internal.h | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-diff --git a/libempathy/action-chain-internal.h b/libempathy/action-chain-internal.h
-index 14750c9..1b8756f 100644
---- a/libempathy/action-chain-internal.h
-+++ b/libempathy/action-chain-internal.h
-@@ -24,6 +24,19 @@
- #include <glib-object.h>
- #include <gio/gio.h>
- 
-+/* Avoid accidentally using the symbols exported by the telepathy-logger
-+ * library (GNOME#727162) */
-+#define _tpl_action_chain_new_async   _empathy_action_chain_new_async
-+#define _tpl_action_chain_free        _empathy_action_chain_free
-+#define _tpl_action_chain_append      _empathy_action_chain_append
-+#define _tpl_action_chain_prepend     _empathy_action_chain_prepend
-+#define _tpl_action_chain_start       _empathy_action_chain_start
-+#define _tpl_action_chain_continue    _empathy_action_chain_continue
-+#define _tpl_action_chain_terminate   _empathy_action_chain_terminate
-+#define _tpl_action_chain_clear       _empathy_action_chain_clear
-+#define _tpl_action_chain_get_object  _empathy_action_chain_get_object
-+#define _tpl_action_chain_new_finish  _empathy_action_chain_new_finish
-+
- typedef struct {
-     GQueue *chain;
-     GSimpleAsyncResult *simple;
--- 
-1.9.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 91c27c9..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-Avoid-accidentally-linking-to-telepathy-logger-s-pri.patch

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