[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=908acec

The following commit has been merged in the master branch:
commit 908acec6de7e037f2f8aac41b04126fc7061a77a
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Mar 6 13:54:20 2012 +0100

    Do not load module automatically but by MC when it is started
    
    See ktp-approver commit 5ebe32c9cce383fb998356adc07adb90baa18d8a
    
    Reviewed-by: Martin Klapetek <martin.klapetek at gmail.com>
    BUG: 291817
    BUG: 284779
---
 CMakeLists.txt                                                       | 5 +++++
 kded_ktp_integration_module.desktop                                  | 5 ++---
 ...freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in | 3 +++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b97bca..c55fa84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,5 +58,10 @@ install (FILES kded_ktp_integration_module.desktop
          DESTINATION ${SERVICES_INSTALL_DIR}/kded
 )
 
+find_file(DBUS_SEND_PATH dbus-send HINTS /usr/bin)
+configure_file(org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in
+               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service
+        DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
 
 add_subdirectory(config)
diff --git a/kded_ktp_integration_module.desktop b/kded_ktp_integration_module.desktop
index 19fa2f8..97e73fe 100644
--- a/kded_ktp_integration_module.desktop
+++ b/kded_ktp_integration_module.desktop
@@ -3,9 +3,8 @@ Type=Service
 X-KDE-ServiceTypes=KDEDModule
 X-KDE-Library=ktp_integration_module
 X-KDE-DBus-ModuleName=kded_ktp_integration_module
-X-KDE-Kded-autoload=true
-X-KDE-Kded-phase=2
-X-KDE-Kded-load-on-demand=false
+X-KDE-Kded-autoload=false
+X-KDE-Kded-load-on-demand=true
 Name=Telepathy Integration Module
 Name[ca]=Mòdul d'integració del Telepathy
 Name[da]=Modul til Telepathy-integration
diff --git a/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in b/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in
new file mode 100644
index 0000000..d864d1c
--- /dev/null
+++ b/org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.KTp.KdedIntegrationModule
+Exec=@DBUS_SEND_PATH@ --session --type=method_call --dest=org.kde.kded /kded org.kde.kded.loadModule string:"kded_ktp_integration_module"

-- 
ktp-kded-integration-module packaging