[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=19c2ad3

The following commit has been merged in the master branch:
commit 19c2ad397f8a7ae6f7c883427de6677cbee5002f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Dec 22 19:55:03 2011 +0000

    KTelepathy -> KTp
---
 CMakeLists.txt                     | 10 +++++-----
 cmake/modules/FindKTelepathy.cmake | 36 ------------------------------------
 cmake/modules/FindKTp.cmake        | 36 ++++++++++++++++++++++++++++++++++++
 mainwindow.cpp                     |  6 +++---
 4 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63a319d..afb763b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,10 +6,10 @@ set (CMAKE_MODULE_PATH
 )
 
 set(KDE_MIN_VERSION "4.7.0")
-set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
+set(IS_KTP_INTERNAL_MODULE TRUE)
 find_package(KDE4 REQUIRED)
 find_package(TelepathyQt4 0.8.9 REQUIRED)
-find_package(KTelepathy REQUIRED)
+find_package(KTp REQUIRED)
 
 include(KDE4Defaults)
 include(MacroLibrary)
@@ -21,7 +21,7 @@ include_directories(
   ${CMAKE_BINARY_DIR}
   ${KDE4_INCLUDES}
   ${TELEPATHY_QT4_INCLUDE_DIR}
-  ${KTELEPATHY_INCLUDE_DIR}
+  ${KTP_INCLUDE_DIR}
 )
 
 # Insert your sources here
@@ -42,8 +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}
+  ${KTP_LIBRARIES}
+  ${KTP_MODELS_LIBRARIES}
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
 
diff --git a/cmake/modules/FindKTelepathy.cmake b/cmake/modules/FindKTelepathy.cmake
deleted file mode 100644
index c9aa9dc..0000000
--- a/cmake/modules/FindKTelepathy.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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}
-)
-
-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/cmake/modules/FindKTp.cmake b/cmake/modules/FindKTp.cmake
new file mode 100644
index 0000000..899a120
--- /dev/null
+++ b/cmake/modules/FindKTp.cmake
@@ -0,0 +1,36 @@
+# Try to find the KTp library
+# KTP_FOUND
+# KTP_INCLUDE_DIR
+# KTP_LIBRARIES
+# KTP_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_KTP_INTERNAL_MODULE)
+   message (FATAL_ERROR "KTp can be used just from internal components at this time")
+endif (NOT IS_KTP_INTERNAL_MODULE)
+
+SET (KTP_FIND_REQUIRED ${KTp_FIND_REQUIRED})
+if (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
+  # Already in cache, be silent
+  set(KTP_FIND_QUIETLY TRUE)
+endif (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
+
+find_path(KTP_INCLUDE_DIR
+  NAMES KTp/presence.h
+  PATHS ${KDE4_INCLUDE_DIR}
+)
+
+find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
+find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG
+                                  KTP_LIBRARIES
+                                  KTP_MODELS_LIBRARIES
+                                  KTP_INCLUDE_DIR)
+
+mark_as_advanced(KTP_INCLUDE_DIRS KTP_LIBRARIES)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2c79e3c..0d654d6 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -46,9 +46,9 @@
 
 #include "flat-model-proxy.h"
 
-#include <KTelepathy/Models/accounts-model.h>
-#include <KTelepathy/Models/accounts-filter-model.h>
-#include <KTelepathy/Models/contact-model-item.h>
+#include <KTp/Models/accounts-model.h>
+#include <KTp/Models/accounts-filter-model.h>
+#include <KTp/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