[Pkg-telepathy-commits] [SCM] farsight2 packaging branch, debian, updated. debian/0.0.21-1-12-gfd8bf5f

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit f01f64f125ee84d8a3cb9e0b4d8879f097c9ced9
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Fri Nov 12 12:48:16 2010 +0100

    Drop d/p/0001-rtpconference-The-ptime-maxptime-in-caps-are-actuall.patch Applied upstream

diff --git a/debian/changelog b/debian/changelog
index bf71395..7b1535c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,13 +2,15 @@ farsight2 (0.0.22-1) UNRELEASED; urgency=low
 
   * New upstream release
     - Adjust build-dependencies
+    - Drop d/p/0001-rtpconference-The-ptime-maxptime-in-caps-are-actuall.patch
+      Applied upstream
   * debian/control:
     - Move python-farsight to priority optional instead of extra
     - Bump Standards-Version to 3.9.1
   * Bump debhelper version to 7
   * Switch to dpkg-source 3.0 (quilt) format
 
- -- Laurent Bigonville <bigon at debian.org>  Fri, 12 Nov 2010 12:33:47 +0100
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 12 Nov 2010 12:47:15 +0100
 
 farsight2 (0.0.21-2) unstable; urgency=low
 
diff --git a/debian/patches/0001-rtpconference-The-ptime-maxptime-in-caps-are-actuall.patch b/debian/patches/0001-rtpconference-The-ptime-maxptime-in-caps-are-actuall.patch
deleted file mode 100644
index 1ea9bb1..0000000
--- a/debian/patches/0001-rtpconference-The-ptime-maxptime-in-caps-are-actuall.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 18bafa0443c975d9da7664cf6dbae323cd8cb9e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete at collabora.co.uk>
-Date: Fri, 8 Oct 2010 12:41:10 -0400
-Subject: [PATCH] rtpconference: The ptime/maxptime in caps are actually uints, not strings
-
----
- gst/fsrtpconference/fs-rtp-conference.c |    9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/gst/fsrtpconference/fs-rtp-conference.c b/gst/fsrtpconference/fs-rtp-conference.c
-index 838dd25..2498970 100644
---- a/gst/fsrtpconference/fs-rtp-conference.c
-+++ b/gst/fsrtpconference/fs-rtp-conference.c
-@@ -910,8 +910,13 @@ fs_codec_to_gst_caps (const FsCodec *codec)
-        item = g_list_next (item)) {
-     FsCodecParameter *param = item->data;
-     gchar *lower_name = g_ascii_strdown (param->name, -1);
--    gst_structure_set (structure, lower_name, G_TYPE_STRING, param->value,
--      NULL);
-+
-+    if (!strcmp (lower_name, "ptime") || !strcmp (lower_name, "maxptime"))
-+      gst_structure_set (structure, lower_name, G_TYPE_UINT,
-+          atoi (param->value), NULL);
-+    else
-+      gst_structure_set (structure, lower_name, G_TYPE_STRING, param->value,
-+          NULL);
-     g_free (lower_name);
-   }
- 

-- 
farsight2 packaging