[Pkg-telepathy-commits] [telepathy-idle] 25/26: drop patch backporting Idle to telepathy-glib 0.18, no longer needed

[Simon McVittie]

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

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

commit 7e6b37526550cd22b2c67740db447b53327fa25b
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Jan 27 15:33:52 2014 +0000

    drop patch backporting Idle to telepathy-glib 0.18, no longer needed
---
 debian/changelog                                   |  1 +
 ...elepathy-glib-dbus.h-with-older-telepathy.patch | 70 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 71 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e5505e..bf6c52f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ telepathy-idle (0.2.0-1) UNRELEASED; urgency=low
 
   * New upstream release
     - update dependencies
+    - drop patch backporting Idle to telepathy-glib 0.18, no longer needed
   * Remove obsolete Debian-specific man page, superseded upstream
   * Remove update-patches.mk and README.source: this is now a perfectly
     ordinary git-buildpackage + quilt package (and gbp-pq can be used to
diff --git a/debian/patches/0001-Don-t-use-telepathy-glib-dbus.h-with-older-telepathy.patch b/debian/patches/0001-Don-t-use-telepathy-glib-dbus.h-with-older-telepathy.patch
deleted file mode 100644
index 5997366..0000000
--- a/debian/patches/0001-Don-t-use-telepathy-glib-dbus.h-with-older-telepathy.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Wed, 1 May 2013 16:08:54 +0100
-Subject: Don't use telepathy-glib-dbus.h with older telepathy-glib
-
-Forwarded: no, this is horrible. Upstream we should just depend on 0.20.
----
- src/server-tls-channel.c |    9 ++++++++-
- src/server-tls-manager.c |    8 +++++++-
- src/tls-certificate.c    |    9 ++++++++-
- 3 files changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c
-index aa2ef62..ad3de5e 100644
---- a/src/server-tls-channel.c
-+++ b/src/server-tls-channel.c
-@@ -24,7 +24,14 @@
- 
- #include <gio/gio.h>
- #include <telepathy-glib/telepathy-glib.h>
--#include <telepathy-glib/telepathy-glib-dbus.h>
-+
-+#if TP_MAJOR_VERSION > 0 || TP_MINOR_VERSION >= 20
-+#   include <telepathy-glib/telepathy-glib-dbus.h>
-+#else
-+#   include <telepathy-glib/gtypes.h>
-+#   include <telepathy-glib/interfaces.h>
-+#   include <telepathy-glib/svc-channel.h>
-+#endif
- 
- #define IDLE_DEBUG_FLAG IDLE_DEBUG_TLS
- #include "idle-debug.h"
-diff --git a/src/server-tls-manager.c b/src/server-tls-manager.c
-index b14cecd..efe55e4 100644
---- a/src/server-tls-manager.c
-+++ b/src/server-tls-manager.c
-@@ -22,7 +22,13 @@
- #include "server-tls-manager.h"
- 
- #include <telepathy-glib/telepathy-glib.h>
--#include <telepathy-glib/telepathy-glib-dbus.h>
-+
-+#if TP_MAJOR_VERSION > 0 || TP_MINOR_VERSION >= 20
-+#   include <telepathy-glib/telepathy-glib-dbus.h>
-+#else
-+#   include <telepathy-glib/gtypes.h>
-+#   include <telepathy-glib/interfaces.h>
-+#endif
- 
- #define IDLE_DEBUG_FLAG IDLE_DEBUG_TLS
- #include "idle-debug.h"
-diff --git a/src/tls-certificate.c b/src/tls-certificate.c
-index 467d13e..2b3a940 100644
---- a/src/tls-certificate.c
-+++ b/src/tls-certificate.c
-@@ -22,7 +22,14 @@
- #include "tls-certificate.h"
- 
- #include <telepathy-glib/telepathy-glib.h>
--#include <telepathy-glib/telepathy-glib-dbus.h>
-+
-+#if TP_MAJOR_VERSION > 0 || TP_MINOR_VERSION >= 20
-+#   include <telepathy-glib/telepathy-glib-dbus.h>
-+#else
-+#   include <telepathy-glib/gtypes.h>
-+#   include <telepathy-glib/interfaces.h>
-+#   include <telepathy-glib/svc-tls.h>
-+#endif
- 
- #define IDLE_DEBUG_FLAG IDLE_DEBUG_TLS
- #include "idle-debug.h"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e81f014..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Don-t-use-telepathy-glib-dbus.h-with-older-telepathy.patch

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