[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:13:44 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=d622f89
The following commit has been merged in the master branch:
commit d622f890dbaee58d7d09c0c2baaf5a217d295eba
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date: Thu Dec 22 19:10:08 2011 +0100
Rename kded module according to the new policy
Reviewed-by: Dario Freddi
REVIEW: 103503
CCMAIL: kde-i18n-doc at kde.org
---
CMakeLists.txt | 22 +++++++++++-----------
Messages.sh | 2 +-
autoaway.cpp | 2 +-
config/CMakeLists.txt | 16 ++++++++--------
....desktop => kcm_ktp_integration_module.desktop} | 2 +-
contact-request-handler.cpp | 2 +-
error-handler.cpp | 2 +-
....desktop => kded_ktp_integration_module.desktop | 4 ++--
telepathy-kded-module-plugin.cpp | 2 +-
telepathy-module.cpp | 4 ++--
telepathy-module.h | 2 +-
telepathy-mpris.cpp | 2 +-
12 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25c569d..3b97bca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +1,14 @@
-project(telepathy-kded-module)
+project(ktp-kded-integration-module)
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)
find_package (KDE4 REQUIRED)
find_package (TelepathyQt4 0.8.9 REQUIRED)
-find_package (KTelepathy REQUIRED)
+find_package (KTp REQUIRED)
# set some default settings
include (KDE4Defaults)
@@ -25,10 +25,10 @@ include_directories (${KDE4_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTELEPATHY_INCLUDE_DIR}
+ ${KTP_INCLUDE_DIR}
)
-set (telepathy_module_SRCS
+set (kded_ktp_integration_module_SRCS
contact-request-handler.cpp
telepathy-kded-module-plugin.cpp
telepathy-module.cpp
@@ -37,24 +37,24 @@ set (telepathy_module_SRCS
error-handler.cpp
)
-kde4_add_plugin (kded_telepathy_module
- ${telepathy_module_SRCS}
+kde4_add_plugin (kded_ktp_integration_module
+ ${kded_ktp_integration_module_SRCS}
)
-target_link_libraries (kded_telepathy_module
+target_link_libraries (kded_ktp_integration_module
${KDE4_KDECORE_LIBS}
${TELEPATHY_QT4_LIBRARIES}
- ${KTELEPATHY_LIBRARIES}
+ ${KTP_LIBRARIES}
${KDE4_KDEUI_LIBS}
kidletime
)
-install (TARGETS kded_telepathy_module
+install (TARGETS kded_ktp_integration_module
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-install (FILES telepathy_kded_module.desktop
+install (FILES kded_ktp_integration_module.desktop
DESTINATION ${SERVICES_INSTALL_DIR}/kded
)
diff --git a/Messages.sh b/Messages.sh
index fec435c..b986187 100644
--- a/Messages.sh
+++ b/Messages.sh
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/telepathy-kded-module.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/kded_ktp_integration_module.pot
rm -f rc.cpp
diff --git a/autoaway.cpp b/autoaway.cpp
index 3826f4b..c4d282d 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -27,7 +27,7 @@
#include <KConfig>
#include <KConfigGroup>
-#include <KTelepathy/global-presence.h>
+#include <KTp/global-presence.h>
AutoAway::AutoAway(KTp::GlobalPresence* globalPresence, QObject* parent)
: TelepathyKDEDModulePlugin(globalPresence, parent),
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 6505631..bd0b3f8 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,27 +1,27 @@
-set(telepathy_kded_module_config_SRCS
+set(kcm_ktp_integration_module_SRCS
column-resizer.cpp
telepathy-kded-config.cpp
)
-set(telepathy_kded_module_config_UI
+set(kcm_ktp_integration_module_UI
telepathy-kded-config.ui
)
-kde4_add_ui_files(telepathy_kded_module_config_SRCS ${telepathy_kded_module_config_UI})
+kde4_add_ui_files(kcm_ktp_integration_module_SRCS ${kcm_ktp_integration_module_UI})
-kde4_add_plugin(kcm_telepathy_kded_module_config
- ${telepathy_kded_module_config_SRCS})
+kde4_add_plugin(kcm_ktp_integration_module
+ ${kcm_ktp_integration_module_SRCS})
-target_link_libraries(kcm_telepathy_kded_module_config ${KDE4_KDECORE_LIBS}
+target_link_libraries(kcm_ktp_integration_module ${KDE4_KDECORE_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KCMUTILS_LIBS}
${KDE4_KIO_LIBS}
)
-install(TARGETS kcm_telepathy_kded_module_config
+install(TARGETS kcm_ktp_integration_module
DESTINATION ${PLUGIN_INSTALL_DIR})
-install (FILES kcm_telepathy_kded_module_config.desktop
+install (FILES kcm_ktp_integration_module.desktop
DESTINATION ${SERVICES_INSTALL_DIR}
)
diff --git a/config/kcm_telepathy_kded_module_config.desktop b/config/kcm_ktp_integration_module.desktop
similarity index 96%
copy from config/kcm_telepathy_kded_module_config.desktop
copy to config/kcm_ktp_integration_module.desktop
index 82cd8be..5263cb2 100644
--- a/config/kcm_telepathy_kded_module_config.desktop
+++ b/config/kcm_ktp_integration_module.desktop
@@ -6,7 +6,7 @@ Type=Service
X-KDE-ServiceTypes=KCModule
X-DBUS-StartupType=
X-KDE-HasReadOnlyMode=false
-X-KDE-Library=kcm_telepathy_kded_module_config
+X-KDE-Library=kcm_ktp_integration_module
X-KDE-ParentApp=kcontrol
X-KDE-SubstituteUID=false
X-KDE-RootOnly=false
diff --git a/contact-request-handler.cpp b/contact-request-handler.cpp
index 91b743f..13c9924 100644
--- a/contact-request-handler.cpp
+++ b/contact-request-handler.cpp
@@ -26,7 +26,7 @@
#include <TelepathyQt/PendingComposite>
#include <TelepathyQt/Account>
-#include <KTelepathy/error-dictionary.h>
+#include <KTp/error-dictionary.h>
#include <QtCore/QFutureWatcher>
diff --git a/error-handler.cpp b/error-handler.cpp
index fbecd19..9b54b91 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -23,7 +23,7 @@
#include <KNotification>
#include <KAboutData>
-#include <KTelepathy/error-dictionary.h>
+#include <KTp/error-dictionary.h>
ErrorHandler::ErrorHandler(const Tp::AccountManagerPtr& am, QObject* parent)
: QObject(parent)
diff --git a/telepathy_kded_module.desktop b/kded_ktp_integration_module.desktop
similarity index 95%
copy from telepathy_kded_module.desktop
copy to kded_ktp_integration_module.desktop
index 8300738..670a15d 100644
--- a/telepathy_kded_module.desktop
+++ b/kded_ktp_integration_module.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Type=Service
X-KDE-ServiceTypes=KDEDModule
-X-KDE-Library=telepathy_module
-X-KDE-DBus-ModuleName=telepathy_kded_module
+X-KDE-Library=ktp_integration_module
+X-KDE-DBus-ModuleName=ktp_integration_module
X-KDE-Kded-autoload=true
X-KDE-Kded-phase=2
X-KDE-Kded-load-on-demand=false
diff --git a/telepathy-kded-module-plugin.cpp b/telepathy-kded-module-plugin.cpp
index 4f2f99c..418e96a 100644
--- a/telepathy-kded-module-plugin.cpp
+++ b/telepathy-kded-module-plugin.cpp
@@ -20,7 +20,7 @@
#include "telepathy-kded-module-plugin.h"
-#include <KTelepathy/global-presence.h>
+#include <KTp/global-presence.h>
TelepathyKDEDModulePlugin::TelepathyKDEDModulePlugin(KTp::GlobalPresence* globalPresence, QObject* parent)
: QObject(parent),
diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index 54e1d77..955ceec 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -27,7 +27,7 @@
#include <TelepathyQt/PendingReady>
#include <TelepathyQt/Debug>
-#include <KTelepathy/global-presence.h>
+#include <KTp/global-presence.h>
#include "telepathy-mpris.h"
#include "autoaway.h"
@@ -38,7 +38,7 @@
#include "contact-request-handler.h"
K_PLUGIN_FACTORY(TelepathyModuleFactory, registerPlugin<TelepathyModule>(); )
-K_EXPORT_PLUGIN(TelepathyModuleFactory("telepathy_module", "telepathy-kded-module"))
+K_EXPORT_PLUGIN(TelepathyModuleFactory("ktp_integration_module", "kded_ktp_integration_module"))
TelepathyModule::TelepathyModule(QObject* parent, const QList<QVariant>& args)
: KDEDModule(parent)
diff --git a/telepathy-module.h b/telepathy-module.h
index b0a9f3b..05d8c38 100644
--- a/telepathy-module.h
+++ b/telepathy-module.h
@@ -24,7 +24,7 @@
#include <KDEDModule>
#include <TelepathyQt/AccountManager>
-#include <KTelepathy/presence.h>
+#include <KTp/presence.h>
class ContactRequestHandler;
namespace Tp {
diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index 93fe531..8dae701 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -30,7 +30,7 @@
#include <TelepathyQt/AccountSet>
-#include <KTelepathy/global-presence.h>
+#include <KTp/global-presence.h>
TelepathyMPRIS::TelepathyMPRIS(KTp::GlobalPresence* globalPresence, QObject* parent)
: TelepathyKDEDModulePlugin(globalPresence, parent),
--
ktp-kded-integration-module packaging
More information about the pkg-kde-commits
mailing list