[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:29:05 UTC 2016


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

The following commit has been merged in the master branch:
commit d9be8f970c395ad2f75f1c4fae22649e087478ad
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Sep 11 21:46:25 2015 +0200

    Check for service validity in more places
    
    BUG: 352582
---
 CMakeLists.txt                   | 2 +-
 daemon/CMakeLists.txt            | 2 +-
 plugins/telephony/CMakeLists.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d6ad74..59aa4f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ add_subdirectory(plasmoid)
 add_subdirectory(cli)
 add_subdirectory(fileitemactionplugin)
 
-if (TelepathyQt5_FOUND)
+if (TelepathyQt5_FOUND AND TelepathyQt5Service_FOUND)
     add_subdirectory(telepathy-cm)
 endif()
 
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 6a72813..538e852 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -8,7 +8,7 @@ add_executable(kdeconnectd kdeconnectd.cpp)
 target_link_libraries(kdeconnectd kdeconnectcore KF5::KIOWidgets KF5::DBusAddons KF5::Notifications KF5::I18n Qt5::Widgets)
 
 ecm_mark_nongui_executable(kdeconnectd)
-if(TelepathyQt5_FOUND)
+if(TelepathyQt5_FOUND AND TelepathyQt5_FOUND)
     target_link_libraries(kdeconnectd connectcm)
 endif()
 
diff --git a/plugins/telephony/CMakeLists.txt b/plugins/telephony/CMakeLists.txt
index 6872a7d..b2a2442 100644
--- a/plugins/telephony/CMakeLists.txt
+++ b/plugins/telephony/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(kdeconnect_telephony
     KF5::Notifications
 )
 
-if (TelepathyQt5_FOUND)
+if (TelepathyQt5_FOUND AND TelepathyQt5_FOUND)
 target_link_libraries(kdeconnect_telephony
     connectcm
 )

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list