[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit fdb873d78bf83b5e5df7c93c4c02328514a5e0dd
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Sep 16 15:02:53 2011 +0100

    Install chat-ui and adiumxtra-protocol-handler in libexec.
    
    BUG: 282142
    BUG: 278389
---
 adiumxtra-protocol-handler/CMakeLists.txt                            | 5 +++--
 .../{adiumxtra.protocol => adiumxtra.protocol.in}                    | 2 +-
 app/CMakeLists.txt                                                   | 2 +-
 app/org.freedesktop.Telepathy.Client.KDE.TextUi.service.in           | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/adiumxtra-protocol-handler/CMakeLists.txt b/adiumxtra-protocol-handler/CMakeLists.txt
index 1b5df41..d0f25ae 100644
--- a/adiumxtra-protocol-handler/CMakeLists.txt
+++ b/adiumxtra-protocol-handler/CMakeLists.txt
@@ -24,6 +24,7 @@ target_link_libraries(adiumxtra-protocol-handler
 			ktelepathy_chat_lib)
 
 
-install(TARGETS adiumxtra-protocol-handler ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS adiumxtra-protocol-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
 
-install( FILES adiumxtra.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
+configure_file(adiumxtra.protocol.in  ${CMAKE_CURRENT_BINARY_DIR}/adiumxtra.protocol)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/adiumxtra.protocol DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/adiumxtra-protocol-handler/adiumxtra.protocol b/adiumxtra-protocol-handler/adiumxtra.protocol.in
similarity index 74%
rename from adiumxtra-protocol-handler/adiumxtra.protocol
rename to adiumxtra-protocol-handler/adiumxtra.protocol.in
index 153b3c5..bea4f31 100644
--- a/adiumxtra-protocol-handler/adiumxtra.protocol
+++ b/adiumxtra-protocol-handler/adiumxtra.protocol.in
@@ -1,6 +1,6 @@
 [Protocol]
 Type=Service
-exec=adiumxtra-protocol-handler "%U"
+exec=@LIBEXEC_INSTALL_DIR@/adiumxtra-protocol-handler "%U"
 protocol=adiumxtra
 input=none
 output=none
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index feb25d8..ae9f43b 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -22,7 +22,7 @@ target_link_libraries(telepathy-kde-text-ui
 configure_file(org.freedesktop.Telepathy.Client.KDE.TextUi.service.in
                ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TextUi.service)
 
-install(TARGETS telepathy-kde-text-ui ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS telepathy-kde-text-ui DESTINATION ${LIBEXEC_INSTALL_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TextUi.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
 install(FILES KDE.TextUi.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
diff --git a/app/org.freedesktop.Telepathy.Client.KDE.TextUi.service.in b/app/org.freedesktop.Telepathy.Client.KDE.TextUi.service.in
index d2ddafd..d333f8b 100644
--- a/app/org.freedesktop.Telepathy.Client.KDE.TextUi.service.in
+++ b/app/org.freedesktop.Telepathy.Client.KDE.TextUi.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.KDE.TextUi
-Exec=@CMAKE_INSTALL_PREFIX@/bin/telepathy-kde-text-ui
+Exec=@LIBEXEC_INSTALL_DIR@/telepathy-kde-text-ui

-- 
ktp-text-ui packaging