[SCM] kopete packaging branch, master, updated. debian/4.13.1-1-61-gdb6961a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kopete.git;a=commitdiff;h=40008bf

The following commit has been merged in the master branch:
commit 40008bfeae2a471d71185b4260703cb959bb6e60
Author: Rohan Garg <rohangarg at kubuntu.org>
Date:   Tue Aug 13 19:24:14 2013 +0530

    Drop 04_fix_audio_stream.diff, causes FTBFS in saucy
---
 debian/changelog                        |  2 --
 debian/patches/04_fix_audio_stream.diff | 23 -----------------------
 debian/patches/series                   |  1 -
 3 files changed, 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9d041b..a96d944 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,6 @@ kopete (4:4.11.0-0ubuntu1) UNRELEASED; urgency=low
   [ Howard Chan ]
   * New upstream release
   * Add libsrtp0-dev and libasound2-dev as build-dep of kopete
-  * Introduce patch at http://bugsfiles.kde.org/attachment.cgi?id=80534
-    to fix audio_stream
 
   [ Scott Kitterman ]
   * Disable building googletalk on powerpc because the embedded libjingle does
diff --git a/debian/patches/04_fix_audio_stream.diff b/debian/patches/04_fix_audio_stream.diff
deleted file mode 100644
index bbbb717..0000000
--- a/debian/patches/04_fix_audio_stream.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-index 88fdbd1..57c6c05 100644
---- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
-       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
-       pt_ = i->id;
-       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
--      port2 = rtp_session_get_local_port(audio_stream_->session);
-+      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
-       first = false;
-     }
-   }
-@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
-     // working with a buggy client; let's try PCMU.
-     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
-     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
--    port2 = rtp_session_get_local_port(audio_stream_->session);
-+    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
-   }
- 
-   return true;
-
diff --git a/debian/patches/series b/debian/patches/series
index 98136c5..b2ed00c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 kubuntu_03_no_mediastreamer_in_wlm.diff
-04_fix_audio_stream.diff

-- 
kopete packaging