debian/0000775000000000000000000000000012260240037007164 5ustar debian/update-patches.mk0000664000000000000000000000055412021115374012430 0ustar update-patches: mkdir -p $(CURDIR)/debian/patches rm -f $(CURDIR)/debian/patches/*.patch git format-patch -o $(CURDIR)/debian/patches debian-patches ^upstream for patch in $$(ls $(CURDIR)/debian/patches/*.patch) ; \ do \ lines=$$(cat $$patch | wc -l) ; \ head -n $$(($$lines - 3)) $$patch > $${patch}.chomped ; \ mv $${patch}.chomped $$patch ; \ done debian/libtelepathy-farstream2.symbols0000664000000000000000000000116512021115374015333 0ustar libtelepathy-farstream.so.2 libtelepathy-farstream2 #MINVER# * Build-Depends-Package: libtelepathy-farstream-dev tf_channel_bus_message@Base 0.1.0 tf_channel_get_type@Base 0.1.0 tf_channel_new_async@Base 0.1.0 tf_channel_new_finish@Base 0.2.2 tf_content_error@Base 0.1.0 tf_content_error_literal@Base 0.1.0 tf_content_get_type@Base 0.1.0 tf_content_iterate_src_pads@Base 0.1.1 tf_content_get_type@Base 0.2.1 tf_content_iterate_src_pads@Base 0.2.1 tf_content_receiving_failed@Base 0.2.1 tf_content_receiving_failed_literal@Base 0.2.1 tf_content_sending_failed@Base 0.2.1 tf_content_sending_failed_literal@Base 0.2.1 debian/source/0000775000000000000000000000000012021115374010464 5ustar debian/source/format0000664000000000000000000000001412021115374011672 0ustar 3.0 (quilt) debian/copyright0000664000000000000000000000440412021115374011121 0ustar This package was debianized by Sjoerd Simons on Fri, 05 Dec 2008 19:02:32 +0000. It was downloaded from: http://telepathy.freedesktop.org/releases/telepathy-farstream/ Upstream Authors: Olivier Crete Files: * Copyright: Copyright (C) 2006-2011 Collabora Ltd. Copyright (C) 2006-2008 Nokia Corporation License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. On Debian systems the full text of the LGPL 2.1 can be found in the `/usr/share/common-licenses/LGPL-2.1' file. File: python/common.h Copyright: Copyright 2004 Johan Dahlin License: LGPL-2+ On Debian systems the full text of the LGPL 2 can be found in the `/usr/share/common-licenses/LGPL-2' file. File: python/pygstminiobject.* Copyright: Copyright 1998-2003 James Henstridge License: LGPL-2.1+ On Debian systems the full text of the LGPL 2.1 can be found in the `/usr/share/common-licenses/LGPL-2.1' file. File: python/codegen/reversewrapper.py Copyright: Copyright (C) 2004 Gustavo Carneiro License: LGPL-2.1+ On Debian systems the full text of the LGPL 2.1 can be found in the `/usr/share/common-licenses/LGPL-2.1' file. File: python/codegen/h2def.py Copyright: Copyright Toby D. Reeves License: GPL-2 On Debian systems the full text of the GPL 2 can be found in the `/usr/share/common-licenses/GPL-2' file. Files: python/codegen/* Copyright: Copyright (C) 2002, 2004 David I. Lehn Copyright (C) 2004 Johan Dahlin License: LGPL-2.1+ On Debian systems the full text of the LGPL 2.1 can be found in the `/usr/share/common-licenses/LGPL-2.1' file. Files: debian/* Copyright: Copyright 2008 Sjoerd Simons License: GPL-2 On Debian systems the full text of the GPL 2 can be found in the `/usr/share/common-licenses/GPL-2' file. debian/compat0000664000000000000000000000000212021115374010362 0ustar 9 debian/python-tpfarstream.install0000664000000000000000000000006512021115374014424 0ustar debian/tmp/usr/lib/python*/*-packages/tpfarstream.so debian/libtelepathy-farstream-0.4-dev.install0000664000000000000000000000015312021115374016276 0ustar usr/lib/*/libtelepathy-farstream.so usr/lib/*/libtelepathy-farstream.a usr/lib/*/pkgconfig/* usr/include/* debian/libtelepathy-farstream2.install0000664000000000000000000000004612021115374015306 0ustar usr/lib/*/libtelepathy-farstream.so.* debian/libtelepathy-farstream-0.4-doc.install0000664000000000000000000000002412021115374016262 0ustar usr/share/gtk-doc/* debian/gbp.conf0000664000000000000000000000023312021115374010601 0ustar [DEFAULT] debian-branch = debian upstream-branch = upstream pristine-tar = True [git-buildpackage] tarball-dir = ../tarballs/ export-dir = ../build-area/ debian/changelog0000664000000000000000000000472412260237767011065 0ustar telepathy-farstream-0.4 (0.4.0-3ubuntu2) trusty; urgency=medium * Build with dh-autoreconf for new libtool. -- William Grant Mon, 30 Dec 2013 09:39:02 +0000 telepathy-farstream-0.4 (0.4.0-3ubuntu1) raring; urgency=low * Make parallel installable with 0.6; the 'telepathy-farstream' package is being moved to this 0.6 series but not all reverse-depends have been ported to GStreamer 1.0 yet, which is a new dependency of this series. + Rename -dev and -doc package to include -0.4 + Rename unversioned .so library to include -0.4 + Move headers to ${includedir}/telepathy-1.0-compat + Update pcfile to refer to the above and rename it to telepathy-farstream-0.4.pc -- Iain Lane Wed, 09 Jan 2013 10:34:47 +0000 telepathy-farstream (0.4.0-3) unstable; urgency=low * debian/patches/Set-RemoteContact-when-accepting-updating-media-desc.patch + Added. Fix updating media scriptions, fixes Theora video calling (Closes: #686564) -- Sjoerd Simons Mon, 03 Sep 2012 13:56:07 +0200 telepathy-farstream (0.4.0-2) unstable; urgency=low * Upload to unstable -- Laurent Bigonville Sun, 29 Apr 2012 22:11:28 +0200 telepathy-farstream (0.4.0-1) experimental; urgency=low * New upstream release - Bump libglib2.0-dev build-dependency * Build for multiarch * debian/control: - Add Uploaders field - Bump Standards-Version to 3.9.3 (no further changes) - Bump debhelper to 9 - Bump cdbs build-dependency - Fix Description: s/Farsight2/Farstream/ -- Laurent Bigonville Wed, 11 Apr 2012 21:35:55 +0200 telepathy-farstream (0.2.3-1) experimental; urgency=low * New upstream release -- Sjoerd Simons Thu, 22 Mar 2012 21:46:47 +0100 telepathy-farstream (0.2.2-1) experimental; urgency=low * New upstream release * Sync with ubuntu packaging from Ken VanDine * Target experimental -- Sjoerd Simons Sat, 10 Mar 2012 14:19:08 +0100 telepathy-farstream (0.1.2-1) experimental; urgency=low [ Laurent Bigonville ] * debian/control: - Add Vcs- fields [ Sjoerd Simons ] * New upstream release -- Sjoerd Simons Fri, 18 Nov 2011 17:32:23 +0000 telepathy-farstream (0.1.1-1) experimental; urgency=low * Initial release, based on telepathy-farsight. Closes: #634345. -- Emilio Pozuelo Monfort Mon, 18 Jul 2011 20:11:36 +0100 debian/control0000664000000000000000000001021712260237767010610 0ustar Source: telepathy-farstream-0.4 Section: libs Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Telepathy maintainers Uploaders: Sjoerd Simons , Laurent Bigonville Build-Depends: debhelper (>= 9), cdbs (>= 0.4.93~), dh-autoreconf, libglib2.0-dev (>= 2.30), libdbus-1-dev (>= 0.60), libdbus-glib-1-dev (>= 0.60), libgstreamer0.10-dev, libfarstream-0.1-dev (>= 0.1.1), libtelepathy-glib-dev (>= 0.17.5), gtk-doc-tools Standards-Version: 3.9.3 Homepage: http://telepathy.freedesktop.org/ Vcs-Git: git://anonscm.debian.org/pkg-telepathy/telepathy-farstream.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-telepathy/telepathy-farstream.git Package: libtelepathy-farstream2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same Description: Glue library between telepathy and farstream - 0.4 series Telepathy-farstream is a helper library to glue together Telepathy's media signalling and the media streaming capabilities of Farstream. . Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications. . Farstream is a framework for media streaming in audio/video conferences. . This package contains the core telepathy-farstream library. Package: libtelepathy-farstream2-dbg Section: debug Architecture: any Priority: extra Depends: libtelepathy-farstream2 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same Description: Glue library between telepathy and farstream (debug symbols) Telepathy-farstream is a helper library to glue together Telepathy's media signalling and the media streaming capabilities of Farstream. . Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications. . Farstream is a framework for media streaming in audio/video conferences. . This package contains debugging symbols for the 0.4 series of the telepathy-farstream library which links against GStreamer 0.10 instead of 1.0. Package: libtelepathy-farstream-0.4-dev Section: libdevel Architecture: any Depends: libtelepathy-farstream2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libglib2.0-dev (>= 2.16), libdbus-glib-1-dev (>= 0.60), libfarstream-0.1-dev (>= 0.1.1), libtelepathy-glib-dev (>= 0.13.4), libgstreamer0.10-dev Description: Glue library between telepathy and farstream (development files) A helper library to glue together Telepathy's media signalling and the media streaming capabilities of Farstream . Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications. . Farstream is a framework for media streaming in audio/video conferences. . This package contains development files for the 0.4 telepathy-farstream library which links against GStreamer 0.10 instead of 1.0. Package: libtelepathy-farstream-0.4-doc Section: doc Architecture: all Depends: lynx | www-browser, ${misc:Depends} Suggests: devhelp Description: Glue library between telepathy and farstream (documentation) A helper library to glue together Telepathy's media signalling and the media streaming capabilities of Farstream . Telepathy is a D-Bus framework for unifying real time communication, including instant messaging, voice calls and video calls. It abstracts differences between protocols to provide a unified interface for applications. . Farstream is a framework for media streaming in audio/video conferences. . This package contains HTML documentation for the 0.4 series of the telepathy-farstream library. debian/watch0000664000000000000000000000015412021115374010215 0ustar version=3 http://telepathy.freedesktop.org/releases/telepathy-farstream/telepathy\-farstream\-(.*)\.tar\.gz debian/patches/0000775000000000000000000000000012021115374010613 5ustar debian/patches/series0000664000000000000000000000007312021115374012030 0ustar Set-RemoteContact-when-accepting-updating-media-desc.patch debian/patches/Set-RemoteContact-when-accepting-updating-media-desc.patch0000664000000000000000000001023512021115374023631 0ustar From 0c96f96c732a0f2489afd6df1b0dbeb9a2c2beed Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Mon, 3 Sep 2012 11:49:54 +0200 Subject: [PATCH] Set RemoteContact when accepting & updating media descriptions --- telepathy-farstream/call-content.c | 64 ++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 17 deletions(-) diff --git a/telepathy-farstream/call-content.c b/telepathy-farstream/call-content.c index 1d7da9d..c1fe974 100644 --- a/telepathy-farstream/call-content.c +++ b/telepathy-farstream/call-content.c @@ -894,12 +894,12 @@ process_media_description (TfCallContent *self, fsstream = tf_call_content_get_existing_fsstream_by_handle (self, contact_handle); + self->current_md_contact_handle = contact_handle; if (!fsstream) { g_debug ("Delaying codec media_description processing"); self->current_media_description = proxy; - self->current_md_contact_handle = contact_handle; self->current_md_fscodecs = fscodecs; self->current_md_rtp_hdrext = fsrtp_hdrext; return; @@ -1937,11 +1937,25 @@ fscodecs_to_media_descriptions (TfCallContent *self, GList *codecs) } static void +media_description_updated_cb (TpCallContent *proxy, + const GError *error, + gpointer user_data, + GObject *weak_object) +{ + if (error == NULL) + g_debug ("Local media description set"); + else + g_debug ("Local media description error: %s", error->message); + +} + +static void tf_call_content_try_sending_codecs (TfCallContent *self) { GList *codecs; GHashTable *media_description; const gchar *codecs_prop = NULL; + guint i; if (self->current_md_fscodecs != NULL) { @@ -1950,7 +1964,7 @@ tf_call_content_try_sending_codecs (TfCallContent *self) return; } - g_debug ("updating local codecs"); + g_debug ("updating local codecs: %d", TF_CONTENT (self)->sending_count); if (TF_CONTENT (self)->sending_count == 0) codecs_prop = "codecs-without-config"; @@ -1963,32 +1977,48 @@ tf_call_content_try_sending_codecs (TfCallContent *self) return; media_description = fscodecs_to_media_descriptions (self, codecs); - - if (self->current_media_description) + if (!media_description) { - g_debug ("Accepting Media Description"); + fs_codec_list_destroy (codecs); + return; + } - tp_cli_call_content_media_description_call_accept ( - self->current_media_description, -1, media_description, - NULL, NULL, NULL, NULL); + TF_CALL_CONTENT_LOCK (self); - g_object_unref (self->current_media_description); - self->current_media_description = NULL; - } - else + for (i = 0; i < self->fsstreams->len; i++) { - if (media_description) + struct CallFsStream *cfs = g_ptr_array_index (self->fsstreams, i); + + tp_asv_set_uint32 (media_description, + TP_PROP_CALL_CONTENT_MEDIA_DESCRIPTION_REMOTE_CONTACT, + cfs->contact_handle); + + if (self->current_media_description && + self->current_md_contact_handle == cfs->contact_handle) { - g_debug ("Updating local Media Description"); - tp_cli_call_content_interface_media_call_update_local_media_description ( - self->proxy, -1, media_description, NULL, NULL, NULL, NULL); + g_debug ("Accepting Media Description for contact: %u", + cfs->contact_handle); + + tp_cli_call_content_media_description_call_accept ( + self->current_media_description, -1, media_description, + NULL, NULL, NULL, NULL); + + g_object_unref (self->current_media_description); + self->current_media_description = NULL; } else { - fs_codec_list_destroy (codecs); + g_debug ("Updating local Media Description for contact %u", + cfs->contact_handle); + + tp_cli_call_content_interface_media_call_update_local_media_description ( + self->proxy, -1, media_description, + media_description_updated_cb, NULL, NULL, NULL); } } + TF_CALL_CONTENT_UNLOCK (self); + if (media_description) { fs_codec_list_destroy (self->last_sent_codecs); -- 1.7.10.4 debian/rules0000775000000000000000000000316012260237767010264 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk common-binary-post-install-arch:: list-missing export DPKG_GENSYMBOLS_CHECK_LEVEL = 4 DEB_CONFIGURE_EXTRA_FLAGS = --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --enable-gtk-doc \ --disable-python ifneq (,$(findstring coverage,$(DEB_BUILD_OPTIONS))) DEB_CONFIGURE_EXTRA_FLAGS += --enable-coverage endif DEV_PKG_ROOT := debian/libtelepathy-farstream-0.4-dev DEV_PKG_LIB := $(DEV_PKG_ROOT)/usr/lib/$(DEB_HOST_MULTIARCH) DEV_PKG_INCLUDE := $(DEV_PKG_ROOT)/usr/include binary-post-install/libtelepathy-farstream-0.4-dev:: mv $(DEV_PKG_INCLUDE)/telepathy-1.0 \ $(DEV_PKG_INCLUDE)/telepathy-1.0-compat mv $(DEV_PKG_LIB)/libtelepathy-farstream.so \ $(DEV_PKG_LIB)/libtelepathy-farstream-0.4.so mv $(DEV_PKG_LIB)/libtelepathy-farstream.a \ $(DEV_PKG_LIB)/libtelepathy-farstream-0.4.a mv $(DEV_PKG_LIB)/pkgconfig/telepathy-farstream.pc \ $(DEV_PKG_LIB)/pkgconfig/telepathy-farstream-0.4.pc sed -i -e 's/-ltelepathy-farstream/-ltelepathy-farstream-0.4/' \ -e 's!-I\$${includedir}/telepathy-1.0!-I\$${includedir}/telepathy-1.0-compat!' \ $(DEV_PKG_LIB)/pkgconfig/telepathy-farstream-0.4.pc DOC_PKG_GTKDOC := debian/libtelepathy-farstream-0.4-doc/usr/share/gtk-doc/html binary-post-install/libtelepathy-farstream-0.4-doc:: mv $(DOC_PKG_GTKDOC)/telepathy-farstream \ $(DOC_PKG_GTKDOC)/telepathy-farstream-0.4 include $(CURDIR)/debian/update-patches.mk debian/README.source0000664000000000000000000000353312021115374011347 0ustar Patches ======= This package occasionally uses cdbs simple-patch-system to store modifications to the upstream source, although in most uploads no patches are needed. To get the fully patched source: make -f debian/rules patch To revert to what's in git: make -f debian/rules unpatch To add a patch: obtain a diff and put it in debian/patches, or see below To remove an existing patch: delete it from debian/patches Packaging using git =================== The repository contains an appropriate debian/gbp.conf to build this package using git-buildpackage. The debian branch contains the latest upstream versions (for unstable, or experimental while a freeze is in progress). The debian-lenny branch contains versions targeted for lenny, etc. Here's how to build it: git clone git://git.debian.org/git/pkg-telepathy/telepathy-farstream cd telepathy-farstream git checkout debian git-buildpackage -us -uc or for testing/stable branches like debian-lenny: git clone git://git.debian.org/git/pkg-telepathy/telepathy-farstream cd telepathy-farstream git checkout debian-lenny git-buildpackage -us -uc --git-debian-branch=debian-lenny The branch 'upstream' is a copy of the contents of upstream tarballs. To import upstream tarballs use: git checkout debian git-import-orig ~/telepathy-farstream-0.0.x.tar.gz The branch 'debian-patches' is 'upstream' plus any patches needed for Debian. It should be rebased on upstream after each upstream release: git checkout debian-patches git rebase upstream The preferred way of adding patches is to cherry pick from an upstream repository: git remote add collabora \ git+ssh://git.collabora.co.uk/git/telepathy-farstream.git git fetch git checkout debian-patches git cherry-pick xxxxxxxxxxxxxx git checkout debian fakeroot debian/rules update-patches