[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=3d17727

The following commit has been merged in the master branch:
commit 3d17727efd36e515961d9e64242a4b046fe71316
Merge: 2e597b938fc23daaef8975bdfbd8ca04b9a2ec63 a063a667971cc4f8b0c0a3d6f17f55925366c7ee
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Nov 13 13:36:32 2014 +0100

    Merge branch 'frameworks'
    
    Conflicts:
    	x-telepathy-password-prompt.ui

 CMakeLists.txt                                     | 115 +++++++--------
 cmake/modules/FindKAccounts.cmake                  |  30 ++++
 cmake/modules/FindKTp.cmake                        |  38 -----
 cmake/modules/FindQJSON.cmake                      |  48 -------
 conference-auth-observer.cpp                       |   6 +-
 conference-auth-op.cpp                             |   9 +-
 getcredentialsjob.cpp                              | 106 --------------
 getcredentialsjob.h                                |  61 --------
 kssl/ksslinfodialog.h                              |   2 +-
 main.cpp                                           |  41 ++++--
 ...elepathy.Client.KTp.ConfAuthObserver.service.in |   2 +-
 ...top.Telepathy.Client.KTp.SASLHandler.service.in |   2 +-
 ...ktop.Telepathy.Client.KTp.TLSHandler.service.in |   2 +-
 sasl-auth-op.cpp                                   |  93 +++---------
 sasl-auth-op.h                                     |  13 +-
 sasl-handler.cpp                                   |   4 +-
 tls-cert-verifier-op.cpp                           |  16 +--
 tls-handler.cpp                                    |   4 +-
 x-messenger-oauth2-auth-operation.cpp              |  20 +--
 x-messenger-oauth2-auth-operation.h                |   2 +-
 x-messenger-oauth2-prompt.cpp                      |  76 +++++-----
 x-messenger-oauth2-prompt.h                        |   6 +-
 x-telepathy-password-auth-operation.cpp            | 157 +++++++++++++++++----
 x-telepathy-password-auth-operation.h              |  12 +-
 x-telepathy-password-prompt.cpp                    |  32 ++---
 x-telepathy-password-prompt.h                      |   6 +-
 x-telepathy-password-prompt.ui                     | 134 +++++++++---------
 x-telepathy-sso-facebook-operation.cpp             |  69 ++++-----
 x-telepathy-sso-facebook-operation.h               |   4 +-
 x-telepathy-sso-google-operation.cpp               |  31 ++--
 x-telepathy-sso-google-operation.h                 |   4 +-
 31 files changed, 491 insertions(+), 654 deletions(-)

diff --cc CMakeLists.txt
index 66c989a,30ae8d4..356ae54
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,11 -1,16 +1,16 @@@
  project(ktp-auth-handler)
  
 -set(KTP_AUTH_HANDLER_VERSION "0.8.1")
 +set(KTP_AUTH_HANDLER_VERSION "0.8.80")
  
- set (CMAKE_MODULE_PATH
-      "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-      ${CMAKE_MODULE_PATH}
- )
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ 
+ find_package(Qt5 5.3 CONFIG REQUIRED COMPONENTS DBus Gui Core Network) #Network for QSsl
+ 
+ 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)
+ 
  cmake_policy(SET CMP0002 OLD)
  
  set(IS_KTP_INTERNAL_MODULE TRUE)
diff --cc x-telepathy-password-prompt.ui
index d8017b8,08b568d..2f08dfa
--- a/x-telepathy-password-prompt.ui
+++ b/x-telepathy-password-prompt.ui
@@@ -94,15 -98,10 +98,15 @@@
   </widget>
   <customwidgets>
    <customwidget>
-    <class>KLineEdit</class>
-    <extends>QLineEdit</extends>
-    <header>klineedit.h</header>
+    <class>KTitleWidget</class>
+    <extends>QWidget</extends>
+    <header>ktitlewidget.h</header>
    </customwidget>
 +  <customwidget>
 +   <class>KTitleWidget</class>
 +   <extends>QWidget</extends>
 +   <header>ktitlewidget.h</header>
 +  </customwidget>
   </customwidgets>
   <resources/>
   <connections/>

-- 
ktp-auth-handler packaging