[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:58:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=ba657ae
The following commit has been merged in the master branch:
commit ba657ae3b5c7f10628a255ecdf2620df6ed3f7e7
Author: Alin M Elena <alinm.elena at gmail.com>
Date: Fri Dec 23 08:42:26 2011 +0000
changes to the new names policy
---
CMakeLists.txt | 22 +++++++++++-----------
cmake/modules/FindKTelepathy.cmake | 36 ------------------------------------
cmake/modules/FindKTp.cmake | 36 ++++++++++++++++++++++++++++++++++++
main.cpp | 2 +-
password-prompt.cpp | 2 +-
sasl-auth-op.cpp | 2 +-
sasl-handler.cpp | 2 +-
tls-handler.cpp | 2 +-
8 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9581cd..b96d111 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,15 @@
-project(telepathy-kde-auth-handler)
+project(ktp-auth-handler)
set (CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
${CMAKE_MODULE_PATH}
)
-set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
+set(IS_KTP_INTERNAL_MODULE TRUE)
set(KDE_MIN_VERSION "4.4.75")
find_package (KDE4 4.4.75 REQUIRED)
find_package (TelepathyQt4 0.8.9 REQUIRED)
-find_package (KTelepathy REQUIRED)
+find_package (KTp REQUIRED)
include (KDE4Defaults)
include (MacroLibrary)
@@ -19,10 +19,10 @@ add_definitions (${KDE4_DEFINITIONS}
include_directories (${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTELEPATHY_INCLUDE_DIR}
+ ${KTP_INCLUDE_DIR}
)
-set(telepathy_kde_auth_handler_SRCS
+set(ktp_auth_handler_SRCS
main.cpp
password-prompt.cpp
sasl-handler.cpp
@@ -30,19 +30,19 @@ set(telepathy_kde_auth_handler_SRCS
tls-cert-verifier-op.cpp
tls-handler.cpp
types.cpp
- ${telepathy_kde_common_internals_SRCS}
+ ${ktp_common_internals_SRCS}
)
-kde4_add_ui_files(telepathy_kde_auth_handler_SRCS password-prompt.ui)
-kde4_add_executable(telepathy-kde-auth-handler ${telepathy_kde_auth_handler_SRCS})
+kde4_add_ui_files(ktp_auth_handler_SRCS password-prompt.ui)
+kde4_add_executable(ktp-auth-handler ${ktp_auth_handler_SRCS})
-target_link_libraries(telepathy-kde-auth-handler
+target_link_libraries(ktp-auth-handler
${QT_QTDBUS_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTCORE_LIBRARY}
${TELEPATHY_QT4_LIBRARIES}
- ${KTELEPATHY_LIBRARIES}
+ ${KTP_LIBRARIES}
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
)
@@ -53,7 +53,7 @@ configure_file(org.freedesktop.Telepathy.Client.KDE.SASLHandler.service.in
# ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TLSHandler.service)
-install(TARGETS telepathy-kde-auth-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(TARGETS ktp-auth-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.SASLHandler.service
DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.TLSHandler.service
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/main.cpp b/main.cpp
index eb3eeb5..780c1aa 100644
--- a/main.cpp
+++ b/main.cpp
@@ -35,7 +35,7 @@
#include "sasl-handler.h"
#include "tls-handler.h"
-#include <KTelepathy/telepathy-handler-application.h>
+#include <KTp/telepathy-handler-application.h>
// FIXME: Move this to tp-qt4 itself
#include "types.h"
diff --git a/password-prompt.cpp b/password-prompt.cpp
index b2cb280..e238429 100644
--- a/password-prompt.cpp
+++ b/password-prompt.cpp
@@ -19,7 +19,7 @@
#include "password-prompt.h"
#include "ui_password-prompt.h"
-#include <KTelepathy/wallet-interface.h>
+#include <KTp/wallet-interface.h>
#include <KIcon>
#include <KDebug>
diff --git a/sasl-auth-op.cpp b/sasl-auth-op.cpp
index 50938de..b65baac 100644
--- a/sasl-auth-op.cpp
+++ b/sasl-auth-op.cpp
@@ -27,7 +27,7 @@
#include "password-prompt.h"
-#include <KTelepathy/wallet-interface.h>
+#include <KTp/wallet-interface.h>
SaslAuthOp::SaslAuthOp(const Tp::AccountPtr &account,
const Tp::ConnectionPtr &connection,
diff --git a/sasl-handler.cpp b/sasl-handler.cpp
index c57c0d5..ad34e37 100644
--- a/sasl-handler.cpp
+++ b/sasl-handler.cpp
@@ -22,7 +22,7 @@
#include "sasl-auth-op.h"
-#include <KTelepathy/telepathy-handler-application.h>
+#include <KTp/telepathy-handler-application.h>
#include <QDBusConnection>
diff --git a/tls-handler.cpp b/tls-handler.cpp
index d45bdb8..038d26d 100644
--- a/tls-handler.cpp
+++ b/tls-handler.cpp
@@ -21,7 +21,7 @@
#include "tls-cert-verifier-op.h"
-#include <KTelepathy/telepathy-handler-application.h>
+#include <KTp/telepathy-handler-application.h>
#include <QDBusConnection>
--
ktp-auth-handler packaging
More information about the pkg-kde-commits
mailing list