[Pkg-telepathy-commits] [SCM] farsight2 packaging branch, debian, updated. ca3914cd6c029be834cdeb95aebe7b4198653ae3
Sjoerd Simons
sjoerd at luon.net
Tue Jan 6 16:20:07 UTC 2009
The following commit has been merged in the debian branch:
commit ca3914cd6c029be834cdeb95aebe7b4198653ae3
Author: Sjoerd Simons <sjoerd at luon.net>
Date: Tue Jan 6 16:20:01 2009 +0000
Prepare a new upstream release (0.0.6)
diff --git a/debian/changelog b/debian/changelog
index f666d1c..ff31835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,8 @@
-farsight2 (0.0.4-1.0.1) UNRELEASED; urgency=low
+farsight2 (0.0.6-1) UNRELEASED; urgency=low
[ Sjoerd Simons ]
* Enable libnice support
- * debian/patches/00-dont-release-pads.patch:
- - Don't release request pads on gstrtpbin. It's not implemented and causes
- warnings. From upstream git
- * debian/patches/01-set-remote-candidates-in-idle.patch:
- - Set remote candidates in an idle callback to prevent deadlocks
- * Add dependency on gstreamer0.10-plugins-farsight
+ * New upstream release (0.0.6)
[ Simon McVittie ]
* Move packaging to git
diff --git a/debian/patches/00-dont-release-pads.patch b/debian/patches/00-dont-release-pads.patch
deleted file mode 100644
index 9ebec0c..0000000
--- a/debian/patches/00-dont-release-pads.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-commit 2b62a803ed02567715958293dab8e54ff5b208b6
-Author: Olivier Crête <olivier.crete at collabora.co.uk>
-Date: Fri Nov 21 11:00:16 2008 -0500
-
- Don't release the request pads on gstrtpbin, its not implemented and prints out a warning
-
-diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c
-index 65f4359..4446019 100644
---- a/gst/fsrtpconference/fs-rtp-session.c
-+++ b/gst/fsrtpconference/fs-rtp-session.c
-@@ -558,36 +558,44 @@ fs_rtp_session_dispose (GObject *object)
-
- if (self->priv->rtpbin_send_rtcp_src)
- {
-+ /* Release pad generates a g_warning as of Nov 11 2008
- gst_pad_set_active (self->priv->rtpbin_send_rtcp_src, FALSE);
- gst_element_release_request_pad (self->priv->conference->gstrtpbin,
- self->priv->rtpbin_send_rtcp_src);
-+ */
- gst_object_unref (self->priv->rtpbin_send_rtcp_src);
- self->priv->rtpbin_send_rtcp_src = NULL;
- }
-
- if (self->priv->rtpbin_send_rtp_sink)
- {
-+ /* Release pad generates a g_warning as of Nov 11 2008
- gst_pad_set_active (self->priv->rtpbin_send_rtp_sink, FALSE);
- gst_element_release_request_pad (self->priv->conference->gstrtpbin,
- self->priv->rtpbin_send_rtp_sink);
-+ */
- gst_object_unref (self->priv->rtpbin_send_rtp_sink);
- self->priv->rtpbin_send_rtp_sink = NULL;
- }
-
- if (self->priv->rtpbin_recv_rtp_sink)
- {
-+ /* Release pad generates a g_warning as of Nov 11 2008
- gst_pad_set_active (self->priv->rtpbin_recv_rtp_sink, FALSE);
- gst_element_release_request_pad (self->priv->conference->gstrtpbin,
- self->priv->rtpbin_recv_rtp_sink);
-+ */
- gst_object_unref (self->priv->rtpbin_recv_rtp_sink);
- self->priv->rtpbin_recv_rtp_sink = NULL;
- }
-
- if (self->priv->rtpbin_recv_rtcp_sink)
- {
-+ /* Release pad generates a g_warning as of Nov 11 2008
- gst_pad_set_active (self->priv->rtpbin_recv_rtcp_sink, FALSE);
- gst_element_release_request_pad (self->priv->conference->gstrtpbin,
- self->priv->rtpbin_recv_rtcp_sink);
-+ */
- gst_object_unref (self->priv->rtpbin_recv_rtcp_sink);
- self->priv->rtpbin_recv_rtcp_sink = NULL;
- }
diff --git a/debian/patches/01-set-remote-candidates-in-idle.patch b/debian/patches/01-set-remote-candidates-in-idle.patch
deleted file mode 100644
index ebddb0a..0000000
--- a/debian/patches/01-set-remote-candidates-in-idle.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-commit d9a5fc09cfd04ce54ffa5ec7ed89937ddd6682a3
-Author: Olivier Crête <olivier.crete at collabora.co.uk>
-Date: Thu Nov 20 19:00:34 2008 -0500
-
- Set the remote_candidates from an idler to prevent deadlock
-
-diff --git a/tests/check/transmitter/nice.c b/tests/check/transmitter/nice.c
-index 3931ea6..4b9979d 100644
---- a/tests/check/transmitter/nice.c
-+++ b/tests/check/transmitter/nice.c
-@@ -88,21 +88,14 @@ _new_local_candidate (FsStreamTransmitter *st, FsCandidate *candidate,
- fs_candidate_copy (candidate)));
- }
-
--static void
--_local_candidates_prepared (FsStreamTransmitter *st, gpointer user_data)
-+static gboolean
-+set_the_candidates (gpointer user_data)
- {
-- FsStreamTransmitter *st2 = FS_STREAM_TRANSMITTER (user_data);
-- GList *candidates = g_object_get_data (G_OBJECT (st), "candidates");
-+ FsStreamTransmitter *st = FS_STREAM_TRANSMITTER (user_data);
-+ GList *candidates = g_object_get_data (G_OBJECT (st), "candidates-set");
- gboolean ret;
- GError *error = NULL;
-
-- g_object_set_data (G_OBJECT (st), "candidates", NULL);
--
-- ts_fail_if (g_list_length (candidates) < 2,
-- "We don't have at least 2 candidates");
--
-- g_debug ("Local Candidates Prepared");
--
- if (force_candidates)
- {
- GList *item = NULL;
-@@ -127,13 +120,13 @@ _local_candidates_prepared (FsStreamTransmitter *st, gpointer user_data)
- }
- }
-
-- ret = fs_stream_transmitter_force_remote_candidates (st2, new_list, &error);
-+ ret = fs_stream_transmitter_force_remote_candidates (st, new_list, &error);
-
- fs_candidate_list_destroy (new_list);
- }
- else
- {
-- ret = fs_stream_transmitter_set_remote_candidates (st2, candidates, &error);
-+ ret = fs_stream_transmitter_set_remote_candidates (st, candidates, &error);
- }
-
- if (error)
-@@ -143,10 +136,31 @@ _local_candidates_prepared (FsStreamTransmitter *st, gpointer user_data)
- ts_fail_unless (ret == TRUE, "No detailed error setting remote_candidate");
-
- fs_candidate_list_destroy (candidates);
-+
-+ return FALSE;
- }
-
-
- static void
-+_local_candidates_prepared (FsStreamTransmitter *st, gpointer user_data)
-+{
-+ FsStreamTransmitter *st2 = FS_STREAM_TRANSMITTER (user_data);
-+ GList *candidates = g_object_get_data (G_OBJECT (st), "candidates");
-+
-+ g_object_set_data (G_OBJECT (st), "candidates", NULL);
-+
-+ ts_fail_if (g_list_length (candidates) < 2,
-+ "We don't have at least 2 candidates");
-+
-+ g_debug ("Local Candidates Prepared");
-+
-+ g_object_set_data (G_OBJECT (st2), "candidates-set", candidates);
-+
-+ g_idle_add (set_the_candidates, st2);
-+
-+}
-+
-+static void
- _new_active_candidate_pair (FsStreamTransmitter *st, FsCandidate *local,
- FsCandidate *remote, gpointer user_data)
- {
--
farsight2 packaging
More information about the Pkg-telepathy-commits
mailing list