[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:12:10 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=375f860
The following commit has been merged in the master branch:
commit 375f86057c807647eebc2dc30ebfb0f6a892ab40
Author: Alin M Elena <alinm.elena at gmail.com>
Date: Fri Dec 23 05:47:37 2011 +0000
changed names according to the new scheme
---
CMakeLists.txt | 6 ++--
cmake/modules/FindKTp.cmake | 42 +++++++++++-----------
src/CMakeLists.txt | 10 +++---
src/filetransfer-handler.cpp | 2 +-
src/handle-incoming-file-transfer-channel-job.cpp | 2 +-
src/main.cpp | 2 +-
...pathy.Client.KDE.FileTransferHandler.service.in | 2 +-
src/telepathy-base-job.h | 10 +++---
src/telepathy-base-job_p.h | 6 ++--
9 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 710b4ae..e4ae30f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,12 +2,12 @@ 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(IS_KTP_INTERNAL_MODULE TRUE)
set(KDE_MIN_VERSION "4.6.0")
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 @@ add_definitions (${KDE4_DEFINITIONS}
include_directories (${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTELEPATHY_INCLUDE_DIR}
+ ${KTP_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
)
diff --git a/cmake/modules/FindKTp.cmake b/cmake/modules/FindKTp.cmake
index c9aa9dc..899a120 100644
--- a/cmake/modules/FindKTp.cmake
+++ b/cmake/modules/FindKTp.cmake
@@ -1,36 +1,36 @@
-# Try to find the KTelepathy library
-# KTELEPATHY_FOUND
-# KTELEPATHY_INCLUDE_DIR
-# KTELEPATHY_LIBRARIES
-# KTELEPATHY_MODELS_LIBRARIES
+# 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_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)
+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 (KTELEPATHY_FIND_REQUIRED ${KTelepathy_FIND_REQUIRED})
-if (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
+SET (KTP_FIND_REQUIRED ${KTp_FIND_REQUIRED})
+if (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
# Already in cache, be silent
- set(KTELEPATHY_FIND_QUIETLY TRUE)
-endif (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
+ set(KTP_FIND_QUIETLY TRUE)
+endif (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
-find_path(KTELEPATHY_INCLUDE_DIR
- NAMES KTelepathy/presence.h
+find_path(KTP_INCLUDE_DIR
+ NAMES KTp/presence.h
PATHS ${KDE4_INCLUDE_DIR}
)
-find_library(KTELEPATHY_LIBRARIES NAMES telepathykdecommoninternalsprivate )
-find_library(KTELEPATHY_MODELS_LIBRARIES NAMES telepathykdemodelsprivate )
+find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
+find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTelepathy DEFAULT_MSG
- KTELEPATHY_LIBRARIES
- KTELEPATHY_MODELS_LIBRARIES
- KTELEPATHY_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG
+ KTP_LIBRARIES
+ KTP_MODELS_LIBRARIES
+ KTP_INCLUDE_DIR)
-mark_as_advanced(KTELEPATHY_INCLUDE_DIRS KTELEPATHY_LIBRARIES)
+mark_as_advanced(KTP_INCLUDE_DIRS KTP_LIBRARIES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c554ab8..bfc82ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-set (telepathy_kde_filetransfer_handler_SRCS
+set (ktp_filetransfer_handler_SRCS
main.cpp
filetransfer-handler.cpp
telepathy-base-job.cpp
@@ -6,20 +6,20 @@ set (telepathy_kde_filetransfer_handler_SRCS
handle-outgoing-file-transfer-channel-job.cpp
)
-kde4_add_executable(telepathy-kde-filetransfer-handler ${telepathy_kde_filetransfer_handler_SRCS})
+kde4_add_executable(ktp-filetransfer-handler ${ktp_filetransfer_handler_SRCS})
-target_link_libraries(telepathy-kde-filetransfer-handler
+target_link_libraries(ktp-filetransfer-handler
${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KIO_LIBS}
${TELEPATHY_QT4_LIBRARIES}
- ${KTELEPATHY_LIBRARIES}
+ ${KTP_LIBRARIES}
)
configure_file(org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service)
-install(TARGETS telepathy-kde-filetransfer-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(TARGETS ktp-filetransfer-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service
DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
install(FILES KDE.FileTransferHandler.client DESTINATION ${SHARE_INSTALL_PREFIX}/telepathy/clients/)
diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index 45606b5..ed0f00b 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -20,7 +20,7 @@
#include "handle-incoming-file-transfer-channel-job.h"
#include "handle-outgoing-file-transfer-channel-job.h"
-#include <KTelepathy/telepathy-handler-application.h>
+#include <KTp/telepathy-handler-application.h>
#include <TelepathyQt/ChannelClassSpecList>
#include <TelepathyQt/IncomingFileTransferChannel>
diff --git a/src/handle-incoming-file-transfer-channel-job.cpp b/src/handle-incoming-file-transfer-channel-job.cpp
index 8b6a3f3..7bb5afb 100644
--- a/src/handle-incoming-file-transfer-channel-job.cpp
+++ b/src/handle-incoming-file-transfer-channel-job.cpp
@@ -230,7 +230,7 @@ void HandleIncomingFileTransferChannelJobPrivate::__k__onRenameDialogFinished(in
break;
default:
kWarning() << "Unknown Error";
- q->setError(KTp::KTelepathyError);
+ q->setError(KTp::KTpError);
q->setErrorText(i18n("Unknown Error"));
renameDialog.data()->deleteLater();
QTimer::singleShot(0, q, SLOT(__k__doEmitResult()));
diff --git a/src/main.cpp b/src/main.cpp
index b65037b..9996dfe 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,7 +17,7 @@
#include "filetransfer-handler.h"
-#include <KTelepathy/telepathy-handler-application.h>
+#include <KTp/telepathy-handler-application.h>
#include <KAboutData>
#include <KCmdLineArgs>
diff --git a/src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in b/src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
index cb69684..4105138 100644
--- a/src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
+++ b/src/org.freedesktop.Telepathy.Client.KDE.FileTransferHandler.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Telepathy.Client.KDE.FileTransferHandler
-Exec=@LIBEXEC_INSTALL_DIR@/telepathy-kde-filetransfer-handler
+Exec=@LIBEXEC_INSTALL_DIR@/ktp-filetransfer-handler
diff --git a/src/telepathy-base-job.h b/src/telepathy-base-job.h
index 30e6544..73e7df8 100644
--- a/src/telepathy-base-job.h
+++ b/src/telepathy-base-job.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LIBKTELEPATHY_TELEPATHY_BASE_JOB_H
-#define LIBKTELEPATHY_TELEPATHY_BASE_JOB_H
+#ifndef LIBKTP_TELEPATHY_BASE_JOB_H
+#define LIBKTP_TELEPATHY_BASE_JOB_H
#include <kdemacros.h>
#include <KJob>
@@ -77,8 +77,8 @@ namespace KTp {
CancelFileTransferError = 116,
/** Telepathy triggered an error */
TelepathyErrorError = 200,
- /** KTelepathy Error */
- KTelepathyError = 300
+ /** KTp Error */
+ KTpError = 300
};
class TelepathyBaseJobPrivate;
@@ -100,4 +100,4 @@ protected:
} // namespace KTp
-#endif // LIBKTELEPATHY_TELEPATHY_BASE_JOB_H
+#endif // LIBKTP_TELEPATHY_BASE_JOB_H
diff --git a/src/telepathy-base-job_p.h b/src/telepathy-base-job_p.h
index c077b9f..522c6b6 100644
--- a/src/telepathy-base-job_p.h
+++ b/src/telepathy-base-job_p.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef LIBKTELEPATHY_TELEPATHY_BASE_JOB_P_H
-#define LIBKTELEPATHY_TELEPATHY_BASE_JOB_P_H
+#ifndef LIBKTP_TELEPATHY_BASE_JOB_P_H
+#define LIBKTP_TELEPATHY_BASE_JOB_P_H
#include "telepathy-base-job.h"
@@ -52,4 +52,4 @@ public:
} // namespace KTp
-#endif // LIBKTELEPATHY_TELEPATHY_BASE_JOB_P_H
+#endif // LIBKTP_TELEPATHY_BASE_JOB_P_H
--
ktp-filetransfer-handler packaging
More information about the pkg-kde-commits
mailing list