[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f98593fb24fdc649fdabd4069045f54f19777113
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Tue Jan 8 00:56:41 2013 +0100

    Add chat plasmoid to build system
    
    And rename it to conform KTp naming policy
---
 CMakeLists.txt                                       | 2 +-
 chat/CMakeLists.txt                                  | 3 +++
 chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml | 2 +-
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml     | 2 +-
 chat/org.kde.ktp-chat/metadata.desktop               | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de89903..4836192 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,6 @@ find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
 find_package(TelepathyQt4 0.8.90 REQUIRED)
 find_package(KTp REQUIRED)
 
+add_subdirectory(chat)
 add_subdirectory(contact)
 add_subdirectory(contactlist)
-
diff --git a/chat/CMakeLists.txt b/chat/CMakeLists.txt
new file mode 100644
index 0000000..7218fa4
--- /dev/null
+++ b/chat/CMakeLists.txt
@@ -0,0 +1,3 @@
+install(DIRECTORY org.kde.ktp-chat DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/)
+install(FILES org.kde.ktp-chat/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-applet-ktp-chat.desktop)
+
diff --git a/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml b/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml
index 2d1fa55..c6d5871 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ActionDelegate.qml
@@ -20,7 +20,7 @@
 import QtQuick 1.1
 import org.kde.plasma.components 0.1 as PlasmaComponents
 import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.telepathy.chat 0.1
+import org.kde.telepathy 0.1
 
 PlasmaComponents.Label {
     text: "<i>* " + model.user + " " + model.text + "</i>"
diff --git a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
index ea68f41..818d93f 100644
--- a/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml
@@ -19,7 +19,7 @@
 */
 
 import QtQuick 1.1
-import org.kde.telepathy.chat 0.1
+import org.kde.telepathy 0.1
 import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets
 import org.kde.qtextracomponents 0.1 as ExtraComponents
 import org.kde.plasma.components 0.1 as PlasmaComponents
diff --git a/chat/org.kde.ktp-chat/metadata.desktop b/chat/org.kde.ktp-chat/metadata.desktop
index a382def..570da8f 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop
+++ b/chat/org.kde.ktp-chat/metadata.desktop
@@ -74,7 +74,7 @@ X-KDE-PluginInfo-Author=Lasath Fernando
 X-KDE-PluginInfo-Email=kde at lasath.org
 # X-KDE-PluginInfo-Website=http://plasma.kde.org/
 X-KDE-PluginInfo-Category=Online Services
-X-KDE-PluginInfo-Name=org.kde.ktp-chatplasmoid
+X-KDE-PluginInfo-Name=org.kde.ktp-chat
 X-KDE-PluginInfo-Version=0.5.2
 
 # X-KDE-PluginInfo-Depends=

-- 
ktp-contact-applet packaging