[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=70eb325

The following commit has been merged in the master branch:
commit 70eb32599b741bdbe7c3b337c06a5980b368ed19
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Mar 17 16:27:18 2012 +0000

    Fix compiles
---
 CMakeLists.txt                          |  6 +++---
 contact-applet/CMakeLists.txt           | 31 +++++--------------------------
 contact-applet/src/contact-delegate.cpp |  2 +-
 declarative-plugin/CMakeLists.txt       | 10 +++++-----
 4 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 150d41f..a7de9ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(plasma_applet_telepathy_contact_list)
+project(ktp_plasma)
 
 cmake_minimum_required(VERSION 2.8)
 
@@ -13,10 +13,10 @@ find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
 find_package(KDE4Workspace REQUIRED)
 find_package(TelepathyQt4 0.8.90 REQUIRED)
 find_package(KTp REQUIRED)
-#find_package (KTelepathy REQUIRED)
-
 
+add_subdirectory(contact-applet)
 add_subdirectory(declarative-plugin)
+
 install(DIRECTORY org.kde.ktp.contactlist
         DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/)
 
diff --git a/contact-applet/CMakeLists.txt b/contact-applet/CMakeLists.txt
index 50e94f3..403b272 100644
--- a/contact-applet/CMakeLists.txt
+++ b/contact-applet/CMakeLists.txt
@@ -1,29 +1,8 @@
-project(ktp-contact-applet)
-
-set(CMAKE_MODULE_PATH
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-    ${CMAKE_MODULE_PATH}
-)
-
-set(KDE_MIN_VERSION "4.6.0")
-
-set(IS_KTP_INTERNAL_MODULE TRUE)
-find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
-#find_package(KDE4Workspace REQUIRED)
-find_package(TelepathyQt4 0.8.9 REQUIRED)
-find_package(KTp REQUIRED)
-
-include(KDE4Defaults)
-
-add_definitions(${QT_DEFINITIONS}
-                ${KDE4_DEFINITIONS}
-)
-
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${CMAKE_BINARY_DIR}
-                    ${KDE4_INCLUDES}
-                    ${TELEPATHY_QT4_INCLUDE_DIR}
-                    ${KTP_INCLUDE_DIR}
+include_directories(
+        ${CMAKE_SOURCE_DIR}
+        ${CMAKE_BINARY_DIR}
+        ${KDE4_INCLUDES}
+        ${TELEPATHY_QT4_INCLUDE_DIR}
 )
 
 
diff --git a/contact-applet/src/contact-delegate.cpp b/contact-applet/src/contact-delegate.cpp
index 90b443a..53cd497 100644
--- a/contact-applet/src/contact-delegate.cpp
+++ b/contact-applet/src/contact-delegate.cpp
@@ -166,4 +166,4 @@ QSize ContactDelegate::sizeHint(const QStyleOptionViewItem &option, const QModel
 }
 
 
-#include "contact-delegate.moc"
+// #include "contact-delegate.moc"
diff --git a/declarative-plugin/CMakeLists.txt b/declarative-plugin/CMakeLists.txt
index 0cebb91..86a7a27 100644
--- a/declarative-plugin/CMakeLists.txt
+++ b/declarative-plugin/CMakeLists.txt
@@ -1,8 +1,3 @@
-set(ktpcontactlistqmlplugin_SRCS
-        qml-plugin.cpp
-        contact-list.cpp
-    )
-
 include_directories(
         ${CMAKE_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}
@@ -10,6 +5,11 @@ include_directories(
         ${TELEPATHY_QT4_INCLUDE_DIR}
 )
 
+set(ktpcontactlistqmlplugin_SRCS
+        qml-plugin.cpp
+        contact-list.cpp
+    )
+
 kde4_add_library(ktpcontactlistqmlplugin SHARED ${ktpcontactlistqmlplugin_SRCS})
 
 target_link_libraries(ktpcontactlistqmlplugin

-- 
ktp-contact-applet packaging