Your message dated Tue, 15 May 2012 11:08:52 +0000
with message-id <e1sufca-0003ry...@franck.debian.org>
and subject line Bug#664527: fixed in pidgin 2.10.4-1.1
has caused the Debian Bug report #664527,
regarding pidgin: libpurple0 depends on libgstfarsight0.10-0, which conflicts 
with empathy
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
664527: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664527
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: libpurple0
Version: 2.10.2-2
Severity: important
Tags: upstream patch

farsight2 is being deprecated and replaced with farstream. This change has
been already made in empathy, and it's preventing people from having
both installed simultaneously.

There is code on pidgin's bugtracker to make the switch, see
http://developer.pidgin.im/ticket/14936

I have patched the pidgin deb with that patch and updated it accordingly,
and it builds, installs and runs fine (I haven't tested the actual video
call functionality though). I attach a debdiff with these changes.

-- System Information:
Debian Release: wheezy/sid
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'testing'), (300, 'unstable'), 
(120, 'experimental'), (110, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-10.dmz.1-liquorix-amd64 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=es_AR.utf8, LC_CTYPE=es_AR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages pidgin depends on:
ii  gconf2                      3.2.3-3
ii  libatk1.0-0                 2.2.0-2
ii  libc6                       2.13-27
ii  libcairo2                   1.10.2-7
ii  libdbus-1-3                 1.4.18-1
ii  libdbus-glib-1-2            0.98-1
ii  libfontconfig1              2.8.0-3.1
ii  libfreetype6                2.4.8-1
ii  libgdk-pixbuf2.0-0          2.25.2-1
ii  libglib2.0-0                2.31.20-1
ii  libgstreamer0.10-0          0.10.36-1
ii  libgtk2.0-0                 2.24.10-1
ii  libgtkspell0                2.0.16-1
ii  libice6                     2:1.0.7-2
ii  libpango1.0-0               1.29.4-2
ii  libpurple0                  2.10.2-2
ii  libsm6                      2:1.2.0-2
ii  libx11-6                    2:1.4.4-4
ii  libxml2                     2.7.8.dfsg-7
ii  libxss1                     1:1.2.1-2
ii  perl-base [perlapi-5.14.2]  5.14.2-9
ii  pidgin-data                 2.10.2-1

Versions of packages pidgin recommends:
ii  gstreamer0.10-plugins-base  0.10.36-1
ii  gstreamer0.10-plugins-good  0.10.31-1

Versions of packages pidgin suggests:
ii  evolution-data-server  3.2.2-1
ii  gnome-panel            3.2.1-2+b1
ii  libsqlite3-0           3.7.10-1

-- no debconf information
diff -Nru pidgin-2.10.2/debian/changelog pidgin-2.10.2/debian/changelog
--- pidgin-2.10.2/debian/changelog	2012-03-14 23:12:09.000000000 -0300
+++ pidgin-2.10.2/debian/changelog	2012-03-18 10:36:58.000000000 -0300
@@ -1,3 +1,10 @@
+pidgin (2.10.2-2) unstable; urgency=low
+
+  * Patch pidgin to use farstream
+    - Fixes conflict with empathy
+
+ -- Emilio López <t...@tuxfamily.org>  Sun, 18 Mar 2012 10:36:43 -0300
+
 pidgin (2.10.2-1) unstable; urgency=medium
 
   * Imported Upstream version 2.10.2
diff -Nru pidgin-2.10.2/debian/control pidgin-2.10.2/debian/control
--- pidgin-2.10.2/debian/control	2012-03-14 23:12:09.000000000 -0300
+++ pidgin-2.10.2/debian/control	2012-03-18 13:05:30.000000000 -0300
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ari Pollak <a...@debian.org>
 Build-Depends: cdbs (>= 0.4.53), debhelper (>= 7), intltool, gconf2,
- hardening-wrapper,
+ hardening-wrapper, quilt, automake, autoconf, libtool,
  libgtk2.0-dev (>= 2.10.0), libxss-dev, libmeanwhile-dev,
  libnss3-dev (>= 3.11.7), tcl-dev, tk-dev, libgstreamer0.10-dev,
  libgtkspell-dev, libltdl3-dev, libperl-dev,
@@ -11,7 +11,7 @@
  libdbus-glib-1-dev, dbus, python (>= 2.4), libavahi-client-dev,
  libavahi-glib-dev, libxml-parser-perl, libncursesw5-dev, libsasl2-dev,
  libgadu-dev (>= 1:1.11.0-2),
- xsltproc, doxygen, libgstfarsight0.10-dev (>= 0.0.9),
+ xsltproc, doxygen, libfarstream-0.1-dev (>= 0.1.1),
  libgstreamer-plugins-base0.10-dev,
  network-manager-dev (>= 0.9.0) [linux-any],
  libsqlite3-dev (>= 3.3), libidn11-dev, ca-certificates
diff -Nru pidgin-2.10.2/debian/patches/port-to-farstream-v2.patch pidgin-2.10.2/debian/patches/port-to-farstream-v2.patch
--- pidgin-2.10.2/debian/patches/port-to-farstream-v2.patch	1969-12-31 21:00:00.000000000 -0300
+++ pidgin-2.10.2/debian/patches/port-to-farstream-v2.patch	2012-03-10 13:36:46.000000000 -0300
@@ -0,0 +1,447 @@
+diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac
+--- pidgin-2.10.1.orig/configure.ac	2011-12-06 10:44:32.000000000 +0200
++++ pidgin-2.10.1/configure.ac	2012-03-10 18:21:12.000000000 +0200
+@@ -780,18 +780,18 @@ else
+ fi
+ 
+ dnl #######################################################################
+-dnl # Check for Farsight
++dnl # Check for Farstream
+ dnl #######################################################################
+-AC_ARG_ENABLE(farsight,
+-	[AC_HELP_STRING([--disable-farsight], [compile without farsight support])],
+-	enable_farsight="$enableval", enable_farsight="yes")
+-if test "x$enable_farsight" != "xno"; then
+-	PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [
+-		AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
+-		AC_SUBST(FARSIGHT_CFLAGS)
+-		AC_SUBST(FARSIGHT_LIBS)
++AC_ARG_ENABLE(farstream,
++	[AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
++	enable_farstream="$enableval", enable_farstream="yes")
++if test "x$enable_farstream" != "xno"; then
++	PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
++		AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])
++		AC_SUBST(FARSTREAM_CFLAGS)
++		AC_SUBST(FARSTREAM_LIBS)
+ 	], [
+-		enable_farsight="no"
++		enable_farstream="no"
+ 	])
+ fi
+ 
+@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv,
+ 	[AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
+ 	enable_vv="$enableval", enable_vv="yes")
+ if test "x$enable_vv" != "xno"; then
+-	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then
++	if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
+ 		AC_DEFINE(USE_VV, 1, [Use voice and video])
+ 	else
+ 		enable_vv="no"
+ 		if test "x$force_deps" = "xyes"; then
+ 			AC_MSG_ERROR([
+ Dependencies for voice/video were not met.
+-Install the necessary gstreamer and farsight packages first.
++Install the necessary gstreamer and farstream packages first.
+ Or use --disable-vv if you do not need voice/video support.
+ 			])
+ 		fi
+ 	fi
+ fi
+-AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
++AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
+ 
+ dnl #######################################################################
+ dnl # Check for Internationalized Domain Name support
+diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am
+--- pidgin-2.10.1.orig/libpurple/Makefile.am	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/Makefile.am	2012-03-10 18:21:19.000000000 +0200
+@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \
+ 	$(LIBXML_LIBS) \
+ 	$(NETWORKMANAGER_LIBS) \
+ 	$(INTLLIBS) \
+-	$(FARSIGHT_LIBS) \
++	$(FARSTREAM_LIBS) \
+ 	$(GSTREAMER_LIBS) \
+ 	$(GSTINTERFACES_LIBS) \
+ 	$(IDN_LIBS) \
+@@ -322,7 +322,7 @@ AM_CPPFLAGS = \
+ 	$(DEBUG_CFLAGS) \
+ 	$(DBUS_CFLAGS) \
+ 	$(LIBXML_CFLAGS) \
+-	$(FARSIGHT_CFLAGS) \
++	$(FARSTREAM_CFLAGS) \
+ 	$(GSTREAMER_CFLAGS) \
+ 	$(GSTINTERFACES_CFLAGS) \
+ 	$(IDN_CFLAGS) \
+diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c
+--- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/media/backend-fs2.c	2012-03-10 18:21:19.000000000 +0200
+@@ -1,5 +1,5 @@
+ /**
+- * @file backend-fs2.c Farsight 2 backend for media API
++ * @file backend-fs2.c Farstream backend for media API
+  * @ingroup core
+  */
+ 
+@@ -34,8 +34,9 @@
+ #include "network.h"
+ #include "media-gst.h"
+ 
+-#include <gst/farsight/fs-conference-iface.h>
+-#include <gst/farsight/fs-element-added-notifier.h>
++#include <farstream/fs-conference.h>
++#include <farstream/fs-element-added-notifier.h>
++#include <farstream/fs-utils.h>
+ 
+ /** @copydoc _PurpleMediaBackendFs2Class */
+ typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
+@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream
+ 	gchar *participant;
+ 	FsStream *stream;
+ 
++        gboolean supports_add;
++
+ 	GstElement *src;
+ 	GstElement *tee;
+ 	GstElement *volume;
+@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private
+ 	FsConference *conference;
+ 	gchar *conference_type;
+ 
++        FsElementAddedNotifier *notifier;
++
+ 	GHashTable *sessions;
+ 	GHashTable *participants;
+ 
+@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject
+ 
+ 	purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n");
+ 
++	if (priv->notifier) {
++		g_object_unref(priv->notifier);
++		priv->notifier = NULL;
++	}
++
+ 	if (priv->confbin) {
+ 		GstElement *pipeline;
+ 
+@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus,
+ 			priv->conference != FS_CONFERENCE(src))
+ 		return;
+ 
+-	if (gst_structure_has_name(msg->structure, "farsight-error")) {
++	if (gst_structure_has_name(msg->structure, "farstream-error")) {
+ 		FsError error_no;
+ 		gst_structure_get_enum(msg->structure, "error-no",
+ 				FS_TYPE_ERROR, (gint*)&error_no);
+@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus,
+ 						" strict."));
+ 				purple_media_end(priv->media, NULL, NULL);
+ 				break;
+-			case FS_ERROR_UNKNOWN_CNAME:
+-			/*
+-			 * Unknown CName is only a problem for the
+-			 * multicast transmitter which isn't used.
+-			 * It is also deprecated.
+-			 */
+-				break;
+ 			default:
+ 				purple_debug_error("backend-fs2",
+-						"farsight-error: %i: %s\n",
++						"farstream-error: %i: %s\n",
+ 						error_no,
+ 					  	gst_structure_get_string(
+ 						msg->structure, "error-msg"));
+@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus,
+ 
+ 		if (FS_ERROR_IS_FATAL(error_no)) {
+ 			purple_media_error(priv->media, _("A non-recoverable "
+-					"Farsight2 error has occurred."));
++					"Farstream error has occurred."));
+ 			purple_media_end(priv->media, NULL, NULL);
+ 		}
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-new-local-candidate")) {
++			"farstream-new-local-candidate")) {
+ 		const GValue *value;
+ 		FsStream *stream;
+ 		FsCandidate *local_candidate;
+@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus,
+ 				session->id, name, candidate);
+ 		g_object_unref(candidate);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-local-candidates-prepared")) {
++			"farstream-local-candidates-prepared")) {
+ 		const GValue *value;
+ 		FsStream *stream;
+ 		FsParticipant *participant;
+@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus,
+ 		g_signal_emit_by_name(self, "candidates-prepared",
+ 				session->id, name);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-new-active-candidate-pair")) {
++			"farstream-new-active-candidate-pair")) {
+ 		const GValue *value;
+ 		FsStream *stream;
+ 		FsCandidate *local_candidate;
+@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus,
+ 		g_object_unref(lcandidate);
+ 		g_object_unref(rcandidate);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-recv-codecs-changed")) {
++			"farstream-recv-codecs-changed")) {
+ 		const GValue *value;
+ 		GList *codecs;
+ 		FsCodec *codec;
+@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus,
+ 		codec = codecs->data;
+ 
+ 		purple_debug_info("backend-fs2",
+-				"farsight-recv-codecs-changed: %s\n",
++				"farstream-recv-codecs-changed: %s\n",
+ 				codec->encoding_name);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-component-state-changed")) {
++			"farstream-component-state-changed")) {
+ 		const GValue *value;
+ 		FsStreamState fsstate;
+ 		guint component;
+@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus,
+ 		}
+ 
+ 		purple_debug_info("backend-fs2",
+-				"farsight-component-state-changed: "
++				"farstream-component-state-changed: "
+ 				"component: %u state: %s\n",
+ 				component, state);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-send-codec-changed")) {
++			"farstream-send-codec-changed")) {
+ 		const GValue *value;
+ 		FsCodec *codec;
+ 		gchar *codec_str;
+@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus,
+ 		codec_str = fs_codec_to_string(codec);
+ 
+ 		purple_debug_info("backend-fs2",
+-				"farsight-send-codec-changed: codec: %s\n",
++				"farstream-send-codec-changed: codec: %s\n",
+ 				codec_str);
+ 
+ 		g_free(codec_str);
+ 	} else if (gst_structure_has_name(msg->structure,
+-			"farsight-codecs-changed")) {
++			"farstream-codecs-changed")) {
+ 		const GValue *value;
+ 		FsSession *fssession;
+ 		GList *sessions;
+@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl
+ 				purple_media_is_initiator(media, sid, name))
+ 			return;
+ 
+-		fs_stream_set_remote_candidates(stream->stream,
+-				stream->remote_candidates, &err);
++		if (stream->supports_add)
++		  fs_stream_add_remote_candidates(stream->stream,
++			  	stream->remote_candidates, &err);
++		else
++		  fs_stream_force_remote_candidates(stream->stream,
++			  	stream->remote_candidates, &err);
+ 
+ 		if (err == NULL)
+ 			return;
+@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s
+ 	GstElement *pipeline;
+ 	GstBus *bus;
+ 	gchar *name;
++	GKeyFile *default_props;
+ 
+ 	priv->conference = FS_CONFERENCE(
+ 			gst_element_factory_make(priv->conference_type, NULL));
+@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s
+ 		return FALSE;
+ 	}
+ 
++	default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference));
++	if (default_props != NULL) {
++		priv->notifier = fs_element_added_notifier_new();
++		fs_element_added_notifier_add(priv->notifier,
++					      GST_BIN(priv->confbin));
++		fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props);
++	}
++
+ 	g_signal_connect(G_OBJECT(bus), "message",
+ 			G_CALLBACK(gst_bus_cb), self);
+ 	gst_object_unref(bus);
+@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se
+ 	 * receiving the src-pad-added signal.
+ 	 * Only works for non-multicast FsRtpSessions.
+ 	 */
+-	if (is_nice || !strcmp(transmitter, "rawudp"))
++	if (!!strcmp(transmitter, "multicast"))
+ 		g_object_set(G_OBJECT(session->session),
+ 				"no-rtcp-timeout", 0, NULL);
+ 
+@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2
+ 	GError *err = NULL;
+ 
+ 	participant = fs_conference_new_participant(
+-			priv->conference, name, &err);
++			priv->conference, &err);
+ 
+ 	if (err) {
+ 		purple_debug_error("backend-fs2",
+@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2
+ 		return FALSE;
+ 	}
+ 
++	if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant),
++					 "cname")) {
++	  g_object_set(participant, "cname", &name, NULL);
++	}
++
++
+ 	if (!priv->participants) {
+ 		purple_debug_info("backend-fs2",
+ 				"Creating hash table for participants\n");
+@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel
+ 		}
+ 	}
+ 
++
++	session = get_session(self, sess_id);
++
++	if (session == NULL) {
++		purple_debug_error("backend-fs2",
++				"Couldn't find session to create stream.\n");
++		return FALSE;
++	}
++
++	participant = get_participant(self, who);
++
++	if (participant == NULL) {
++		purple_debug_error("backend-fs2", "Couldn't find "
++				"participant to create stream.\n");
++		return FALSE;
++	}
++
++	fsstream = fs_session_new_stream(session->session, participant,
++			initiator == TRUE ? type_direction :
++			(type_direction & FS_DIRECTION_RECV), &err);
++
++	if (fsstream == NULL) {
++		if (err) {
++			purple_debug_error("backend-fs2",
++					"Error creating stream: %s\n",
++					err && err->message ?
++					err->message : "NULL");
++			g_error_free(err);
++		} else
++			purple_debug_error("backend-fs2",
++					"Error creating stream\n");
++		return FALSE;
++	}
++
+ 	memcpy(_params, params, sizeof(GParameter) * num_params);
+ 
+ 	/* set the controlling mode parameter */
+@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel
+ 		_num_params++;
+ 	}
+ 
+-	session = get_session(self, sess_id);
+ 
+-	if (session == NULL) {
+-		purple_debug_error("backend-fs2",
+-				"Couldn't find session to create stream.\n");
+-		return FALSE;
+-	}
+-
+-	participant = get_participant(self, who);
+-
+-	if (participant == NULL) {
+-		purple_debug_error("backend-fs2", "Couldn't find "
+-				"participant to create stream.\n");
+-		return FALSE;
++	if(!fs_stream_set_transmitter(fsstream, transmitter,
++				      _params, _num_params, &err)) {
++	     purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message);
++	     g_clear_error(&err);
++	     g_free(_params);
++	     return FALSE;
+ 	}
+-
+-	fsstream = fs_session_new_stream(session->session, participant,
+-			initiator == TRUE ? type_direction :
+-			(type_direction & FS_DIRECTION_RECV), transmitter,
+-			_num_params, _params, &err);
+ 	g_free(_params);
+ 
+-	if (fsstream == NULL) {
+-		if (err) {
+-			purple_debug_error("backend-fs2",
+-					"Error creating stream: %s\n",
+-					err && err->message ?
+-					err->message : "NULL");
+-			g_error_free(err);
+-		} else
+-			purple_debug_error("backend-fs2",
+-					"Error creating stream\n");
+-		return FALSE;
+-	}
+ 
+ 	stream = g_new0(PurpleMediaBackendFs2Stream, 1);
+ 	stream->participant = g_strdup(who);
+ 	stream->session = session;
+ 	stream->stream = fsstream;
++	stream->supports_add = !strcmp(transmitter, "nice");
+ 
+ 	priv->streams =	g_list_append(priv->streams, stream);
+ 
+@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand
+ 	if (purple_media_is_initiator(priv->media, sess_id, participant) ||
+ 			purple_media_accepted(
+ 			priv->media, sess_id, participant)) {
+-		fs_stream_set_remote_candidates(stream->stream,
++  	        if (stream->supports_add)
++		     fs_stream_add_remote_candidates(stream->stream,
++				stream->remote_candidates, &err);
++		else
++		     fs_stream_force_remote_candidates(stream->stream,
+ 				stream->remote_candidates, &err);
+ 
+ 		if (err) {
+diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c
+--- pidgin-2.10.1.orig/libpurple/media.c	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/media.c	2012-03-10 18:21:19.000000000 +0200
+@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med
+ {
+ #ifdef USE_VV
+ 	PurpleMediaSession *session;
+-	PurpleMediaStream *stream = NULL;
+ 
+ 	g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE);
+ 
+@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med
+ 	}
+ 
+ 	if (purple_media_get_stream(media, sess_id, who) == NULL) {
+-		stream = purple_media_insert_stream(session, who, initiator);
++		purple_media_insert_stream(session, who, initiator);
+ 
+ 		g_signal_emit(media, purple_media_signals[STATE_CHANGED],
+ 				0, PURPLE_MEDIA_STATE_NEW,
+diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c
+--- pidgin-2.10.1.orig/libpurple/mediamanager.c	2011-12-06 10:44:33.000000000 +0200
++++ pidgin-2.10.1/libpurple/mediamanager.c	2012-03-10 18:27:05.000000000 +0200
+@@ -39,7 +39,7 @@
+ #ifdef USE_VV
+ #include <media/backend-fs2.h>
+ 
+-#include <gst/farsight/fs-element-added-notifier.h>
++#include <farstream/fs-element-added-notifier.h>
+ #include <gst/interfaces/xoverlay.h>
+ 
+ /** @copydoc _PurpleMediaManagerPrivate */
diff -Nru pidgin-2.10.2/debian/patches/series pidgin-2.10.2/debian/patches/series
--- pidgin-2.10.2/debian/patches/series	2012-03-14 23:12:09.000000000 -0300
+++ pidgin-2.10.2/debian/patches/series	2012-03-18 10:33:46.000000000 -0300
@@ -1 +1,2 @@
 libnssckbi_path.patch
+port-to-farstream-v2.patch
diff -Nru pidgin-2.10.2/debian/rules pidgin-2.10.2/debian/rules
--- pidgin-2.10.2/debian/rules	2012-03-14 23:12:09.000000000 -0300
+++ pidgin-2.10.2/debian/rules	2012-03-18 12:57:39.000000000 -0300
@@ -4,6 +4,7 @@
 
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
@@ -24,6 +25,11 @@
   DEB_CONFIGURE_EXTRA_FLAGS += --disable-nm
 endif
 
+# update .in after patching
+DEB_AUTO_UPDATE_ACLOCAL := 1.11
+DEB_AUTO_UPDATE_AUTOMAKE := 1.11 --add-missing
+DEB_AUTO_UPDATE_AUTOCONF = 1.11
+DEB_AUTO_UPDATE_LIBTOOL = pre
 
 DEB_INSTALL_DOCS_ALL := -XAUTHORS -XNEWS -XREADME
 

--- End Message ---
--- Begin Message ---
Source: pidgin
Source-Version: 2.10.4-1.1

We believe that the bug you reported is fixed in the latest version of
pidgin, which is due to be installed in the Debian FTP archive:

finch-dev_2.10.4-1.1_all.deb
  to main/p/pidgin/finch-dev_2.10.4-1.1_all.deb
finch_2.10.4-1.1_amd64.deb
  to main/p/pidgin/finch_2.10.4-1.1_amd64.deb
libpurple-bin_2.10.4-1.1_all.deb
  to main/p/pidgin/libpurple-bin_2.10.4-1.1_all.deb
libpurple-dev_2.10.4-1.1_all.deb
  to main/p/pidgin/libpurple-dev_2.10.4-1.1_all.deb
libpurple0_2.10.4-1.1_amd64.deb
  to main/p/pidgin/libpurple0_2.10.4-1.1_amd64.deb
pidgin-data_2.10.4-1.1_all.deb
  to main/p/pidgin/pidgin-data_2.10.4-1.1_all.deb
pidgin-dbg_2.10.4-1.1_amd64.deb
  to main/p/pidgin/pidgin-dbg_2.10.4-1.1_amd64.deb
pidgin-dev_2.10.4-1.1_all.deb
  to main/p/pidgin/pidgin-dev_2.10.4-1.1_all.deb
pidgin_2.10.4-1.1.debian.tar.gz
  to main/p/pidgin/pidgin_2.10.4-1.1.debian.tar.gz
pidgin_2.10.4-1.1.dsc
  to main/p/pidgin/pidgin_2.10.4-1.1.dsc
pidgin_2.10.4-1.1_amd64.deb
  to main/p/pidgin/pidgin_2.10.4-1.1_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 664...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Laurent Bigonville <bi...@debian.org> (supplier of updated pidgin package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Tue, 15 May 2012 12:37:02 +0200
Source: pidgin
Binary: libpurple0 pidgin pidgin-data pidgin-dev pidgin-dbg finch finch-dev 
libpurple-dev libpurple-bin
Architecture: source all amd64
Version: 2.10.4-1.1
Distribution: unstable
Urgency: low
Maintainer: Laurent Bigonville <bi...@debian.org>
Changed-By: Laurent Bigonville <bi...@debian.org>
Description: 
 finch      - text-based multi-protocol instant messaging client
 finch-dev  - text-based multi-protocol instant messaging client - development
 libpurple-bin - multi-protocol instant messaging library - extra utilities
 libpurple-dev - multi-protocol instant messaging library - development files
 libpurple0 - multi-protocol instant messaging library
 pidgin     - graphical multi-protocol instant messaging client for X
 pidgin-data - multi-protocol instant messaging client - data files
 pidgin-dbg - Debugging symbols for Pidgin
 pidgin-dev - multi-protocol instant messaging client - development files
Closes: 664527
Changes: 
 pidgin (2.10.4-1.1) unstable; urgency=low
 .
   * Non-maintainer upload.
   * Build-depends against libfarstream-0.1-dev instead of
     libgstfarsight0.10-dev (Closes: #664527)
Checksums-Sha1: 
 63d3a3fdf99a1ec0fddf2b42d7cc314a9a611d13 2423 pidgin_2.10.4-1.1.dsc
 6e4b420a2046a4eece4f785250eb76f7eb628f56 58449 pidgin_2.10.4-1.1.debian.tar.gz
 277ff32a00c9757e6737e32d4222e6edaacff9cf 8422682 pidgin-data_2.10.4-1.1_all.deb
 184542063f57dcda2a4f6e9ee594b88cb4abae0c 2959632 pidgin-dev_2.10.4-1.1_all.deb
 9b35dd12a40d5f7dbdc1f62759759e5be25b2b59 142504 finch-dev_2.10.4-1.1_all.deb
 5b4e16520fc7f73f76436d627b2d9b67a2eebd26 290374 
libpurple-dev_2.10.4-1.1_all.deb
 062663d6b0fb8272194b7d234805658760f8c36b 116460 
libpurple-bin_2.10.4-1.1_all.deb
 40c35e76294b8c94c85bf42b3a4142af589fc4f2 1919572 
libpurple0_2.10.4-1.1_amd64.deb
 05e96261215f684c594ebf991ed26c3e0f64461a 814314 pidgin_2.10.4-1.1_amd64.deb
 ec431cb2482c696a2bd8c47d48d586d386f593e4 8967798 
pidgin-dbg_2.10.4-1.1_amd64.deb
 ed4a95e3d09b494418ec468bcfd928d3abf1e13e 360438 finch_2.10.4-1.1_amd64.deb
Checksums-Sha256: 
 5a0e0a0e86f071ca2627df39f02b636f1740b596a12e6091bdd1a6382a88963e 2423 
pidgin_2.10.4-1.1.dsc
 f125c7f82d72e1e975a488964cbebbf603ed75c4c311132d671c03fb48bea8a3 58449 
pidgin_2.10.4-1.1.debian.tar.gz
 ffb19f3f7ba09fb048b42c86d8a89216576885647f9419bff20dab08b04b1162 8422682 
pidgin-data_2.10.4-1.1_all.deb
 02f80393ff500d0c237b20c8d7086e0c904f10aa5cb869ed6c0b363953bcb905 2959632 
pidgin-dev_2.10.4-1.1_all.deb
 01a69bf1f56d3c6b9e2644d143e05bd050caf83752613addf409476242b31cff 142504 
finch-dev_2.10.4-1.1_all.deb
 c86aee16decee2fe64ca101d0c444562c0f8b3af7fab92f34d088ee3965185ab 290374 
libpurple-dev_2.10.4-1.1_all.deb
 7c65deb388cce0ba09adddbe7e55355fcccfe76d9bfb6969037871c541b22da7 116460 
libpurple-bin_2.10.4-1.1_all.deb
 34f000f0a7688454d38f81bc8859f80ea06eb7609b75ead65b023652ca392b70 1919572 
libpurple0_2.10.4-1.1_amd64.deb
 595b1b7d5f2b4b0e4e77e40b75b012bdc28ed59a4cd648632eed4cc4ee350aab 814314 
pidgin_2.10.4-1.1_amd64.deb
 133f613f2c499d1adf0bb9b0acae68759e7e5f1d393cd284aab23335358d4488 8967798 
pidgin-dbg_2.10.4-1.1_amd64.deb
 5f4d7a6d2e2665aab901d004172970f65e19c3fe0ea617d792795edab27886ea 360438 
finch_2.10.4-1.1_amd64.deb
Files: 
 7b7df4bebd25b2d7cbc60b187edea851 2423 net optional pidgin_2.10.4-1.1.dsc
 60fa53af86b12d2c0d3c61174a4db63e 58449 net optional 
pidgin_2.10.4-1.1.debian.tar.gz
 7bf57f2439db4cd9f754e8b74431108e 8422682 net optional 
pidgin-data_2.10.4-1.1_all.deb
 40d4ec2123f87c909ada41c7aa652825 2959632 devel optional 
pidgin-dev_2.10.4-1.1_all.deb
 eccc960f81c2e9b89c73c2827d05da5f 142504 devel optional 
finch-dev_2.10.4-1.1_all.deb
 6083ceffd372d8608a0d232cd6963c52 290374 libdevel optional 
libpurple-dev_2.10.4-1.1_all.deb
 bca01e59c7c8d93178365f3a3affbfab 116460 net optional 
libpurple-bin_2.10.4-1.1_all.deb
 5ea6aa654efce9db5498d32029abbdee 1919572 net optional 
libpurple0_2.10.4-1.1_amd64.deb
 264e2d656e1c604667408cb464b36ce0 814314 net optional 
pidgin_2.10.4-1.1_amd64.deb
 6278c1a17dc269189c90cc741fcf8782 8967798 debug extra 
pidgin-dbg_2.10.4-1.1_amd64.deb
 9e0b910f477873097d9e295318b85412 360438 net optional finch_2.10.4-1.1_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQEcBAEBCAAGBQJPsjTmAAoJEB/FiR66sEPVD68H/RlRpvnl3AiPGGCr6obH1Ap/
sQV/m5IlztU2V3ZWdUNA/ks/Ly90FKjA3EcjDJ6BKVe0x6CpJpT7xtYD1NncvaVI
2WmpFW/gvZu/pcEpDSlTMgZ0eXrno3N2p/GS42sa+muEvjb7lBdMRKNHJPal2yk/
dy1/HERIC4xkaGXa8XDHwJ8TYh6I80wXfqFEXseLD8C3K661dmUxf/TjRGuJ+OTP
rIsXbZSDxrpQ5rRMZkSglfdGKbZxllw5EQ6x/mOGgN8FAP0BEeXLuXqHRFONw7/6
TWNXFwE8tUtaYwDb0eP7Wg41vXUOJ9GKsfPkBcWMH3Hv371GO8J4dN1Rnl06ULQ=
=7sHj
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to