[Pkg-telepathy-commits] [farstream] 03/05: Add 0001-Gtk-doc_tags_belong_after_the_description.patch: Fix FTBFS by moving the GTK-doc tags after the description (Closes: #713498)
Laurent Bigonville
bigon at moszumanska.debian.org
Sun Dec 29 15:06:32 UTC 2013
This is an automated email from the git hooks/post-receive script.
bigon pushed a commit to branch debian
in repository farstream.
commit 78e06c872c302ecaa7692db9243744cdb5573176
Author: Laurent Bigonville <bigon at bigon.be>
Date: Sun Dec 29 15:57:26 2013 +0100
Add 0001-Gtk-doc_tags_belong_after_the_description.patch: Fix FTBFS by moving the GTK-doc tags after the description (Closes: #713498)
---
debian/changelog | 4 +-
...Gtk-doc_tags_belong_after_the_description.patch | 127 +++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 131 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 73e6c30..5c56e94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ farstream (0.1.2-2) UNRELEASED; urgency=medium
* debian/rules: Call dh_autotools-dev during build to update
config.{sub,guess} for AArch64 (Closes: #727258)
* debian/control: Bump Standards-Version to 3.9.5 (no further changes)
+ * Add 0001-Gtk-doc_tags_belong_after_the_description.patch: Fix FTBFS by
+ moving the GTK-doc tags after the description (Closes: #713498)
- -- Laurent Bigonville <bigon at debian.org> Sun, 29 Dec 2013 15:50:22 +0100
+ -- Laurent Bigonville <bigon at debian.org> Sun, 29 Dec 2013 15:56:09 +0100
farstream (0.1.2-1) unstable; urgency=low
diff --git a/debian/patches/0001-Gtk-doc_tags_belong_after_the_description.patch b/debian/patches/0001-Gtk-doc_tags_belong_after_the_description.patch
new file mode 100644
index 0000000..7414b1a
--- /dev/null
+++ b/debian/patches/0001-Gtk-doc_tags_belong_after_the_description.patch
@@ -0,0 +1,127 @@
+From 39450457190675716c8e66700e35b05334a6a1a0 Mon Sep 17 00:00:00 2001
+From: Olivier Crête <olivier.crete at collabora.com>
+Date: Fri, 25 May 2012 21:06:59 +0000
+Subject: Gtk-doc tags belong after the description
+
+---
+diff --git a/farstream/fs-session.c b/farstream/fs-session.c
+index 80794d1..abb1bc3 100644
+--- a/farstream/fs-session.c
++++ b/farstream/fs-session.c
+@@ -270,9 +270,6 @@ fs_session_class_init (FsSessionClass *klass)
+ /**
+ * FsSession:codec-preferences:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the current preferences list for the local codecs. It is
+ * set by the user to specify the codec options and priorities. The user may
+ * change its value with fs_session_set_codec_preferences() at any time
+@@ -283,6 +280,9 @@ fs_session_class_init (FsSessionClass *klass)
+ * or %FS_CODEC_ID_ANY. If the encoding name is "reserve-pt", then the
+ * payload type of the codec will be "reserved" and not be used by any
+ * dynamically assigned payload type.
++ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CODEC_PREFERENCES,
+@@ -296,9 +296,6 @@ fs_session_class_init (FsSessionClass *klass)
+ /**
+ * FsSession:codecs:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the list of codecs used for this session. It will include the
+ * codecs and payload type used to receive media on this session. It will
+ * also include any configuration parameter that must be transmitted reliably
+@@ -317,6 +314,8 @@ fs_session_class_init (FsSessionClass *klass)
+ * It is a #GList of #FsCodec. User must free this codec list using
+ * fs_codec_list_destroy() when done.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CODECS,
+@@ -329,9 +328,6 @@ fs_session_class_init (FsSessionClass *klass)
+ /**
+ * FsSession:codecs-without-config:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the same list of codecs as #FsSession:codecs without
+ * the configuration information that describes the data sent. It is suitable
+ * for configurations where a list of codecs is shared by many senders.
+@@ -349,6 +345,8 @@ fs_session_class_init (FsSessionClass *klass)
+ * It is a #GList of #FsCodec. User must free this codec list using
+ * fs_codec_list_destroy() when done.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CODECS_WITHOUT_CONFIG,
+diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c
+index b9e1320..110641d 100644
+--- a/farstream/fs-stream.c
++++ b/farstream/fs-stream.c
+@@ -176,13 +176,12 @@ fs_stream_class_init (FsStreamClass *klass)
+ /**
+ * FsStream:remote-codecs:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the list of remote codecs for this stream. They must be set by the
+ * user as soon as they are known using fs_stream_set_remote_codecs()
+ * (generally through external signaling). It is a #GList of #FsCodec.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_REMOTE_CODECS,
+@@ -195,15 +194,14 @@ fs_stream_class_init (FsStreamClass *klass)
+ /**
+ * FsStream:negotiated-codecs:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the list of negotiatied codecs, it is the same list as the list
+ * of #FsCodec from the parent #FsSession, except that the codec config data
+ * has been replaced with the data from the remote codecs for this stream.
+ * This is the list of #FsCodec used to receive data from this stream.
+ * It is a #GList of #FsCodec.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_NEGOTIATED_CODECS,
+@@ -216,9 +214,6 @@ fs_stream_class_init (FsStreamClass *klass)
+ /**
+ * FsStream:current-recv-codecs:
+ *
+- * Type: GLib.List(FsCodec)
+- * Transfer: full
+- *
+ * This is the list of codecs that have been received by this stream.
+ * The user must free the list if fs_codec_list_destroy().
+ * The "farstream-recv-codecs-changed" message is send on the #GstBus
+@@ -228,6 +223,8 @@ fs_stream_class_init (FsStreamClass *klass)
+ * also be emitted if the pad already exists, but the source material that
+ * will come to it is different.
+ *
++ * Type: GLib.List(FsCodec)
++ * Transfer: full
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_CURRENT_RECV_CODECS,
+--
+cgit v0.9.0.3
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..be91340
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Gtk-doc_tags_belong_after_the_description.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/farstream.git
More information about the Pkg-telepathy-commits
mailing list