[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=0c8d86f

The following commit has been merged in the master branch:
commit 0c8d86f149ef98b27d2ceac4cea71c1498477752
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Oct 21 17:30:13 2011 +0200

    Rename DBus services, fix .client and .service files
    
    NOTE: Delete the old client and service files before installing
---
 src/CMakeLists.txt                                                | 8 ++++----
 src/{KDE.FileTransfer.client => KDE.FileTransferHandler.client}   | 0
 src/main.cpp                                                      | 2 +-
 ...eedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in} | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aeeadde..46211ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,11 +20,11 @@ target_link_libraries(telepathy-kde-filetransfer-handler
             ${TELEPATHY_QT4_LIBRARIES}
 )
 
-configure_file(org.freedesktop.Telepathy.Client.KDE.FileTransfer.service.in
-               ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.FileTransfer.service)
+configure_file(org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
+        ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service)
 
 install(TARGETS telepathy-kde-filetransfer-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.FileTransfer.service
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-install(FILES KDE.FileTransfer.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+install(FILES KDE.FileTransferHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
 
diff --git a/src/KDE.FileTransfer.client b/src/KDE.FileTransferHandler.client
similarity index 100%
rename from src/KDE.FileTransfer.client
rename to src/KDE.FileTransferHandler.client
diff --git a/src/main.cpp b/src/main.cpp
index 2a3882f..ba44cee 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -55,7 +55,7 @@ int main(int argc, char* argv[])
                                                                    contactFactory);
 
     Tp::SharedPtr<FileTransferHandler> fth = Tp::SharedPtr<FileTransferHandler>(new FileTransferHandler(&app));
-    if(!registrar->registerClient(Tp::AbstractClientPtr(fth), QLatin1String("KDE.FileTransfer"))) {
+    if(!registrar->registerClient(Tp::AbstractClientPtr(fth), QLatin1String("KDE.FileTransferHandler"))) {
         kDebug() << "File Transfer Handler already running. Exiting";
         return 1;
     }
diff --git a/src/org.freedesktop.Telepathy.Client.KDE.FileTransfer.service.in b/src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
similarity index 55%
rename from src/org.freedesktop.Telepathy.Client.KDE.FileTransfer.service.in
rename to src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
index 49bd40a..cb69684 100644
--- a/src/org.freedesktop.Telepathy.Client.KDE.FileTransfer.service.in
+++ b/src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.KDE.FileTransfer
+Name=org.freedesktop.Telepathy.Client.KDE.FileTransferHandler
 Exec=@LIBEXEC_INSTALL_DIR@/telepathy-kde-filetransfer-handler

-- 
ktp-filetransfer-handler packaging