[SCM] kopete packaging branch, kde4.12, updated. debian/4.11.3-2-15-gd580433

[Maximiliano Curia]

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

The following commit has been merged in the kde4.12 branch:
commit 0a1cfc2f3574e11f9418064c4e33d63d3026610f
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Feb 9 09:48:58 2014 +0100

    Remove patch: new_linphone.diff, fixed upstream.
---
 debian/changelog                 |  1 +
 debian/patches/new_linphone.diff | 31 -------------------------------
 debian/patches/series            |  1 -
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9663270..585f11d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kopete (4:4.12.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patch: new_linphone.diff, fixed upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 04 Feb 2014 19:15:26 +0100
 
diff --git a/debian/patches/new_linphone.diff b/debian/patches/new_linphone.diff
deleted file mode 100644
index fc15b94..0000000
--- a/debian/patches/new_linphone.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Fix build with the libraries of linphone >= 3.6.
- - in linphonemediaengine.cc, cast audio_stream_ to the "base" MediaStream
-   struct
- - stun.h: make the header guard a bit more specific, so it is different than
-   the one of the stun.h provided by libortp
-Forwarded: no
-Last-Update: 2013-09-08
-
-Index: kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-===================================================================
---- kopete.orig/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc	2013-09-07 15:24:31.569025756 +0200
-+++ kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc	2013-09-09 11:42:21.984318286 +0200
-@@ -200,7 +200,7 @@
-       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(((MediaStream *)audio_stream_)->session);
-       first = false;
-     }
-   }
-@@ -211,7 +211,7 @@
-     // 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(((MediaStream *)audio_stream_)->session);
-   }
- 
-   return true;
diff --git a/debian/patches/series b/debian/patches/series
index 96159fc..1ddc1ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-new_linphone.diff
 libjingle_unknown_architecture.diff

-- 
kopete packaging