[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=9e17c77

The following commit has been merged in the master branch:
commit 9e17c771368832f4f29fdf7faf8431d03c717ce6
Merge: d0a959aac7357f7344898fe42903f36601a3ff7c 0c1fcd3251286b788b23e363377648cd0cfeed1a
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Jun 10 17:44:25 2013 +0200

    Merge branch 'sso-google'
    
    REVIEW: 110935

 CMakeLists.txt                                     |  1 +
 getcredentialsjob.cpp                              |  1 +
 sasl-auth-op.cpp                                   | 32 ++++++-----
 x-telepathy-sso-google-operation.cpp               | 64 ++++++++++++++++++++++
 ...ialsjob.h => x-telepathy-sso-google-operation.h | 52 ++++++++----------
 5 files changed, 106 insertions(+), 44 deletions(-)

diff --cc CMakeLists.txt
index b669b52,d6c9883..9997587
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -72,9 -67,9 +72,10 @@@ if(ACCOUNTSQT_FOUND AND SIGNONQT_FOUND
      set(ktp_auth_handler_SRCS
          ${ktp_auth_handler_SRCS}
          x-telepathy-sso-operation.cpp
+         x-telepathy-sso-google-operation.cpp
          getcredentialsjob.cpp
      )
 +
      set(ktp_auth_handler_LIBS
          ${ktp_auth_handler_LIBS}
          ${ACCOUNTSQT_LIBRARIES}

-- 
ktp-auth-handler packaging