[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/0.7.0-1-21-g56b6e24

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-kded-integration-module.git;a=commitdiff;h=67228f3

The following commit has been merged in the master branch:
commit 67228f35cd6712c1b3ad097b954017110ff6f075
Merge: 14fc0113a1a9b4d34818d6e30573f704d9aac499 e43825d8464ecb4ed5d9b9c6f0937e5995e3f846
Author: Diane Trout <diane at ghic.org>
Date:   Sun Sep 21 09:48:09 2014 -0700

    Merge tag 'upstream/0.8.80'
    
    Upstream version 0.8.80

 CMakeLists.txt                                     |   3 +-
 config/kcm_ktp_integration_module.desktop          |   6 +
 config/telepathy-kded-config.cpp                   |   4 +-
 config/telepathy-kded-config.ui                    |  48 ++----
 error-handler.cpp                                  |   6 +-
 kded_ktp_integration_module.desktop                |   6 +
 po/CMakeLists.txt                                  |   1 +
 po/ca/kded_ktp_integration_module.po               |  13 +-
 po/en_GB/CMakeLists.txt                            |   2 +
 po/{mr => en_GB}/kded_ktp_integration_module.po    | 136 ++++++++-------
 po/et/kded_ktp_integration_module.po               |  51 +++---
 po/hu/kded_ktp_integration_module.po               |   8 +-
 po/ko/kded_ktp_integration_module.po               |   2 -
 po/nds/kded_ktp_integration_module.po              | 106 ++++++------
 po/uk/kded_ktp_integration_module.po               |   2 +-
 telepathy-module.cpp => status-handler.cpp         | 105 ++++--------
 telepathy-module.h => status-handler.h             |  56 +++----
 telepathy-module.cpp                               | 184 +--------------------
 telepathy-module.h                                 |  28 +---
 telepathy-mpris.cpp                                |  18 +-
 tests/CMakeLists.txt                               |  25 ++-
 ...act-cache-main.cpp => status-handling-main.cpp} |  24 ++-
 22 files changed, 319 insertions(+), 515 deletions(-)

-- 
ktp-kded-integration-module packaging