[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:20:38 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=02373a6
The following commit has been merged in the master branch:
commit 02373a641da4868dcfa27a3394872dddad6aa748
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Thu Dec 22 18:27:09 2011 +0000
KTelepathy -> KTp.
Use newer FindKTtp
---
CMakeLists.txt | 6 +++---
cmake/modules/FindKTelepathy.cmake | 36 ------------------------------------
cmake/modules/FindKTp.cmake | 36 ++++++++++++++++++++++++++++++++++++
lib/CMakeLists.txt | 2 +-
lib/channel-contact-model.h | 2 +-
lib/chat-widget.cpp | 2 +-
lib/chat-widget.h | 2 +-
7 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bcf5912..d1cc185 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
project(ktp-text-ui)
-set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
+set(IS_KTP_INTERNAL_MODULE TRUE)
# Include our extra FindFoo.cmake files.
set (CMAKE_MODULE_PATH
@@ -11,7 +11,7 @@ set (CMAKE_MODULE_PATH
set(KDE_MIN_VERSION "4.4.75")
find_package (KDE4 ${KDE_MIN_VERSION} REQUIRED)
find_package (TelepathyQt4 0.8.9 REQUIRED)
-find_package (KTelepathy REQUIRED)
+find_package (KTp REQUIRED)
include (CheckIncludeFiles)
include (KDE4Defaults)
@@ -20,7 +20,7 @@ include (MacroLibrary)
include_directories (${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
${QT_QTWEBKIT_INCLUDES}
- ${KTELEPATHY_INCLUDE_DIR}
+ ${KTP_INCLUDE_DIR}
)
add_definitions (${KDE4_DEFINITIONS}
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/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 8c7f3f1..5d39a62 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -74,7 +74,7 @@ target_link_libraries(ktpchat
${QT_QTWEBKIT_LIBRARY}
${KDE4_KEMOTICONS_LIBS}
${KDE4_KCMUTILS_LIBS}
- ${KTELEPATHY_LIBRARIES}
+ ${KTP_LIBRARIES}
)
install(TARGETS ktpchat ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/lib/channel-contact-model.h b/lib/channel-contact-model.h
index 0250e1d..41d5d84 100644
--- a/lib/channel-contact-model.h
+++ b/lib/channel-contact-model.h
@@ -28,7 +28,7 @@
#include <TelepathyQt/Channel>
#include <TelepathyQt/Presence>
-#include <KTelepathy/presence.h>
+#include <KTp/presence.h>
/** A model of all users in the channel.
Also acts as a proxy for emiting presence and alias changes of any contacts in the channel
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index f096959..d898ceb 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -45,7 +45,7 @@
#include <TelepathyQt/Connection>
#include <TelepathyQt/Presence>
-#include <KTelepathy/presence.h>
+#include <KTp/presence.h>
class ChatWidgetPrivate
{
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index 9720cc2..0bf7718 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -32,7 +32,7 @@
#include <TelepathyQt/ReceivedMessage>
-#include <KTelepathy/presence.h>
+#include <KTp/presence.h>
class AdiumThemeContentInfo;
class ChatSearchBar;
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list