[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=60878ce

The following commit has been merged in the master branch:
commit 60878cea1660d7f7a9f0d1cc4af29d596d9f732e
Merge: 639d15b4875fb12bf3d11b160e71c2965c807cef 2d24de1084a27284421c377330d7b5e21d67705a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Jul 1 16:22:17 2013 +0100

    Merge branch 'kpeople'
    
    This branch adds in _optional_ support for libkpeople
    the nepomuk contact aggregation library. This brings:
     - metacontacts
     - contacts when you are offline
     - avatars + actions from other sources
    
    DIGEST: Metacontacts in KTp!

 CMakeLists.txt                                     |  15 +-
 KTp/CMakeLists.txt                                 |  30 ++-
 KTp/Models/CMakeLists.txt                          |  29 ++-
 KTp/Models/contacts-list-model.cpp                 |  24 --
 KTp/Models/contacts-model.cpp                      |  58 ++++-
 KTp/Models/kpeopletranslationproxy.cpp             | 229 +++++++++++++++++++
 .../kpeopletranslationproxy.h}                     |  32 +--
 KTp/im-persons-data-source.cpp                     | 253 +++++++++++++++++++++
 KTp/im-persons-data-source.h                       |  59 +++++
 KTp/types.h                                        |   1 +
 kpeople/CMakeLists.txt                             |   2 +
 kpeople/actionsplugin/CMakeLists.txt               |  24 ++
 kpeople/actionsplugin/kpeople-actions-plugin.cpp   | 200 ++++++++++++++++
 kpeople/actionsplugin/kpeople-actions-plugin.h     |  35 +++
 kpeople/actionsplugin/ktp_kpeople_plugin.desktop   |  21 ++
 kpeople/datasourceplugin/CMakeLists.txt            |  26 +++
 .../im-persons-data-source-plugin.cpp              |   9 +
 .../im_persons_data_source_plugin.desktop          |  20 ++
 18 files changed, 1017 insertions(+), 50 deletions(-)

-- 
ktp-common-internals packaging