[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.6.1-4-13-gb2b98fa

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=b2b98fa

The following commit has been merged in the master branch:
commit b2b98fa81d027501e21bccdb773afb25ae4deee1
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Apr 27 20:02:50 2016 +0200

    Refresh patch to make sure it applies
---
 debian/patches/fix-failing-test.patch | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/debian/patches/fix-failing-test.patch b/debian/patches/fix-failing-test.patch
index b2ff7a7..4ae3849 100644
--- a/debian/patches/fix-failing-test.patch
+++ b/debian/patches/fix-failing-test.patch
@@ -6,11 +6,11 @@ Subject: Use C++ bool type rather than mixing with gboolean
 They are not always the same size.
 This fixes a compile error on some systems.
 
-diff --git a/tests/dbus/contacts-capabilities.cpp b/tests/dbus/contacts-capabilities.cpp
-index 72ea95e..0095f85 100644
---- a/tests/dbus/contacts-capabilities.cpp
-+++ b/tests/dbus/contacts-capabilities.cpp
-@@ -111,7 +111,7 @@ void TestContactsCapabilities::testCapabilities()
+Index: telepathy-qt-0.9.6.1/tests/dbus/contacts-capabilities.cpp
+===================================================================
+--- telepathy-qt-0.9.6.1.orig/tests/dbus/contacts-capabilities.cpp
++++ telepathy-qt-0.9.6.1/tests/dbus/contacts-capabilities.cpp
+@@ -111,7 +111,7 @@ void TestContactsCapabilities::testCapab
      QStringList ids = QStringList() << QLatin1String("alice")
          << QLatin1String("bob") << QLatin1String("chris");
  
@@ -19,15 +19,3 @@ index 72ea95e..0095f85 100644
  
      TpHandleRepoIface *serviceRepo =
          tp_base_connection_get_handles(TP_BASE_CONNECTION(mConn->service()),
-@@ -135,7 +135,7 @@ void TestContactsCapabilities::testCapabilities()
-         QCOMPARE(contact->requestedFeatures().contains(Contact::FeatureCapabilities), true);
-         QCOMPARE(contact->actualFeatures().contains(Contact::FeatureCapabilities), true);
- 
--        QCOMPARE(contact->capabilities().textChats(), static_cast<bool>(supportTextChat[i]));
-+        QCOMPARE(contact->capabilities().textChats(), supportTextChat[i]);
-         QCOMPARE(contact->capabilities().streamedMediaCalls(), false);
-         QCOMPARE(contact->capabilities().streamedMediaAudioCalls(), false);
-         QCOMPARE(contact->capabilities().streamedMediaVideoCalls(), false);
--- 
-cgit v0.10.2
-

-- 
telepathy-qt4 packaging