[SCM] ktp-common-internals packaging branch, master, updated. debian/15.08.2-3-8-g07cdb7c

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git;a=commitdiff;h=3d6ffeb

The following commit has been merged in the master branch:
commit 3d6ffebbc83e79691874a18c5d09cb9b385db8d9
Merge: 601f57e043f4b1349160854639730463f48247d4 afe8918406a6c257279cc218ea043d088ed7d12c
Author: Diane Trout <diane at ghic.org>
Date:   Wed Jan 6 16:54:38 2016 -0800

    Merge tag 'upstream/15.12.0'
    
    Upstream version 15.12.0

 CMakeLists.txt                                     |   4 +-
 COPYING.GPLv2                                      | 339 +++++++++++++++++++++
 KTp/Declarative/telepathy-manager.cpp              |   3 +-
 KTp/Logger/abstract-logger-plugin.cpp              |  20 +-
 KTp/Logger/abstract-logger-plugin.h                |  22 +-
 KTp/Logger/log-entity.cpp                          |  20 +-
 KTp/Logger/log-entity.h                            |  20 +-
 KTp/Logger/log-manager-private.h                   |  20 +-
 KTp/Logger/log-manager.cpp                         |  20 +-
 KTp/Logger/log-manager.h                           |  20 +-
 KTp/Logger/log-message.cpp                         |  20 +-
 KTp/Logger/log-message.h                           |  20 +-
 KTp/Logger/log-search-hit.cpp                      |  20 +-
 KTp/Logger/log-search-hit.h                        |  20 +-
 KTp/Logger/pending-logger-dates-impl.cpp           |  20 +-
 KTp/Logger/pending-logger-dates-impl.h             |  20 +-
 KTp/Logger/pending-logger-dates.cpp                |  20 +-
 KTp/Logger/pending-logger-dates.h                  |  20 +-
 KTp/Logger/pending-logger-entities-impl.cpp        |  20 +-
 KTp/Logger/pending-logger-entities-impl.h          |  20 +-
 KTp/Logger/pending-logger-entities.cpp             |  20 +-
 KTp/Logger/pending-logger-entities.h               |  20 +-
 KTp/Logger/pending-logger-logs-impl.cpp            |  20 +-
 KTp/Logger/pending-logger-logs-impl.h              |  20 +-
 KTp/Logger/pending-logger-logs.cpp                 |  20 +-
 KTp/Logger/pending-logger-logs.h                   |  20 +-
 KTp/Logger/pending-logger-operation.cpp            |  20 +-
 KTp/Logger/pending-logger-operation.h              |  20 +-
 KTp/Logger/pending-logger-search-impl.cpp          |  20 +-
 KTp/Logger/pending-logger-search-impl.h            |  20 +-
 KTp/Logger/pending-logger-search.cpp               |  20 +-
 KTp/Logger/pending-logger-search.h                 |  20 +-
 .../plugins/tplogger/pending-tp-logger-dates.cpp   |  20 +-
 .../plugins/tplogger/pending-tp-logger-dates.h     |  20 +-
 .../tplogger/pending-tp-logger-entities.cpp        |  20 +-
 .../plugins/tplogger/pending-tp-logger-entities.h  |  20 +-
 .../plugins/tplogger/pending-tp-logger-logs.cpp    |  20 +-
 .../plugins/tplogger/pending-tp-logger-logs.h      |  20 +-
 .../plugins/tplogger/pending-tp-logger-search.cpp  |  20 +-
 .../plugins/tplogger/pending-tp-logger-search.h    |  20 +-
 KTp/Logger/plugins/tplogger/tp-logger-plugin.cpp   |  20 +-
 KTp/Logger/plugins/tplogger/tp-logger-plugin.h     |  20 +-
 KTp/Logger/plugins/tplogger/utils.cpp              |  20 +-
 KTp/Logger/plugins/tplogger/utils.h                |  20 +-
 KTp/OTR/constants.h                                |  27 +-
 KTp/OTR/types.cpp                                  |  27 +-
 KTp/OTR/types.h                                    |  27 +-
 data/ktelepathy.notifyrc                           |  13 +
 kpeople/actionsplugin/kpeople-actions-plugin.cpp   |  19 +-
 kpeople/actionsplugin/kpeople-actions-plugin.h     |  19 +-
 otr-proxy/KTpProxy/main.cpp                        |  27 +-
 otr-proxy/KTpProxy/otr-config.cpp                  |  27 +-
 otr-proxy/KTpProxy/otr-config.h                    |  27 +-
 otr-proxy/KTpProxy/otr-constants.h                 |  27 +-
 otr-proxy/KTpProxy/otr-manager.cpp                 |  27 +-
 otr-proxy/KTpProxy/otr-manager.h                   |  27 +-
 otr-proxy/KTpProxy/otr-message.cpp                 |  27 +-
 otr-proxy/KTpProxy/otr-message.h                   |  27 +-
 otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp   |  27 +-
 otr-proxy/KTpProxy/otr-proxy-channel-adaptee.h     |  27 +-
 otr-proxy/KTpProxy/otr-proxy-channel.cpp           |  27 +-
 otr-proxy/KTpProxy/otr-proxy-channel.h             |  27 +-
 otr-proxy/KTpProxy/otr-session.cpp                 |  27 +-
 otr-proxy/KTpProxy/otr-session.h                   |  27 +-
 otr-proxy/KTpProxy/otr-utils.cpp                   |  27 +-
 otr-proxy/KTpProxy/otr-utils.h                     |  27 +-
 otr-proxy/KTpProxy/pending-curry-operation.cpp     |  27 +-
 otr-proxy/KTpProxy/pending-curry-operation.h       |  27 +-
 otr-proxy/KTpProxy/proxy-observer.cpp              |  27 +-
 otr-proxy/KTpProxy/proxy-observer.h                |  27 +-
 otr-proxy/KTpProxy/proxy-service-adaptee.cpp       |  27 +-
 otr-proxy/KTpProxy/proxy-service-adaptee.h         |  27 +-
 otr-proxy/KTpProxy/proxy-service.cpp               |  27 +-
 otr-proxy/KTpProxy/proxy-service.h                 |  27 +-
 otr-proxy/KTpProxy/types.h                         |  27 +-
 otr-proxy/test/lib/test-config.cpp                 |  27 +-
 otr-proxy/test/lib/test-config.h                   |  27 +-
 otr-proxy/test/lib/test-session.cpp                |  27 +-
 otr-proxy/test/lib/test-session.h                  |  27 +-
 otr-proxy/test/otr-test.cpp                        |  27 +-
 otr-proxy/test/utils-test.cpp                      |  27 +-
 81 files changed, 1229 insertions(+), 908 deletions(-)

-- 
ktp-common-internals packaging