[Pkg-telepathy-commits] [SCM] Idle packaging branch, debian, updated. debian/0.1.16-1

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 58b51c95ba531577c767dcda5d2c15a514bd942f
Author: Simon McVittie <smcv at debian.org>
Date:   Wed May 1 16:09:06 2013 +0100

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 31cbce8..240deae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+telepathy-idle (0.1.16-1) unstable; urgency=low
+
+  * New upstream release
+    - adds support for interactive TLS certificate verification
+      (Closes: #706270)
+  * Add a patch to avoid use of a telepathy-glib 0.20 header, to make
+    this easy to backport to wheezy
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 01 May 2013 15:52:26 +0100
+
 telepathy-idle (0.1.15-1) unstable; urgency=low
 
   * Merge from experimental to unstable
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
new file mode 100644
index 0000000..5997366
--- /dev/null
+++ b/debian/patches/0001-Don-t-use-telepathy-glib-dbus.h-with-older-telepathy.patch
@@ -0,0 +1,70 @@
+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
index e69de29..e81f014 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Don-t-use-telepathy-glib-dbus.h-with-older-telepathy.patch

-- 
Idle packaging