[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=49db6bf

The following commit has been merged in the master branch:
commit 49db6bf627cbf94290c95c8279874e4169a139ec
Merge: 18e4175a61b7867c141988e237c33507f6ae15a1 fc4fdf12afe990dd183e8010e9f1bb910ad5eaaf
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 22 14:55:31 2013 +0100

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

 kpeople/nepomuk-feeder/CMakeLists.txt              |   18 +-
 kpeople/nepomuk-feeder/abstract-storage.cpp        |    2 +-
 kpeople/nepomuk-feeder/abstract-storage.h          |  179 ++-
 kpeople/nepomuk-feeder/account.cpp                 |  143 ++-
 kpeople/nepomuk-feeder/account.h                   |   24 +-
 .../cmake/modules/FindTelepathyQt4.cmake           |   40 -
 kpeople/nepomuk-feeder/contact.cpp                 |   60 +-
 kpeople/nepomuk-feeder/contact.h                   |   14 +-
 kpeople/nepomuk-feeder/controller.cpp              |   43 +-
 kpeople/nepomuk-feeder/controller.h                |    8 +-
 kpeople/nepomuk-feeder/nepomuk-storage.cpp         | 1277 ++++++++++++++-----
 kpeople/nepomuk-feeder/nepomuk-storage.h           |  117 +-
 .../nepomuk-feeder/nepomuktelepathyservice.desktop |   19 +-
 kpeople/nepomuk-feeder/ontologies/CMakeLists.txt   |   50 -
 kpeople/nepomuk-feeder/service.cpp                 |   14 +-
 kpeople/nepomuk-feeder/service.h                   |    3 +
 kpeople/nepomuk-feeder/telepathy.trig              |   18 +-
 kpeople/nepomuk-feeder/test-backdoors.cpp          |    4 +-
 kpeople/nepomuk-feeder/test-backdoors.h            |    6 +-
 kpeople/nepomuk-feeder/tests/CMakeLists.txt        |   37 +-
 kpeople/nepomuk-feeder/tests/account-test.cpp      |  368 ++++--
 kpeople/nepomuk-feeder/tests/account-test.h        |   50 +-
 kpeople/nepomuk-feeder/tests/controller-test.cpp   |   49 +-
 kpeople/nepomuk-feeder/tests/controller-test.h     |   44 +-
 kpeople/nepomuk-feeder/tests/storage-test.cpp      | 1315 +++++++++++++++++++-
 kpeople/nepomuk-feeder/tests/storage-test.h        |   15 +
 kpeople/nepomuk-feeder/tests/tid-base-test.cpp     |    2 +-
 27 files changed, 3144 insertions(+), 775 deletions(-)

-- 
ktp-common-internals packaging