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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit ee2bdd409a5de757c2fb36959844347d64d6cd1d
Author: Rohan Garg <rohan at garg.io>
Date:   Fri Nov 11 19:33:39 2016 +0100

    Refresh patch
---
 debian/patches/fix_qt4_test_build.patch | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/debian/patches/fix_qt4_test_build.patch b/debian/patches/fix_qt4_test_build.patch
index fba2bc3..36648d6 100644
--- a/debian/patches/fix_qt4_test_build.patch
+++ b/debian/patches/fix_qt4_test_build.patch
@@ -5,11 +5,9 @@ Subject: CMakeLists: BaseChannelFileTransferType tests disabled for Qt4
 
 The disabled tests use Qt5 macros
 
-diff --git a/tests/dbus/CMakeLists.txt b/tests/dbus/CMakeLists.txt
-index 41a0706..d676e5a 100644
 --- a/tests/dbus/CMakeLists.txt
 +++ b/tests/dbus/CMakeLists.txt
-@@ -93,7 +93,9 @@ tpqt_add_dbus_unit_test(Types types)
+@@ -93,7 +93,9 @@
  if(ENABLE_SERVICE_SUPPORT)
      tpqt_add_dbus_unit_test(BaseConnectionManager base-cm telepathy-qt${QT_VERSION_MAJOR}-service)
      tpqt_add_dbus_unit_test(BaseProtocol base-protocol telepathy-qt${QT_VERSION_MAJOR}-service)
@@ -17,9 +15,6 @@ index 41a0706..d676e5a 100644
 +    if (${QT_VERSION_MAJOR} EQUAL 5)
 +        tpqt_add_dbus_unit_test(BaseChannelFileTransferType base-filetransfer telepathy-qt${QT_VERSION_MAJOR}-service)
 +    endif()
- endif()
+ endif(ENABLE_SERVICE_SUPPORT)
  
  # Make check target. In case of check, output on failure and put it into a log
--- 
-cgit v0.10.2
-

-- 
telepathy-qt4 packaging