[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=92ff630

The following commit has been merged in the master branch:
commit 92ff6302bdadda83636f492ef12a379cd9b9e373
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Apr 28 00:18:29 2014 +0200

    Adapt to changes in plasma-framework
---
 CMakeLists.txt      | 2 ++
 chat/CMakeLists.txt | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48ab23c..35b652a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 set (CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
+find_package(KF5 REQUIRED COMPONENTS Plasma)
+
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
diff --git a/chat/CMakeLists.txt b/chat/CMakeLists.txt
index 8808314..4a0fa6c 100644
--- a/chat/CMakeLists.txt
+++ b/chat/CMakeLists.txt
@@ -2,8 +2,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.kde.ktp-chat/metadata.desktop.cma
                ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metadata.desktop
                @ONLY)
 
-install(DIRECTORY org.kde.ktp-chat DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/ PATTERN metadata.desktop.cmake EXCLUDE)
+install(DIRECTORY org.kde.ktp-chat DESTINATION ${PLASMA_DATA_INSTALL_DIR}/plasmoids/ PATTERN metadata.desktop.cmake EXCLUDE)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.ktp-chat/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metadata.desktop DESTINATION ${PLASMA_DATA_INSTALL_DIR}/plasmoids/org.kde.ktp-chat/)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.ktp-chat/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-ktp-chat.desktop)
 

-- 
ktp-contact-applet packaging