Control: tags 824739 + patch
Control: tags 824739 + pending
I've prepared an NMU for telepathy-haze (versioned as 0.8.0-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.
As with telepathy-salut, I've done this as an NMU since I don't really
consider myself to be part of the pkg-telepathy team any more. However,
I have included pending changes from pkg-telepathy git (removing myself
and Jonny Lamb from Uploaders), and I have pushed the NMU changes
(except for the final changelog entry) to pkg-telepathy git for your
convenience. Please revert any changes you don't want.
It would be great if someone active in this team could do a round of
testing and uploads before stretch, to update all the Uploaders
(and make sure everything still builds).
Thanks,
S
diffstat for telepathy-haze-0.8.0 telepathy-haze-0.8.0
changelog | 15 +++++++++++++++
control | 4 +---
patches/purple-2.0.12.patch | 25 +++++++++++++++++++++++++
patches/series | 1 +
4 files changed, 42 insertions(+), 3 deletions(-)
diff -Nru telepathy-haze-0.8.0/debian/changelog telepathy-haze-0.8.0/debian/changelog
--- telepathy-haze-0.8.0/debian/changelog 2014-09-16 19:10:55.000000000 +0100
+++ telepathy-haze-0.8.0/debian/changelog 2016-12-13 21:22:54.000000000 +0000
@@ -1,3 +1,18 @@
+telepathy-haze (0.8.0-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload, incorporating pending changes from
+ pkg-telepathy git.
+
+ [ Simon McVittie ]
+ * Remove myself from Uploaders
+ * d/p/purple-2.0.12.patch: add patch by Koop Mast from FreeBSD
+ to fix build with recent libpurple (Closes: #824739)
+
+ [ Jonny Lamb ]
+ * Remove myself from Uploaders.
+
+ -- Simon McVittie <s...@debian.org> Tue, 13 Dec 2016 21:22:54 +0000
+
telepathy-haze (0.8.0-2) unstable; urgency=medium
* debian/watch: only watch for 0.x stable versions
diff -Nru telepathy-haze-0.8.0/debian/control telepathy-haze-0.8.0/debian/control
--- telepathy-haze-0.8.0/debian/control 2014-09-16 19:10:55.000000000 +0100
+++ telepathy-haze-0.8.0/debian/control 2016-12-13 21:22:54.000000000 +0000
@@ -2,9 +2,7 @@
Section: net
Priority: optional
Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintain...@lists.alioth.debian.org>
-Uploaders: Laurent Bigonville <bi...@debian.org>,
- Simon McVittie <s...@debian.org>,
- Jonny Lamb <jo...@debian.org>
+Uploaders: Laurent Bigonville <bi...@debian.org>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
dpkg-dev (>= 1.16.1~),
diff -Nru telepathy-haze-0.8.0/debian/patches/purple-2.0.12.patch telepathy-haze-0.8.0/debian/patches/purple-2.0.12.patch
--- telepathy-haze-0.8.0/debian/patches/purple-2.0.12.patch 1970-01-01 01:00:00.000000000 +0100
+++ telepathy-haze-0.8.0/debian/patches/purple-2.0.12.patch 2016-12-13 21:22:54.000000000 +0000
@@ -0,0 +1,25 @@
+From: Koop Mast <kwm freebsd org>
+Date: Mon, 11 Jan 2016 11:53:23 +0100
+Subject: Fix the build with libpurple 2.0.12
+
+http://pidgin.im/pipermail/devel/2015-March/023639.html
+Replaces the old emu with the _PASSIVE.
+
+Origin: vendor, FreeBSD, https://lists.freebsd.org/pipermail/svn-ports-head/2016-January/111612.html
+---
+ src/media-stream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/media-stream.c b/src/media-stream.c
+index 7b4f29f..da088d1 100644
+--- a/src/media-stream.c
++++ b/src/media-stream.c
+@@ -1076,7 +1076,7 @@ haze_media_stream_new_native_candidate (TpSvcMediaStreamHandler *iface,
+ if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP)
+ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP;
+ else if (proto == TP_MEDIA_STREAM_BASE_PROTO_TCP)
+- protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP;
++ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE;
+ else
+ DEBUG ("Unknown network protocol");
+
diff -Nru telepathy-haze-0.8.0/debian/patches/series telepathy-haze-0.8.0/debian/patches/series
--- telepathy-haze-0.8.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ telepathy-haze-0.8.0/debian/patches/series 2016-12-13 21:22:54.000000000 +0000
@@ -0,0 +1 @@
+purple-2.0.12.patch
