[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=361911d

The following commit has been merged in the master branch:
commit 361911d781c1166c172c2a2988e83ae1e2a3bb09
Author: Alin M Elena <alinm.elena at gmail.com>
Date:   Fri Dec 23 10:28:45 2011 +0000

    updated the names according to Daniele's comments
---
 CMakeLists.txt                                                    | 2 +-
 Messages.sh                                                       | 2 +-
 src/CMakeLists.txt                                                | 8 ++++----
 ....FileTransferHandler.client => KTp.FileTransferHandler.client} | 0
 src/main.cpp                                                      | 4 ++--
 ...eedesktop.Telepathy.Client.KTp.FileTransferHandler.service.in} | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4ae30f..c07e849 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project (telepathy-kde-filetransfer-handler)
+project (ktp-filetransfer-handler)
 
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
diff --git a/Messages.sh b/Messages.sh
index cd00be3..55d559c 100644
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,4 +1,4 @@
 #!bin/sh
 $EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
-$XGETTEXT `find . -name \*.cc -o -name \*.cpp -o -name \*.h` -o $podir/telepathy-filetransfer-handler.pot
+$XGETTEXT `find . -name \*.cc -o -name \*.cpp -o -name \*.h` -o $podir/ktp-filetransfer-handler.pot
 rm -f rc.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bfc82ad..d686cf0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -16,11 +16,11 @@ target_link_libraries(ktp-filetransfer-handler
             ${KTP_LIBRARIES}
 )
 
-configure_file(org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
-        ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service)
+configure_file(org.freedesktop.Telepathy.Client.KTp.FileTransferHandler.service.in
+        ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.FileTransferHandler.service)
 
 install(TARGETS ktp-filetransfer-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.FileTransferHandler.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-install(FILES KDE.FileTransferHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
+install(FILES KTp.FileTransferHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
 
diff --git a/src/KDE.FileTransferHandler.client b/src/KTp.FileTransferHandler.client
similarity index 100%
rename from src/KDE.FileTransferHandler.client
rename to src/KTp.FileTransferHandler.client
diff --git a/src/main.cpp b/src/main.cpp
index 9996dfe..ce2d0b2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,7 +28,7 @@
 
 int main(int argc, char* argv[])
 {
-    KAboutData aboutData("telepathy-kde-filetransfer-handler",
+    KAboutData aboutData("ktp-filetransfer-handler",
                          "telepathy-filetransfer-handler",
                          ki18n("Telepathy File Transfer Handler"),
                          "0.2.60");
@@ -56,7 +56,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.FileTransferHandler"))) {
+    if(!registrar->registerClient(Tp::AbstractClientPtr(fth), QLatin1String("KTp.FileTransferHandler"))) {
         kDebug() << "File Transfer Handler already running. Exiting";
         return 1;
     }
diff --git a/src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in b/src/org.freedesktop.Telepathy.Client.KTp.FileTransferHandler.service.in
similarity index 52%
rename from src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
rename to src/org.freedesktop.Telepathy.Client.KTp.FileTransferHandler.service.in
index 4105138..0951dad 100644
--- a/src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
+++ b/src/org.freedesktop.Telepathy.Client.KTp.FileTransferHandler.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.freedesktop.Telepathy.Client.KDE.FileTransferHandler
+Name=org.freedesktop.Telepathy.Client.KTp.FileTransferHandler
 Exec=@LIBEXEC_INSTALL_DIR@/ktp-filetransfer-handler

-- 
ktp-filetransfer-handler packaging