[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=e0dfb8a

The following commit has been merged in the master branch:
commit e0dfb8adfe432f9184e32c17267c30d15168d77f
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Nov 11 14:13:34 2014 +0100

    Make dependencies more explicit
---
 CMakeLists.txt | 11 ++++-------
 main.cpp       |  6 +++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5994416..abb08a7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ find_package(Qt5 5.3 CONFIG REQUIRED COMPONENTS DBus Gui Core Network) #Network
 find_package(ECM 0.0.11 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-find_package(KF5 5.0 REQUIRED COMPONENTS Wallet WidgetsAddons I18n KIO WebKit)
+find_package(KF5 5.0 REQUIRED COMPONENTS Wallet WidgetsAddons I18n KIO WebKit KDELibs4Support)
 
 cmake_policy(SET CMP0002 OLD)
 
@@ -39,10 +39,7 @@ include(ECMMarkNonGuiExecutable)
 include(CMakePackageConfigHelpers)
 include(FeatureSummary)
 
-include_directories (${TELEPATHY_QT5_INCLUDE_DIR}
-                     ${KTP_INCLUDE_DIR}
-                     ${QCA_INCLUDE_DIR}
-)
+include_directories ( ${QCA_INCLUDE_DIR} )
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
@@ -62,8 +59,7 @@ set(ktp_auth_handler_SRCS
 )
 
 set(ktp_auth_handler_LIBS
-    ${TELEPATHY_QT5_LIBRARIES}
-    ${KTP_LIBRARIES}
+    KTp::CommonInternals
     ${Qca_LIBRARY}
     KF5::WidgetsAddons
     KF5::Wallet
@@ -71,6 +67,7 @@ set(ktp_auth_handler_LIBS
     KF5::KIOCore
     KF5::KIOWidgets
     KF5::WebKit
+    KF5::KDELibs4Support
     Qt5::Core
     Qt5::DBus
     Qt5::Network
diff --git a/main.cpp b/main.cpp
index 19f4b07..75a3c7e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <KAboutData>
+#include <k4aboutdata.h>
 #include <KCmdLineArgs>
 #include <KApplication>
 #include <QDebug>
@@ -44,7 +44,7 @@
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("ktp-auth-handler", 0,
+    K4AboutData aboutData("ktp-auth-handler", 0,
                          ki18n("Telepathy Authentication Handler"),
                          KTP_AUTH_HANDLER_VERSION);
     aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Developer"), "kde at davidedmundson.co.uk");
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
     aboutData.setProgramIconName(QLatin1String("telepathy-kde"));
 
     KCmdLineArgs::init(argc, argv, &aboutData);
-    KTp::TelepathyHandlerApplication app;
+    KTp::TelepathyHandlerApplication app(argc, argv);
 
     // FIXME: Move this to tp-qt4 itself
     registerTypes();

-- 
ktp-auth-handler packaging