[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=408533f

The following commit has been merged in the master branch:
commit 408533f25ccaa1c55e1bbfdbc15abe3120736bd5
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Tue Dec 9 22:27:16 2014 +0100

    Fix dbus activation by using configure_file + install
    
    Instead of using CMake build in macros, install and configure the
    service file the same way we do in many others KDE projects such ktp or
    bluedevil.
    
    This fixes the dbus activation in different ways:
    -Makes it possible to install in different prefixes (not only /usr/lib)
    -Replaces the binary with the correct path (taking into account prefix)
---
 kded/CMakeLists.txt                | 7 +++++--
 kded/org.kde.kdeconnect.service.in | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 98304e4..46d25a9 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -23,5 +23,8 @@ endif()
 
 install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR})
 
-include(DbusActivationMacros)
-dbus_add_activation_service(org.kde.kdeconnect.service.in)
\ No newline at end of file
+configure_file(org.kde.kdeconnect.service.in
+               ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.service)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.service
+    DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
diff --git a/kded/org.kde.kdeconnect.service.in b/kded/org.kde.kdeconnect.service.in
index 847bd1a..e5f5dfd 100644
--- a/kded/org.kde.kdeconnect.service.in
+++ b/kded/org.kde.kdeconnect.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.kde.kdeconnect
-Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/kdeconnectd
+Exec=${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kdeconnectd

-- 
kdeconnect packaging