[SCM] ktp-approver packaging branch, master, updated. debian/15.12.1-1-299-g62cbbd7

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=0402390

The following commit has been merged in the master branch:
commit 0402390caba3c8fb125007132486e81d061792b5
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sat Dec 17 23:19:20 2011 +0100

    Find path of dbus-send
---
 src/CMakeLists.txt                                           | 7 ++++++-
 src/org.freedesktop.Telepathy.Client.KDE.Approver.service    | 3 ---
 src/org.freedesktop.Telepathy.Client.KDE.Approver.service.in | 3 +++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ee6aeb6..3ab54c4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,4 +17,9 @@ target_link_libraries(kded_telepathy_kde_approver ${KDE4_KDEUI_LIBS}
 install(TARGETS kded_telepathy_kde_approver DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES telepathy_kde_approver.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded)
 install(FILES telepathy_kde_approverrc DESTINATION ${CONFIG_INSTALL_DIR})
-install(FILES org.freedesktop.Telepathy.Client.KDE.Approver.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
+
+find_file(DBUS_SEND_PATH dbus-send HINTS /usr/bin)
+configure_file(org.freedesktop.Telepathy.Client.KDE.Approver.service.in
+               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.Approver.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.Approver.service
+        DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
diff --git a/src/org.freedesktop.Telepathy.Client.KDE.Approver.service b/src/org.freedesktop.Telepathy.Client.KDE.Approver.service
deleted file mode 100644
index 64d870a..0000000
--- a/src/org.freedesktop.Telepathy.Client.KDE.Approver.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.KDE.Approver
-Exec=/usr/bin/dbus-send --session --type=method_call --dest=org.kde.kded /kded org.kde.kded.loadModule string:"telepathy_kde_approver"
diff --git a/src/org.freedesktop.Telepathy.Client.KDE.Approver.service.in b/src/org.freedesktop.Telepathy.Client.KDE.Approver.service.in
new file mode 100644
index 0000000..dc1b52f
--- /dev/null
+++ b/src/org.freedesktop.Telepathy.Client.KDE.Approver.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.freedesktop.Telepathy.Client.KDE.Approver
+Exec=@DBUS_SEND_PATH@ --session --type=method_call --dest=org.kde.kded /kded org.kde.kded.loadModule string:"telepathy_kde_approver"

-- 
ktp-approver packaging