[SCM] ktp-call-ui packaging branch, master, updated. debian/0.7.0-1-26-g7c5cb06

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-call-ui.git;a=commitdiff;h=13d168a

The following commit has been merged in the master branch:
commit 13d168a9ee9a86f8833e1a2f226e6bc00cef0579
Author: Diane Trout <diane at ghic.org>
Date:   Sat Sep 20 21:09:41 2014 -0700

    Remove call_contains.patch applied upstream.
---
 debian/changelog                   |  1 +
 debian/patches/call_contains.patch | 15 ---------------
 debian/patches/series              |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 47b659b..0a7019e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ ktp-call-ui (0.8.80-1) UNRELEASED; urgency=medium
   * Update ktp-telepathy-data to 0.8.80
   * Add kde-telepathy-declarative and qtgstreamer-declarative dependencies
     (For the new QML UI)
+  * Remove call_contains.patch applied upstream.
 
  -- Diane Trout <diane at ghic.org>  Sat, 20 Sep 2014 20:46:31 -0700
 
diff --git a/debian/patches/call_contains.patch b/debian/patches/call_contains.patch
deleted file mode 100644
index 43f37f9..0000000
--- a/debian/patches/call_contains.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: mva
-Description: Backport fix to call deduplication code by Vadim A. Misbakh-Soloviov.
- Upstream commit 70c319c79aee4c4829587cfa7a53a3e1518378f6
- 
---- a/src/call-handler.cpp
-+++ b/src/call-handler.cpp
-@@ -83,7 +83,7 @@
-             continue;
-         }
-         //check if any call manager is already handling this channel
--	if (handledCallChannels.contains(callChannel)) {
-+	if (!handledCallChannels.contains(callChannel)) {
- 	    handledCallChannels.append(callChannel);
- 	    CallManager *manager = new CallManager(callChannel, this);
- 	}
diff --git a/debian/patches/series b/debian/patches/series
index fbff838..83b55df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-call_contains.patch
 dbus_include.patch

-- 
ktp-call-ui packaging