[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=e7b3b9e

The following commit has been merged in the master branch:
commit e7b3b9e6d81d50b7b0ad96a1c7ec7352f23fc57b
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Mon Nov 21 21:43:59 2011 +0100

    Port to new KTelepathy internal library
---
 CMakeLists.txt                     | 14 +++-----------
 cmake/modules/FindKTelepathy.cmake | 37 +++++++++++++++++++++++++++++++++++++
 src/CMakeLists.txt                 |  6 +-----
 src/filetransfer-handler.cpp       |  4 +++-
 src/main.cpp                       |  3 ++-
 5 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6db166b..37fd9a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,13 @@ project (telepathy-kde-filetransfer-handler)
 
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
+set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
 set(KDE_MIN_VERSION "4.6.0")
 set(TELEPATHY_QT4_MIN_VERSION "0.7.3")
 
 find_package (KDE4 ${KDE_MIN_VERSION} REQUIRED)
 find_package (TelepathyQt4 ${TELEPATHY_QT4_MIN_VERSION} REQUIRED)
+find_package (KTelepathy REQUIRED)
 
 include (CheckIncludeFiles)
 include (KDE4Defaults)
@@ -19,18 +21,8 @@ add_definitions (${KDE4_DEFINITIONS}
 
 include_directories (${KDE4_INCLUDES}
                      ${TELEPATHY_QT4_INCLUDE_DIR}
+                     ${KTELEPATHY_INCLUDE_DIR}
                      ${CMAKE_CURRENT_SOURCE_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)
-
-
 add_subdirectory(src)
diff --git a/cmake/modules/FindKTelepathy.cmake b/cmake/modules/FindKTelepathy.cmake
new file mode 100644
index 0000000..4a0e704
--- /dev/null
+++ b/cmake/modules/FindKTelepathy.cmake
@@ -0,0 +1,37 @@
+# Try to find the KTelepathy library
+# KTELEPATHY_FOUND
+# KTELEPATHY_INCLUDE_DIR
+# KTELEPATHY_LIBRARIES
+# KTELEPATHY_MODELS_LIBRARIES
+
+# 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
+  set(KTELEPATHY_FIND_QUIETLY TRUE)
+endif (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
+
+find_path(KTELEPATHY_INCLUDE_DIR
+  NAMES KTelepathy/presence.h
+  PATHS ${KDE4_INCLUDE_DIR}
+  PATH_SUFFIXES telepathy-1.0
+)
+
+find_library(KTELEPATHY_LIBRARIES NAMES telepathykdecommoninternalsprivate )
+find_library(KTELEPATHY_MODELS_LIBRARIES NAMES telepathykdemodelsprivate )
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTelepathy DEFAULT_MSG
+                                  KTELEPATHY_LIBRARIES
+                                  KTELEPATHY_MODELS_LIBRARIES
+                                  KTELEPATHY_INCLUDE_DIR)
+
+mark_as_advanced(KTELEPATHY_INCLUDE_DIRS KTELEPATHY_LIBRARIES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 46211ae..c554ab8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,14 +1,9 @@
-set (telepathy_kde_common_internals_SRCS
-     ../common/telepathy-handler-application.cpp
-)
-
 set (telepathy_kde_filetransfer_handler_SRCS
      main.cpp
      filetransfer-handler.cpp
      telepathy-base-job.cpp
      handle-incoming-file-transfer-channel-job.cpp
      handle-outgoing-file-transfer-channel-job.cpp
-     ${telepathy_kde_common_internals_SRCS}
 )
 
 kde4_add_executable(telepathy-kde-filetransfer-handler ${telepathy_kde_filetransfer_handler_SRCS})
@@ -18,6 +13,7 @@ target_link_libraries(telepathy-kde-filetransfer-handler
             ${KDE4_KDEUI_LIBS}
             ${KDE4_KIO_LIBS}
             ${TELEPATHY_QT4_LIBRARIES}
+            ${KTELEPATHY_LIBRARIES}
 )
 
 configure_file(org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index 7dd3c43..86192f2 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -16,10 +16,12 @@
  */
 
 #include "filetransfer-handler.h"
-#include "common/telepathy-handler-application.h"
+
 #include "handle-incoming-file-transfer-channel-job.h"
 #include "handle-outgoing-file-transfer-channel-job.h"
 
+#include <KTelepathy/telepathy-handler-application.h>
+
 #include <TelepathyQt4/ChannelClassSpecList>
 #include <TelepathyQt4/IncomingFileTransferChannel>
 #include <TelepathyQt4/OutgoingFileTransferChannel>
diff --git a/src/main.cpp b/src/main.cpp
index 00f998e..62e7a6e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -16,7 +16,8 @@
  */
 
 #include "filetransfer-handler.h"
-#include "common/telepathy-handler-application.h"
+
+#include <KTelepathy/telepathy-handler-application.h>
 
 #include <KAboutData>
 #include <KCmdLineArgs>

-- 
ktp-filetransfer-handler packaging