From bigon at moszumanska.debian.org Wed Jan 6 01:42:53 2016 From: bigon at moszumanska.debian.org (Laurent Bigonville) Date: Wed, 06 Jan 2016 01:42:53 +0000 Subject: [Pkg-telepathy-commits] [farstream-0.2] 01/01: Drop d/p/0001-Fix-some-mismatched-redundant-para-gtk-doc-tags.patch, applied upstream In-Reply-To: <20160106014252.3269.19051@moszumanska.debian.org> References: <20160106014252.3269.19051@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. bigon pushed a commit to branch debian in repository farstream-0.2. commit 41d455c6fd879c9247809cae0ca59458290e1466 Author: Laurent Bigonville Date: Wed Jan 6 02:41:34 2016 +0100 Drop d/p/0001-Fix-some-mismatched-redundant-para-gtk-doc-tags.patch, applied upstream --- debian/changelog | 4 +- ...me-mismatched-redundant-para-gtk-doc-tags.patch | 106 --------------------- debian/patches/series | 1 - 3 files changed, 3 insertions(+), 108 deletions(-) diff --git a/debian/changelog b/debian/changelog index b328cf3..5ea7f0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,11 @@ farstream-0.2 (0.2.7-1) UNRELEASED; urgency=medium [ Laurent Bigonville ] * New upstream release (Closes: #785195) - Adjust the build-dependencies + - Drop d/p/0001-Fix-some-mismatched-redundant-para-gtk-doc-tags.patch, + applied upstream * debian/control: Bump Standards-Version to 3.9.6 (no further changes) - -- Laurent Bigonville Mon, 09 Nov 2015 01:50:53 +0100 + -- Laurent Bigonville Wed, 06 Jan 2016 02:41:02 +0100 farstream-0.2 (0.2.4-1) unstable; urgency=medium diff --git a/debian/patches/0001-Fix-some-mismatched-redundant-para-gtk-doc-tags.patch b/debian/patches/0001-Fix-some-mismatched-redundant-para-gtk-doc-tags.patch deleted file mode 100644 index 85c967c..0000000 --- a/debian/patches/0001-Fix-some-mismatched-redundant-para-gtk-doc-tags.patch +++ /dev/null @@ -1,106 +0,0 @@ ->From ce20a4ca68c7d8f806f5278c2a131269920dd800 Mon Sep 17 00:00:00 2001 -From: Iain Lane -Date: Fri, 21 Mar 2014 15:18:38 +0000 -Subject: [PATCH] Fix some mismatched / redundant gtk-doc tags - -gtk-doc 1.20 got more strict about correctness here wrt. balanced tags. - -https://bugs.freedesktop.org/show_bug.cgi?id=76458 ---- - farstream/fs-conference.c | 4 ++-- - farstream/fs-session.c | 4 ++-- - farstream/fs-stream.c | 4 ++-- - gst/fsrtpconference/fs-rtp-session.c | 4 ++-- - 4 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/farstream/fs-conference.c b/farstream/fs-conference.c -index f6d6404..7c6327a 100644 ---- a/farstream/fs-conference.c -+++ b/farstream/fs-conference.c -@@ -43,7 +43,7 @@ - * - * This will communicate asynchronous events to the user through #GstMessage - * of type #GST_MESSAGE_ELEMENT sent over the #GstBus. -- * -+ * - * The "<literal>farstream-error</literal>" message - * |[ - * "src-object" #GObject The object (#FsConference, #FsSession or #FsStream) that emitted the error -@@ -54,7 +54,7 @@ - * The message is sent on asynchronous errors. - * - * -- * -+ * - */ - - -diff --git a/farstream/fs-session.c b/farstream/fs-session.c -index f6cc23a..08a1517 100644 ---- a/farstream/fs-session.c -+++ b/farstream/fs-session.c -@@ -39,7 +39,7 @@ - * - * This will communicate asynchronous events to the user through #GstMessage - * of type #GST_MESSAGE_ELEMENT sent over the #GstBus. -- * -+ * - * The "<literal>farstream-send-codec-changed</literal>" - * message - * -@@ -132,7 +132,7 @@ - * telephony event has stopped. - * - * -- * -+ * - */ - - #ifdef HAVE_CONFIG_H -diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c -index c81e878..8502eb2 100644 ---- a/farstream/fs-stream.c -+++ b/farstream/fs-stream.c -@@ -36,7 +36,7 @@ - * - * This will communicate asynchronous events to the user through #GstMessage - * of type #GST_MESSAGE_ELEMENT sent over the #GstBus. -- * -+ * - * The "<literal>farstream-new-local-candidate</literal>" message - * |[ - * "stream" #FsStream The stream that emits the message -@@ -93,7 +93,7 @@ - * This message is emitted the state of a component of a stream changes. - * - * -- * -+ * - */ - - #ifdef HAVE_CONFIG_H -diff --git a/gst/fsrtpconference/fs-rtp-session.c b/gst/fsrtpconference/fs-rtp-session.c -index e20539f..00e15cb 100644 ---- a/gst/fsrtpconference/fs-rtp-session.c -+++ b/gst/fsrtpconference/fs-rtp-session.c -@@ -30,7 +30,7 @@ - * fs_conference_new_session() on a #FsRtpConference. It can be either - * Audio or Video. It also represents data send with one and only one - * SSRC (although if there is a SSRC collision, that SSRC may change). -- * -+ * - * Codec profiles - * - * It is possible to define "codec profiles", that is non-autodetected -@@ -50,7 +50,7 @@ - * Also, it is possible to declare profiles with only a decoding pipeline, - * you will only be able to receive from this codec, the encoding may be a - * secondary pad of some other codec. -- * -+ * - */ - - #ifdef HAVE_CONFIG_H --- -1.9.1 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 09bd337..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Fix-some-mismatched-redundant-para-gtk-doc-tags.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/farstream-0.2.git From bigon at moszumanska.debian.org Wed Jan 6 01:55:34 2016 From: bigon at moszumanska.debian.org (Laurent Bigonville) Date: Wed, 06 Jan 2016 01:55:34 +0000 Subject: [Pkg-telepathy-commits] [farstream-0.2] 01/01: Rename the package from libfarstream-0.2-2 to libfarstream-0.2-5 and adjust the .symbols file In-Reply-To: <20160106015532.6099.81677@moszumanska.debian.org> References: <20160106015532.6099.81677@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. bigon pushed a commit to branch debian in repository farstream-0.2. commit 2f2e6eb3845d4d8bcda80962964465fb0ee0fefa Author: Laurent Bigonville Date: Wed Jan 6 02:47:26 2016 +0100 Rename the package from libfarstream-0.2-2 to libfarstream-0.2-5 and adjust the .symbols file --- debian/changelog | 4 +++- debian/control | 8 ++++---- debian/{libfarstream-0.2-2.install => libfarstream-0.2-5.install} | 0 debian/{libfarstream-0.2-2.symbols => libfarstream-0.2-5.symbols} | 6 ++++-- debian/rules | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5ea7f0e..c53aab1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,11 @@ farstream-0.2 (0.2.7-1) UNRELEASED; urgency=medium - Adjust the build-dependencies - Drop d/p/0001-Fix-some-mismatched-redundant-para-gtk-doc-tags.patch, applied upstream + - Rename the package from libfarstream-0.2-2 to libfarstream-0.2-5 and + adjust the .symbols file * debian/control: Bump Standards-Version to 3.9.6 (no further changes) - -- Laurent Bigonville Wed, 06 Jan 2016 02:41:02 +0100 + -- Laurent Bigonville Wed, 06 Jan 2016 02:46:45 +0100 farstream-0.2 (0.2.4-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 0618fb2..e1b9082 100644 --- a/debian/control +++ b/debian/control @@ -22,10 +22,10 @@ Vcs-Git: git://anonscm.debian.org/pkg-telepathy/farstream-0.2.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-telepathy/farstream-0.2.git Homepage: http://www.freedesktop.org/software/farstream/releases/farstream/ -Package: libfarstream-0.2-2 +Package: libfarstream-0.2-5 Architecture: any Multi-Arch: same -Conflicts: libfarstream-0.2-0 +Conflicts: libfarstream-0.2-0, libfarstream-0.2-2 Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer1.0-plugins-base, @@ -45,7 +45,7 @@ Package: libfarstream-0.2-dev Section: libdevel Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libfarstream-0.2-2 (= ${binary:Version}), libgstreamer1.0-dev, + libfarstream-0.2-5 (= ${binary:Version}), libgstreamer1.0-dev, gir1.2-farstream-0.2 Description: Audio/Video communications framework: development files The Farstream project is an effort to create a framework to deal with all @@ -74,7 +74,7 @@ Section: debug Priority: extra Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, libfarstream-0.2-2 (= ${binary:Version}), libgstreamer1.0-dev +Depends: ${misc:Depends}, libfarstream-0.2-5 (= ${binary:Version}), libgstreamer1.0-dev Description: Audio/Video communications framework: debugging symbols The Farstream project is an effort to create a framework to deal with all known audio/video conferencing protocols. On one side it offers a generic diff --git a/debian/libfarstream-0.2-2.install b/debian/libfarstream-0.2-5.install similarity index 100% rename from debian/libfarstream-0.2-2.install rename to debian/libfarstream-0.2-5.install diff --git a/debian/libfarstream-0.2-2.symbols b/debian/libfarstream-0.2-5.symbols similarity index 96% rename from debian/libfarstream-0.2-2.symbols rename to debian/libfarstream-0.2-5.symbols index 0c60999..3a55160 100644 --- a/debian/libfarstream-0.2-2.symbols +++ b/debian/libfarstream-0.2-5.symbols @@ -1,4 +1,4 @@ -libfarstream-0.2.so.2 libfarstream-0.2-2 #MINVER# +libfarstream-0.2.so.5 libfarstream-0.2-5 #MINVER# fs_candidate_copy at Base 0.1.91 fs_candidate_destroy at Base 0.1.91 fs_candidate_get_type at Base 0.1.91 @@ -75,7 +75,9 @@ libfarstream-0.2.so.2 libfarstream-0.2-2 #MINVER# fs_session_parse_send_codec_changed at Base 0.1.91 fs_session_parse_telephony_event_started at Base 0.1.91 fs_session_parse_telephony_event_stopped at Base 0.1.91 + fs_session_set_allowed_caps at Base 0.2.7 fs_session_set_codec_preferences at Base 0.1.91 + fs_session_set_encryption_parameters at Base 0.2.7 fs_session_set_send_codec at Base 0.1.91 fs_session_start_telephony_event at Base 0.1.91 fs_session_stop_telephony_event at Base 0.1.91 @@ -93,6 +95,7 @@ libfarstream-0.2.so.2 libfarstream-0.2-2 #MINVER# fs_stream_parse_new_active_candidate_pair at Base 0.1.91 fs_stream_parse_new_local_candidate at Base 0.1.91 fs_stream_parse_recv_codecs_changed at Base 0.1.91 + fs_stream_set_decryption_parameters at Base 0.2.7 fs_stream_set_remote_codecs at Base 0.1.91 fs_stream_set_transmitter at Base 0.1.91 fs_stream_set_transmitter_ht at Base 0.2.3 @@ -104,7 +107,6 @@ libfarstream-0.2.so.2 libfarstream-0.2-2 #MINVER# fs_stream_transmitter_get_type at Base 0.1.91 fs_stream_transmitter_stop at Base 0.1.91 fs_transmitter_emit_error at Base 0.1.91 - fs_transmitter_get_recvonly_filter at Base 0.1.91 fs_transmitter_get_stream_transmitter_type at Base 0.1.91 fs_transmitter_get_type at Base 0.1.91 fs_transmitter_list_available at Base 0.1.91 diff --git a/debian/rules b/debian/rules index ad6ae1f..595eb50 100755 --- a/debian/rules +++ b/debian/rules @@ -16,7 +16,7 @@ override_dh_shlibdeps: dh_girepository override_dh_makeshlibs: - dh_makeshlibs -plibfarstream-0.2-2 \ + dh_makeshlibs -plibfarstream-0.2-5 \ -X/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-1.0 \ -X/usr/lib/$(DEB_HOST_MULTIARCH)/farstream-0.2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/farstream-0.2.git From bigon at moszumanska.debian.org Wed Jan 6 02:10:56 2016 From: bigon at moszumanska.debian.org (Laurent Bigonville) Date: Wed, 06 Jan 2016 02:10:56 +0000 Subject: [Pkg-telepathy-commits] [farstream-0.2] 01/01: Drop libfarstream-0.2-dbg package and let debhelper create the dbgsym package itself. In-Reply-To: <20160106021056.31799.33075@moszumanska.debian.org> References: <20160106021056.31799.33075@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. bigon pushed a commit to branch debian in repository farstream-0.2. commit 72358cb5dda83a7dd161be31a03b8d0406459da5 Author: Laurent Bigonville Date: Wed Jan 6 03:05:32 2016 +0100 Drop libfarstream-0.2-dbg package and let debhelper create the dbgsym package itself. --- debian/changelog | 4 +++- debian/control | 15 --------------- debian/rules | 2 +- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index c53aab1..7a9109c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,10 @@ farstream-0.2 (0.2.7-1) UNRELEASED; urgency=medium - Rename the package from libfarstream-0.2-2 to libfarstream-0.2-5 and adjust the .symbols file * debian/control: Bump Standards-Version to 3.9.6 (no further changes) + * Drop libfarstream-0.2-dbg package and let debhelper create the dbgsym + package itself. - -- Laurent Bigonville Wed, 06 Jan 2016 02:46:45 +0100 + -- Laurent Bigonville Wed, 06 Jan 2016 03:03:56 +0100 farstream-0.2 (0.2.4-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index e1b9082..fa08980 100644 --- a/debian/control +++ b/debian/control @@ -69,21 +69,6 @@ Description: Audio/Video communications framework: documentation . This package provides documentation for Farstream. -Package: libfarstream-0.2-dbg -Section: debug -Priority: extra -Architecture: any -Multi-Arch: same -Depends: ${misc:Depends}, libfarstream-0.2-5 (= ${binary:Version}), libgstreamer1.0-dev -Description: Audio/Video communications framework: debugging symbols - The Farstream project is an effort to create a framework to deal with all - known audio/video conferencing protocols. On one side it offers a generic - API that makes it possible to write plugins for different streaming - protocols, on the other side it offers an API for clients to use those - plugins. - . - This package provides debugging symbols for Farstream. - Package: gir1.2-farstream-0.2 Architecture: any Depends: ${gir:Depends}, diff --git a/debian/rules b/debian/rules index 595eb50..0b68d28 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ override_dh_auto_configure: dh_auto_configure -- --enable-gtk-doc --disable-silent-rules override_dh_strip: - dh_strip --dbg-package=libfarstream-0.2-dbg + dh_strip --ddeb-migration='libfarstream-0.2-dbg (<< 0.2.7-1~)' %: dh $@ --with autoreconf -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/farstream-0.2.git From bigon at moszumanska.debian.org Wed Jan 6 02:16:02 2016 From: bigon at moszumanska.debian.org (Laurent Bigonville) Date: Wed, 06 Jan 2016 02:16:02 +0000 Subject: [Pkg-telepathy-commits] [farstream-0.2] 01/01: Run wrap-and-sort In-Reply-To: <20160106021602.19859.49829@moszumanska.debian.org> References: <20160106021602.19859.49829@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. bigon pushed a commit to branch debian in repository farstream-0.2. commit 99fff3c52d8c9a7d5bea3f6dc39cb6a3833fa3f5 Author: Laurent Bigonville Date: Wed Jan 6 03:15:39 2016 +0100 Run wrap-and-sort --- debian/control | 30 ++++++++++++++++-------------- debian/libfarstream-0.2-5.install | 4 ++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/debian/control b/debian/control index fa08980..800e416 100644 --- a/debian/control +++ b/debian/control @@ -5,17 +5,17 @@ Maintainer: Debian Telepathy maintainers , Laurent Bigonville , Jonny Lamb -Build-Depends: debhelper (>= 9), +Build-Depends: autotools-dev, + debhelper (>= 9), dh-autoreconf, - autotools-dev, - libglib2.0-dev (>= 2.32), - libgstreamer1.0-dev (>= 1.4), - libgstreamer-plugins-base1.0-dev (>= 1.4), gobject-introspection, gtk-doc-tools (>= 1.18), libgirepository1.0-dev, - libnice-dev (>= 0.1.8), + libglib2.0-dev (>= 2.32), + libgstreamer-plugins-base1.0-dev (>= 1.4), + libgstreamer1.0-dev (>= 1.4), libgupnp-igd-1.0-dev, + libnice-dev (>= 0.1.8), uuid-dev Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-telepathy/farstream-0.2.git @@ -27,11 +27,12 @@ Architecture: any Multi-Arch: same Conflicts: libfarstream-0.2-0, libfarstream-0.2-2 Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, +Depends: gstreamer1.0-nice, + gstreamer1.0-plugins-bad, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, - gstreamer1.0-plugins-bad, - gstreamer1.0-nice + ${misc:Depends}, + ${shlibs:Depends} Description: Audio/Video communications framework: core library The Farstream project is an effort to create a framework to deal with all known audio/video conferencing protocols. On one side it offers a generic @@ -44,9 +45,11 @@ Description: Audio/Video communications framework: core library Package: libfarstream-0.2-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - libfarstream-0.2-5 (= ${binary:Version}), libgstreamer1.0-dev, - gir1.2-farstream-0.2 +Depends: gir1.2-farstream-0.2, + libfarstream-0.2-5 (= ${binary:Version}), + libgstreamer1.0-dev, + ${misc:Depends}, + ${shlibs:Depends} Description: Audio/Video communications framework: development files The Farstream project is an effort to create a framework to deal with all known audio/video conferencing protocols. On one side it offers a generic @@ -71,8 +74,7 @@ Description: Audio/Video communications framework: documentation Package: gir1.2-farstream-0.2 Architecture: any -Depends: ${gir:Depends}, - ${misc:Depends} +Depends: ${gir:Depends}, ${misc:Depends} Section: introspection Description: Audio/Video communications framework: GObject-Introspection The Farstream project is an effort to create a framework to deal with all diff --git a/debian/libfarstream-0.2-5.install b/debian/libfarstream-0.2-5.install index 117300a..6388ea8 100644 --- a/debian/libfarstream-0.2-5.install +++ b/debian/libfarstream-0.2-5.install @@ -1,4 +1,4 @@ -usr/lib/*/lib*.so.* usr/lib/*/farstream-0.2/*.so -usr/share/farstream/0.2 usr/lib/*/gstreamer-1.0/*.so +usr/lib/*/lib*.so.* +usr/share/farstream/0.2 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/farstream-0.2.git From bigon at moszumanska.debian.org Wed Jan 6 02:36:26 2016 From: bigon at moszumanska.debian.org (Laurent Bigonville) Date: Wed, 06 Jan 2016 02:36:26 +0000 Subject: [Pkg-telepathy-commits] [farstream-0.2] 01/01: Release to unstable In-Reply-To: <20160106023625.13977.44370@moszumanska.debian.org> References: <20160106023625.13977.44370@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. bigon pushed a commit to annotated tag debian/0.2.7-1 in repository farstream-0.2. commit 1ad3c305589a84c4a0b82b293519d7f2e3f860ea Author: Laurent Bigonville Date: Wed Jan 6 03:30:00 2016 +0100 Release to unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7a9109c..82fe2c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -farstream-0.2 (0.2.7-1) UNRELEASED; urgency=medium +farstream-0.2 (0.2.7-1) unstable; urgency=medium [ Simon McVittie ] * Remove myself from Uploaders @@ -14,7 +14,7 @@ farstream-0.2 (0.2.7-1) UNRELEASED; urgency=medium * Drop libfarstream-0.2-dbg package and let debhelper create the dbgsym package itself. - -- Laurent Bigonville Wed, 06 Jan 2016 03:03:56 +0100 + -- Laurent Bigonville Wed, 06 Jan 2016 03:29:50 +0100 farstream-0.2 (0.2.4-1) unstable; urgency=medium -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/farstream-0.2.git