[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=7990958

The following commit has been merged in the master branch:
commit 7990958502aae07e6db5efee70796fc0cbc2c94c
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Jan 30 23:06:28 2012 +0000

    Put declarative lib in it's own folder
---
 plasmoid/declarative-plugin/CMakeLists.txt         | 33 ++++++++++++++++++++++
 .../conversation-que-manager.cpp                   |  0
 .../declarative-plugin}/conversation-que-manager.h |  0
 .../declarative-plugin}/conversation-target.cpp    |  0
 .../declarative-plugin}/conversation-target.h      |  0
 .../declarative-plugin}/conversation.cpp           |  0
 .../declarative-plugin}/conversation.h             |  0
 .../declarative-plugin}/conversations-model.cpp    |  0
 .../declarative-plugin}/conversations-model.h      |  0
 .../declarative-plugin}/ktpchat_export.h           |  0
 .../declarative-plugin}/messages-model.cpp         |  0
 .../declarative-plugin}/messages-model.h           |  4 +--
 .../declarative-plugin}/qml-plugins.cpp            |  0
 {lib => plasmoid/declarative-plugin}/qml-plugins.h |  0
 {lib => plasmoid/declarative-plugin}/qmldir        |  0
 .../telepathy-text-observer.cpp                    |  0
 .../declarative-plugin}/telepathy-text-observer.h  |  0
 17 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/plasmoid/declarative-plugin/CMakeLists.txt b/plasmoid/declarative-plugin/CMakeLists.txt
new file mode 100644
index 0000000..b6b44cf
--- /dev/null
+++ b/plasmoid/declarative-plugin/CMakeLists.txt
@@ -0,0 +1,33 @@
+project(ktpchatqmlplugin)
+
+set(ktpchatqmlplugin_SRCS
+        qml-plugins.cpp
+        messages-model.cpp
+        telepathy-text-observer.cpp
+        conversation.cpp
+        conversation-target.cpp
+        conversations-model.cpp
+        conversation-que-manager.cpp
+    )
+
+include_directories(
+        ${CMAKE_SOURCE_DIR}
+        ${CMAKE_BINARY_DIR}
+        ${KDE4_INCLUDES}
+)
+
+qt4_automoc(${ktpchatqmlplugin_SRCS})
+
+
+add_library(ktpchatqmlplugin SHARED ${ktpchatqmlplugin_SRCS})
+
+target_link_libraries(ktpchatqmlplugin
+        ${KDE4_KDECORE_LIBS}
+        ${QT_QTSCRIPT_LIBRARY}
+        ${QT_QTDECLARATIVE_LIBRARY}
+        ${TELEPATHY_QT4_LIBRARIES}
+        ktpchat
+)
+
+install(TARGETS ktpchatqmlplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/telepathy/chat)
+install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/telepathy/chat)
\ No newline at end of file
diff --git a/lib/conversation-que-manager.cpp b/plasmoid/declarative-plugin/conversation-que-manager.cpp
similarity index 100%
rename from lib/conversation-que-manager.cpp
rename to plasmoid/declarative-plugin/conversation-que-manager.cpp
diff --git a/lib/conversation-que-manager.h b/plasmoid/declarative-plugin/conversation-que-manager.h
similarity index 100%
rename from lib/conversation-que-manager.h
rename to plasmoid/declarative-plugin/conversation-que-manager.h
diff --git a/lib/conversation-target.cpp b/plasmoid/declarative-plugin/conversation-target.cpp
similarity index 100%
rename from lib/conversation-target.cpp
rename to plasmoid/declarative-plugin/conversation-target.cpp
diff --git a/lib/conversation-target.h b/plasmoid/declarative-plugin/conversation-target.h
similarity index 100%
rename from lib/conversation-target.h
rename to plasmoid/declarative-plugin/conversation-target.h
diff --git a/lib/conversation.cpp b/plasmoid/declarative-plugin/conversation.cpp
similarity index 100%
rename from lib/conversation.cpp
rename to plasmoid/declarative-plugin/conversation.cpp
diff --git a/lib/conversation.h b/plasmoid/declarative-plugin/conversation.h
similarity index 100%
rename from lib/conversation.h
rename to plasmoid/declarative-plugin/conversation.h
diff --git a/lib/conversations-model.cpp b/plasmoid/declarative-plugin/conversations-model.cpp
similarity index 100%
rename from lib/conversations-model.cpp
rename to plasmoid/declarative-plugin/conversations-model.cpp
diff --git a/lib/conversations-model.h b/plasmoid/declarative-plugin/conversations-model.h
similarity index 100%
rename from lib/conversations-model.h
rename to plasmoid/declarative-plugin/conversations-model.h
diff --git a/lib/ktpchat_export.h b/plasmoid/declarative-plugin/ktpchat_export.h
similarity index 100%
copy from lib/ktpchat_export.h
copy to plasmoid/declarative-plugin/ktpchat_export.h
diff --git a/lib/messages-model.cpp b/plasmoid/declarative-plugin/messages-model.cpp
similarity index 100%
copy from lib/messages-model.cpp
copy to plasmoid/declarative-plugin/messages-model.cpp
diff --git a/lib/messages-model.h b/plasmoid/declarative-plugin/messages-model.h
similarity index 95%
copy from lib/messages-model.h
copy to plasmoid/declarative-plugin/messages-model.h
index 7467f57..8da3626 100644
--- a/lib/messages-model.h
+++ b/plasmoid/declarative-plugin/messages-model.h
@@ -20,14 +20,12 @@
 #ifndef MESSAGES_MODEL_H
 #define MESSAGES_MODEL_H
 
-#include "ktpchat_export.h"
-
 #include <QAbstractItemModel>
 #include <TelepathyQt/TextChannel>
 #include "conversation-que-manager.h"
 
 
-class KDE_TELEPATHY_CHAT_EXPORT MessagesModel : public QAbstractListModel, public Queable
+class MessagesModel : public QAbstractListModel, public Queable
 {
     Q_OBJECT
     Q_PROPERTY(bool visibleToUser READ isVisibleToUser WRITE setVisibleToUser NOTIFY visibleToUserChanged);
diff --git a/lib/qml-plugins.cpp b/plasmoid/declarative-plugin/qml-plugins.cpp
similarity index 100%
rename from lib/qml-plugins.cpp
rename to plasmoid/declarative-plugin/qml-plugins.cpp
diff --git a/lib/qml-plugins.h b/plasmoid/declarative-plugin/qml-plugins.h
similarity index 100%
rename from lib/qml-plugins.h
rename to plasmoid/declarative-plugin/qml-plugins.h
diff --git a/lib/qmldir b/plasmoid/declarative-plugin/qmldir
similarity index 100%
rename from lib/qmldir
rename to plasmoid/declarative-plugin/qmldir
diff --git a/lib/telepathy-text-observer.cpp b/plasmoid/declarative-plugin/telepathy-text-observer.cpp
similarity index 100%
rename from lib/telepathy-text-observer.cpp
rename to plasmoid/declarative-plugin/telepathy-text-observer.cpp
diff --git a/lib/telepathy-text-observer.h b/plasmoid/declarative-plugin/telepathy-text-observer.h
similarity index 100%
rename from lib/telepathy-text-observer.h
rename to plasmoid/declarative-plugin/telepathy-text-observer.h

-- 
ktp-text-ui packaging