[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=18e4175

The following commit has been merged in the master branch:
commit 18e4175a61b7867c141988e237c33507f6ae15a1
Merge: 404dae57b5c198a017da866de60c0023f6839f12 c87db85a3acfb295247da29df38f6ebd6393a20c
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 22 14:51:26 2013 +0100

    Merge remote-tracking branch 'kpeople/patch1' into nepomuk-feeder

 kpeople/nepomuk-feeder/CMakeLists.txt              | 116 ++++
 .../nepomuk-feeder/abstract-storage.cpp            |  23 +-
 .../nepomuk-feeder/abstract-storage.h              |  52 +-
 kpeople/nepomuk-feeder/account.cpp                 | 235 ++++++++
 kpeople/nepomuk-feeder/account.h                   |  95 ++++
 .../cmake/modules/FindKTelepathyTestLib.cmake      |   8 +
 .../cmake/modules/FindTelepathyQt4.cmake           |  40 ++
 kpeople/nepomuk-feeder/contact.cpp                 | 146 +++++
 kpeople/nepomuk-feeder/contact.h                   |  74 +++
 kpeople/nepomuk-feeder/controller.cpp              | 163 ++++++
 kpeople/nepomuk-feeder/controller.h                |  67 +++
 kpeople/nepomuk-feeder/nepomuk-storage.cpp         | 615 +++++++++++++++++++++
 kpeople/nepomuk-feeder/nepomuk-storage.h           | 117 ++++
 .../nepomuk-feeder/nepomuktelepathyservice.desktop |  29 +
 kpeople/nepomuk-feeder/ontologies/CMakeLists.txt   |  50 ++
 kpeople/nepomuk-feeder/service.cpp                 |  59 ++
 .../nepomuk-feeder/service.h                       |  26 +-
 kpeople/nepomuk-feeder/telepathy.ontology.in       |   7 +
 kpeople/nepomuk-feeder/telepathy.trig              |  44 ++
 .../nepomuk-feeder/test-backdoors.cpp              |  42 +-
 .../nepomuk-feeder/test-backdoors.h                |  36 +-
 kpeople/nepomuk-feeder/tests/CMakeLists.txt        |  39 ++
 kpeople/nepomuk-feeder/tests/account-test.cpp      | 191 +++++++
 .../nepomuk-feeder/tests/account-test.h            |  49 +-
 kpeople/nepomuk-feeder/tests/contact-test.cpp      | 448 +++++++++++++++
 .../nepomuk-feeder/tests/contact-test.h            |  54 +-
 kpeople/nepomuk-feeder/tests/controller-test.cpp   | 233 ++++++++
 kpeople/nepomuk-feeder/tests/controller-test.h     | 111 ++++
 kpeople/nepomuk-feeder/tests/storage-test.cpp      | 202 +++++++
 .../nepomuk-feeder/tests/storage-test.h            |  35 +-
 kpeople/nepomuk-feeder/tests/tid-base-test.cpp     | 171 ++++++
 kpeople/nepomuk-feeder/tests/tid-base-test.h       |  58 ++
 32 files changed, 3469 insertions(+), 166 deletions(-)

-- 
ktp-common-internals packaging