[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=bf41dc8

The following commit has been merged in the master branch:
commit bf41dc8c090f90f0261d417fb22f455ed829ee6e
Author: Aleix Pol <aleixpol at kde.org>
Date:   Fri Oct 24 19:15:42 2014 +0200

    Port OTR proxy
    
    Makes the TelepathyQtService dependency explicit
    
    Reviewed by David Edmundson
---
 CMakeLists.txt                    |  1 +
 otr-proxy/KTpProxy/CMakeLists.txt | 17 +++++++----------
 otr-proxy/KTpProxy/main.cpp       |  2 +-
 otr-proxy/test/CMakeLists.txt     | 11 ++++-------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8644b5b..e94413e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@ find_package (KF5 REQUIRED COMPONENTS
 set(REQUIRED_TPQT_VERSION 0.9.2.1)
 
 find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} REQUIRED)
+find_package (TelepathyQt5Service ${REQUIRED_TPQT_VERSION} REQUIRED) #used for the otr-proxy
 find_package (TelepathyLoggerQt5 QUIET)
 find_package (KF5People 0.5)
 
diff --git a/otr-proxy/KTpProxy/CMakeLists.txt b/otr-proxy/KTpProxy/CMakeLists.txt
index f295b2e..213d41e 100644
--- a/otr-proxy/KTpProxy/CMakeLists.txt
+++ b/otr-proxy/KTpProxy/CMakeLists.txt
@@ -14,25 +14,22 @@ set(ktp-proxy_SRCS
         otr-utils.cpp
 )
 
-kde4_add_kcfg_files(ktp-proxy_SRCS ktp-proxy-config.kcfgc)
+kconfig_add_kcfg_files(ktp-proxy_SRCS ktp-proxy-config.kcfgc)
 
-kde4_add_library(ktp-proxy-lib STATIC ${ktp-proxy_SRCS})
+add_library(ktp-proxy-lib STATIC ${ktp-proxy_SRCS})
 
 set(ktp-proxy_LIBS
-        ${KDE4_KDECORE_LIBS}
-        ${KDE4_KDEUI_LIBS}
-        ${KDE4_KIO_LIBS}
-        ${TELEPATHY_QT4_LIBRARIES}
-        ${TELEPATHY_QT4_SERVICE_LIBRARIES}
         ${LIBOTR_LIBRARY}
         ${LIBGCRYPT_LIBRARIES}
-        ktpcommoninternalsprivate
-        ktpotrprivate
+        ${TELEPATHY_QT5_SERVICE_LIBRARIES}
+        KTp::CommonInternals
+        KTp::OTR
+        KF5::KDELibs4Support
 )
 
 target_link_libraries(ktp-proxy-lib ${ktp-proxy_LIBS})
 
-kde4_add_executable(ktp-proxy main.cpp)
+add_executable(ktp-proxy main.cpp)
 target_link_libraries(ktp-proxy ktp-proxy-lib)
 
 install(TARGETS ktp-proxy DESTINATION ${LIBEXEC_INSTALL_DIR})
diff --git a/otr-proxy/KTpProxy/main.cpp b/otr-proxy/KTpProxy/main.cpp
index 5690863..bd0fb00 100644
--- a/otr-proxy/KTpProxy/main.cpp
+++ b/otr-proxy/KTpProxy/main.cpp
@@ -19,7 +19,7 @@
 
 #include "proxy-service.h"
 #include "otr-config.h"
-#include "../ktptextui_version.h"
+#include "ktp_version.h"
 
 #include <KTp/OTR/types.h>
 
diff --git a/otr-proxy/test/CMakeLists.txt b/otr-proxy/test/CMakeLists.txt
index d42c171..853a60e 100644
--- a/otr-proxy/test/CMakeLists.txt
+++ b/otr-proxy/test/CMakeLists.txt
@@ -1,14 +1,11 @@
 add_subdirectory(lib)
 
 set(ktp-proxy-test_LIBS
-        ${KDE4_KDECORE_LIBS}
-        ${KDE4_KDEUI_LIBS}
-        ${KDE4_KIO_LIBS}
-        ${QT_QTTEST_LIBRARY}
-        ${TELEPATHY_QT4_LIBRARIES}
-        ${TELEPATHY_QT4_SERVICE_LIBRARIES}
+        Qt5::Test
+        ${TELEPATHY_QT5_LIBRARIES}
+        ${TELEPATHY_QT5_SERVICE_LIBRARIES}
         ktp-proxy-test-lib
-        ktpotrprivate
+        KTp::OTR
 )
 
 message("-- Adding test files:")

-- 
ktp-common-internals packaging