[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=2bd1550

The following commit has been merged in the master branch:
commit 2bd1550c94a6a3bbc0485e1cdb2f40a6f4ef81c1
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Mon Nov 21 22:12:34 2011 +0100

    Port to new KTelepathy internals library
---
 CMakeLists.txt                     | 21 +++++----------------
 cmake/modules/FindKTelepathy.cmake | 34 ++++++++++++++++------------------
 common                             |  1 -
 mainwindow.cpp                     |  6 +++---
 4 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bd0777..a09e7dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,10 @@ set (CMAKE_MODULE_PATH
 )
 
 set(KDE_MIN_VERSION "4.7.0")
+set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
 find_package(KDE4 REQUIRED)
 find_package(TelepathyQt4 0.7.1 REQUIRED)
+find_package(KTelepathy REQUIRED)
 
 include(KDE4Defaults)
 include(MacroLibrary)
@@ -19,28 +21,13 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${KDE4_INCLUDES}
   ${TELEPATHY_QT4_INCLUDE_DIR}
+  ${KTELEPATHY_INCLUDE_DIR}
 )
 
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-execute_process(COMMAND git submodule init
-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-execute_process(COMMAND git submodule update
-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-
 # Insert your sources here
 set(TELEPATHY_KDE_SEND_FILE_SRCS
     mainwindow.cpp
     main.cpp
-    common/service-availability-checker.cpp
-    common/models/accounts-model-item.cpp
-    common/models/accounts-filter-model.cpp
-    common/models/accounts-model.cpp
-    common/models/contact-model-item.cpp
-    common/models/tree-node.cpp
     flat-model-proxy.cpp
 )
 
@@ -55,6 +42,8 @@ kde4_add_executable(telepathy-kde-send-file ${TELEPATHY_KDE_SEND_FILE_SRCS})
 # Link against the needed libraries
 target_link_libraries(telepathy-kde-send-file
   ${TELEPATHY_QT4_LIBRARIES}
+  ${KTELEPATHY_LIBRARIES}
+  ${KTELEPATHY_MODELS_LIBRARIES}
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
 
diff --git a/cmake/modules/FindKTelepathy.cmake b/cmake/modules/FindKTelepathy.cmake
index 3f34148..4a0e704 100644
--- a/cmake/modules/FindKTelepathy.cmake
+++ b/cmake/modules/FindKTelepathy.cmake
@@ -1,14 +1,18 @@
 # Try to find the KTelepathy library
-# KTELEPATHY_FOUND - system has libkcmtelepathyaccounts
-# KTELEPATHY_INCLUDE_DIR - the kcmtelepathyaccounts include directory
-# KTELEPATHY_LIBRARIES - Link these to use libkcmtelepathyaccounts
+# KTELEPATHY_FOUND
+# KTELEPATHY_INCLUDE_DIR
+# KTELEPATHY_LIBRARIES
+# KTELEPATHY_MODELS_LIBRARIES
 
-# Copyright (c) 2008, Allen Winter <winter at kde.org>
-# Copyright (c) 2010, Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
+# Copyright (c) 2011, Dario Freddi <drf at kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+if (NOT IS_TELEPATHY_KDE_INTERNAL_MODULE)
+   message (FATAL_ERROR "KTelepathy can be used just from internal components at this time")
+endif (NOT IS_TELEPATHY_KDE_INTERNAL_MODULE)
+
 SET (KTELEPATHY_FIND_REQUIRED ${KTelepathy_FIND_REQUIRED})
 if (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
   # Already in cache, be silent
@@ -16,24 +20,18 @@ if (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
 endif (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
 
 find_path(KTELEPATHY_INCLUDE_DIR
-  NAMES abstract-tree-item.h
+  NAMES KTelepathy/presence.h
   PATHS ${KDE4_INCLUDE_DIR}
-  PATH_SUFFIXES ktelepathy
+  PATH_SUFFIXES telepathy-1.0
 )
 
-find_path(KTELEPATHY_INCLUDE_DIRS
-  NAMES KTelepathy/AbstractTreeItem
-  PATHS ${KDE4_INCLUDE_DIR}
-  PATH_SUFFIXES KDE
-)
-
-set(KTELEPATHY_INCLUDE_DIRS ${KTELEPATHY_INCLUDE_DIRS} ${KTELEPATHY_INCLUDE_DIR})
-
-find_library(KTELEPATHY_LIBRARIES NAMES ktelepathy )
+find_library(KTELEPATHY_LIBRARIES NAMES telepathykdecommoninternalsprivate )
+find_library(KTELEPATHY_MODELS_LIBRARIES NAMES telepathykdemodelsprivate )
 
 include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTELEPATHY DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTelepathy DEFAULT_MSG
                                   KTELEPATHY_LIBRARIES
-                                  KTELEPATHY_INCLUDE_DIRS)
+                                  KTELEPATHY_MODELS_LIBRARIES
+                                  KTELEPATHY_INCLUDE_DIR)
 
 mark_as_advanced(KTELEPATHY_INCLUDE_DIRS KTELEPATHY_LIBRARIES)
diff --git a/common b/common
deleted file mode 160000
index e11a41b..0000000
--- a/common
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e11a41b5010744f7f0a544495551b4c17f0a5895
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 4ceda84..f3af59c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -46,9 +46,9 @@
 
 #include "flat-model-proxy.h"
 
-#include "common/models/accounts-model.h"
-#include "common/models/accounts-filter-model.h"
-#include "common/models/contact-model-item.h"
+#include <KTelepathy/Models/accounts-model.h>
+#include <KTelepathy/Models/accounts-filter-model.h>
+#include <KTelepathy/Models/contact-model-item.h>
 
 //FIXME, copy and paste the approver code for loading this from a config file into this, the contact list and the chat handler.
 #define PREFERRED_FILETRANSFER_HANDLER "org.freedesktop.Telepathy.Client.KDE.FileTransfer"

-- 
ktp-send-file packaging