[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=2358200

The following commit has been merged in the master branch:
commit 235820083d7a3289543577c63ecdb71e11a73e15
Merge: 404dae57b5c198a017da866de60c0023f6839f12 d2b46c09d167e4caa654f8bd0bf18ff95101196d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 22 15:03:18 2013 +0100

    Merge branch 'nepomuk-feeder'

 kpeople/nepomuk-feeder/CMakeLists.txt              |  121 ++
 .../nepomuk-feeder/abstract-storage.cpp            |   23 +-
 kpeople/nepomuk-feeder/abstract-storage.h          |  150 ++
 kpeople/nepomuk-feeder/account.cpp                 |  223 +++
 kpeople/nepomuk-feeder/account.h                   |   87 ++
 .../nepomuk-feeder}/capabilities-hack-private.cpp  |    0
 .../nepomuk-feeder}/capabilities-hack-private.h    |    5 +-
 .../cmake/modules/FindKTelepathyTestLib.cmake      |    8 +
 kpeople/nepomuk-feeder/controller.cpp              |  172 +++
 kpeople/nepomuk-feeder/controller.h                |   71 +
 kpeople/nepomuk-feeder/nepomuk-storage.cpp         |  799 +++++++++++
 kpeople/nepomuk-feeder/nepomuk-storage.h           |  173 +++
 .../nepomuk-feeder/nepomuktelepathyservice.desktop |   61 +
 kpeople/nepomuk-feeder/service.cpp                 |   71 +
 .../nepomuk-feeder/service.h                       |   38 +-
 kpeople/nepomuk-feeder/telepathy.ontology.in       |    7 +
 kpeople/nepomuk-feeder/telepathy.trig              |   52 +
 .../nepomuk-feeder/test-backdoors.cpp              |   42 +-
 .../nepomuk-feeder/test-backdoors.h                |   28 +-
 kpeople/nepomuk-feeder/tests/CMakeLists.txt        |   63 +
 kpeople/nepomuk-feeder/tests/account-test.cpp      |  303 ++++
 kpeople/nepomuk-feeder/tests/account-test.h        |   67 +
 kpeople/nepomuk-feeder/tests/controller-test.cpp   |  258 ++++
 kpeople/nepomuk-feeder/tests/controller-test.h     |  149 ++
 kpeople/nepomuk-feeder/tests/storage-test.cpp      | 1501 ++++++++++++++++++++
 kpeople/nepomuk-feeder/tests/storage-test.h        |   68 +
 kpeople/nepomuk-feeder/tests/tid-base-test.cpp     |  171 +++
 kpeople/nepomuk-feeder/tests/tid-base-test.h       |   58 +
 28 files changed, 4702 insertions(+), 67 deletions(-)

-- 
ktp-common-internals packaging