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

The following commit has been merged in the master branch:
commit d2b46c09d167e4caa654f8bd0bf18ff95101196d
Merge: 49db6bf627cbf94290c95c8279874e4169a139ec 35d9678df1193e758b0f5744ee4232ffd77ad99e
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 22 14:56:47 2013 +0100

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

 kpeople/nepomuk-feeder/CMakeLists.txt              |   19 +-
 kpeople/nepomuk-feeder/abstract-storage.h          |   81 +-
 kpeople/nepomuk-feeder/account.cpp                 |  153 +--
 kpeople/nepomuk-feeder/account.h                   |   36 +-
 .../nepomuk-feeder}/capabilities-hack-private.cpp  |    0
 .../nepomuk-feeder}/capabilities-hack-private.h    |    5 +-
 kpeople/nepomuk-feeder/contact.cpp                 |  164 ---
 kpeople/nepomuk-feeder/contact.h                   |   76 --
 kpeople/nepomuk-feeder/controller.cpp              |   46 +-
 kpeople/nepomuk-feeder/nepomuk-storage.cpp         | 1049 ++++++--------------
 kpeople/nepomuk-feeder/nepomuk-storage.h           |   55 +-
 .../nepomuk-feeder/nepomuktelepathyservice.desktop |   19 +-
 kpeople/nepomuk-feeder/service.cpp                 |    4 +-
 kpeople/nepomuk-feeder/service.h                   |    4 +-
 kpeople/nepomuk-feeder/tests/CMakeLists.txt        |    3 +-
 kpeople/nepomuk-feeder/tests/contact-test.cpp      |  448 ---------
 kpeople/nepomuk-feeder/tests/contact-test.h        |   54 -
 kpeople/nepomuk-feeder/tests/storage-test.cpp      |  234 +++--
 kpeople/nepomuk-feeder/tests/tid-base-test.cpp     |   14 +-
 kpeople/nepomuk-feeder/tests/tid-base-test.h       |    4 +-
 20 files changed, 602 insertions(+), 1866 deletions(-)

-- 
ktp-common-internals packaging