[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=2492b7f

The following commit has been merged in the master branch:
commit 2492b7fd26772b29ff62bf58cfbc90a629ded1e3
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Mon Mar 14 23:20:03 2011 +0100

    Rename telepathy-chat-handler to telepathy-kde-text-ui.
---
 app/CMakeLists.txt                                             | 10 +++++-----
 app/Messages.sh                                                |  2 +-
 app/chatwindow.rc                                              |  2 +-
 app/main.cpp                                                   |  2 +-
 app/org.freedesktop.Telepathy.Client.KDEChatHandler.service.in |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 825c840..23bdf32 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -1,15 +1,15 @@
 include_directories(${TELEPATHY_CHAT_HANDLER_SOURCE_DIR}/lib)
 
-set(telepathy_chat_handler_SRCS
+set(telepathy_kde_text_ui_SRCS
         main.cpp
         telepathy-chat-ui.cpp
         chat-window.cpp
         chat-tab.cpp
 )
 
-kde4_add_executable(telepathy-chat-handler ${telepathy_chat_handler_SRCS})
+kde4_add_executable(telepathy-kde-text-ui ${telepathy_kde_text_ui_SRCS})
 
-target_link_libraries(telepathy-chat-handler
+target_link_libraries(telepathy-kde-text-ui
             ${KDE4_KDECORE_LIBS}
             ${KDE4_KDEUI_LIBS}
             ${TELEPATHY_QT4_LIBRARIES}
@@ -21,9 +21,9 @@ target_link_libraries(telepathy-chat-handler
 configure_file(org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
                ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDEChatHandler.service)
 
-install(TARGETS telepathy-chat-handler ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS telepathy-kde-text-ui ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDEChatHandler.service
         DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
 install(FILES KDEChatHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
 install(FILES chatwindow.rc
-        DESTINATION  ${DATA_INSTALL_DIR}/ktelepathy/)
+        DESTINATION  ${DATA_INSTALL_DIR}/telepathy-kde-text-ui/)
diff --git a/app/Messages.sh b/app/Messages.sh
index c21530e..ed451f5 100755
--- a/app/Messages.sh
+++ b/app/Messages.sh
@@ -1,4 +1,4 @@
 #! /usr/bin/env bash
 #$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/telepathy-chat-handler.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/telepathy-kde-text-ui.pot
 #rm -f rc.cpp
diff --git a/app/chatwindow.rc b/app/chatwindow.rc
index 24656bd..f43a196 100644
--- a/app/chatwindow.rc
+++ b/app/chatwindow.rc
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<gui name="telepathy-chat-handler"
+<gui name="telepathy-kde-text-ui"
      version="1"
      xmlns="http://www.kde.org/standards/kxmlgui/1.0"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/main.cpp b/app/main.cpp
index 89e4aba..cba9b40 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -32,7 +32,7 @@
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("telepathy-chat-handler",
+    KAboutData aboutData("telepathy-kde-text-ui",
                          0,
                          ki18n("Telepathy Chat Handler"),
                          "0.1");
diff --git a/app/org.freedesktop.Telepathy.Client.KDEChatHandler.service.in b/app/org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
index a653ae8..9b7044f 100644
--- a/app/org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
+++ b/app/org.freedesktop.Telepathy.Client.KDEChatHandler.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.KDEChatHandler
-Exec=@CMAKE_INSTALL_PREFIX@/bin/telepathy-chat-handler
+Exec=@CMAKE_INSTALL_PREFIX@/bin/telepathy-kde-text-ui

-- 
ktp-text-ui packaging