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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c521206b16324060c5c733fd58cf7deeb6e36f0c
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sat Jun 18 13:33:58 2016 +0200

    Move TelepathyQt5 dependency into the plugin
    
    Also drop KF5::Notifications from it
---
 CMakeLists.txt                              |  2 --
 plugins/CMakeLists.txt                      |  4 +---
 plugins/telepathy/CMakeLists.txt            | 17 +++++++++++++++--
 plugins/telepathy/kdeconnect_telepathy.json |  2 +-
 plugins/telepathy/telepathyplugin.h         |  4 ----
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7604b33..b273e15 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,6 @@ find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Gui)
 find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons)
 find_package(KF5DocTools)
 find_package(Qca-qt5 2.1.0 REQUIRED)
-find_package(TelepathyQt5 0.9.5)
-find_package(TelepathyQt5Service 0.9.7)
 
 include_directories(${CMAKE_SOURCE_DIR})
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 03e8a43..a443fa7 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -11,6 +11,7 @@ add_subdirectory(battery)
 add_subdirectory(runcommand)
 add_subdirectory(remotecommands)
 add_subdirectory(findmyphone)
+add_subdirectory(telepathy)
 if(NOT WIN32)
     add_subdirectory(sendnotifications)
     add_subdirectory(pausemusic)
@@ -24,9 +25,6 @@ if(EXPERIMENTALAPP_ENABLED)
     add_subdirectory(remotecontrol)
     add_subdirectory(lockdevice)
 endif()
-if (TelepathyQt5_FOUND AND TelepathyQt5Service_FOUND)
-    add_subdirectory(telepathy)
-endif()
 
 #FIXME: If we split notifications in several files, they won't appear in the same group in the Notifications KCM
 install(FILES kdeconnect.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
diff --git a/plugins/telepathy/CMakeLists.txt b/plugins/telepathy/CMakeLists.txt
index ee7f33c..bda74d1 100644
--- a/plugins/telepathy/CMakeLists.txt
+++ b/plugins/telepathy/CMakeLists.txt
@@ -1,4 +1,17 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications)
+find_package(TelepathyQt5 0.9.5)
+find_package(TelepathyQt5Service 0.9.7)
+
+set_package_properties(TelepathyQt5 PROPERTIES
+    PURPOSE "Allows integration with Telepathy. We suggest 'plugins/telepathy' to be packaged separately."
+    TYPE OPTIONAL
+)
+set_package_properties(TelepathyQt5Service PROPERTIES
+    PURPOSE "Allows integration with Telepathy. We suggest 'plugins/telepathy' to be packaged separately."
+    TYPE OPTIONAL
+)
+if (NOT TelepathyQt5Service_FOUND OR NOT TelepathyQt5_FOUND)
+    return()
+endif()
 
 include_directories(${CMAKE_BINARY_DIR})
 
@@ -13,6 +26,6 @@ kdeconnect_add_plugin(kdeconnect_telepathy JSON kdeconnect_telepathy.json
 target_link_libraries(kdeconnect_telepathy
     kdeconnectcore
     KF5::I18n
-    KF5::Notifications
     Qt5::DBus
+    Qt5::Gui
 )
diff --git a/plugins/telepathy/kdeconnect_telepathy.json b/plugins/telepathy/kdeconnect_telepathy.json
index dadd95b..2ec42b2 100644
--- a/plugins/telepathy/kdeconnect_telepathy.json
+++ b/plugins/telepathy/kdeconnect_telepathy.json
@@ -4,7 +4,7 @@
         "Authors": [
             {
                 "Name": "David Edmundson",
-                "Email": "davidedmundson at kde.org",
+                "Email": "davidedmundson at kde.org"
             }
         ], 
         "Description": "Show notifications for calls and SMS (answering coming soon)", 
diff --git a/plugins/telepathy/telepathyplugin.h b/plugins/telepathy/telepathyplugin.h
index c8201f4..c2c61f5 100644
--- a/plugins/telepathy/telepathyplugin.h
+++ b/plugins/telepathy/telepathyplugin.h
@@ -23,8 +23,6 @@
 
 #include <QLoggingCategory>
 
-#include <KNotification>
-
 #include <core/kdeconnectplugin.h>
 #include "kdeconnectinterface.h"
 
@@ -49,8 +47,6 @@ private Q_SLOTS:
     void sendSms(const QString& phoneNumber, const QString& messageBody);
 
 private:
-    KNotification* createNotification(const NetworkPackage& np);
-
     OrgFreedesktopTelepathyConnectionManagerKdeconnectInterface* m_telepathyInterface;
 };
 

-- 
kdeconnect packaging