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

[Diane Trout]

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

The following commit has been merged in the master branch:
commit f24070e46950e97e3c5d22dfc5347e1e4d532532
Merge: 82392ced99aab77030cb3935ef7658e554424573 c46c7e5973de46dbcb00b6f486c95eede525beb6
Author: Diane Trout <diane at ghic.org>
Date:   Thu Feb 20 08:42:37 2014 -0800

    Merge tag 'upstream/0.7.80'
    
    Upstream version 0.7.80

 CMakeLists.txt                                     |  11 +-
 autoaway.cpp                                       |  16 +-
 autoaway.h                                         |   8 +-
 autoconnect.cpp                                    |  24 +-
 autoconnect.h                                      |  10 +-
 config/kcm_ktp_integration_module.desktop          |   3 +
 config/telepathy-kded-config.ui                    |   2 +-
 contact-cache.cpp                                  | 244 +++++++++++++++++++++
 contact-cache.h                                    |  54 +++++
 contact-request-handler.cpp                        |  42 ++--
 contact-request-handler.h                          |  16 +-
 contactnotify.cpp                                  |  37 ++--
 contactnotify.h                                    |  13 +-
 error-handler.cpp                                  |  34 +--
 error-handler.h                                    |   6 +-
 kded_ktp_integration_module.desktop                |   2 +
 po/CMakeLists.txt                                  |   3 +
 po/bs/kded_ktp_integration_module.po               | 138 ++++++++----
 po/ca/kded_ktp_integration_module.po               |  52 ++---
 po/ca at valencia/kded_ktp_integration_module.po      |  48 ++--
 po/cs/kded_ktp_integration_module.po               |  52 ++---
 po/da/kded_ktp_integration_module.po               |  52 ++---
 po/de/kded_ktp_integration_module.po               |  50 ++---
 po/el/kded_ktp_integration_module.po               |  83 ++++---
 po/es/kded_ktp_integration_module.po               |  54 ++---
 po/et/kded_ktp_integration_module.po               |  46 ++--
 po/fi/kded_ktp_integration_module.po               |  50 ++---
 po/fr/kded_ktp_integration_module.po               |  68 +++---
 po/ga/kded_ktp_integration_module.po               |  46 ++--
 po/gl/kded_ktp_integration_module.po               | 109 ++++-----
 po/hu/kded_ktp_integration_module.po               |  50 ++---
 po/ia/kded_ktp_integration_module.po               |  74 +++----
 po/it/kded_ktp_integration_module.po               |  50 ++---
 po/ja/kded_ktp_integration_module.po               |  46 ++--
 po/kk/kded_ktp_integration_module.po               |  48 ++--
 po/km/kded_ktp_integration_module.po               |  46 ++--
 po/lt/kded_ktp_integration_module.po               |  77 ++-----
 po/mr/kded_ktp_integration_module.po               |  46 ++--
 po/nb/kded_ktp_integration_module.po               | 234 ++++++++++++--------
 po/nds/kded_ktp_integration_module.po              |  47 ++--
 po/nl/kded_ktp_integration_module.po               |  56 ++---
 po/pa/CMakeLists.txt                               |   2 +
 po/{nds => pa}/kded_ktp_integration_module.po      | 139 ++++++------
 po/pl/kded_ktp_integration_module.po               | 101 ++++-----
 po/pt/kded_ktp_integration_module.po               |  60 +++--
 po/pt_BR/kded_ktp_integration_module.po            |  62 +++---
 po/ro/kded_ktp_integration_module.po               |  85 ++++---
 po/ru/kded_ktp_integration_module.po               |  50 +++--
 po/sk/kded_ktp_integration_module.po               |  50 ++---
 po/sl/kded_ktp_integration_module.po               |  74 +++----
 po/sr/kded_ktp_integration_module.po               |  48 ++--
 po/sr at ijekavian/kded_ktp_integration_module.po     |  48 ++--
 .../kded_ktp_integration_module.po                 |  48 ++--
 po/sr at latin/kded_ktp_integration_module.po         |  48 ++--
 po/sv/kded_ktp_integration_module.po               |  60 ++---
 po/tr/CMakeLists.txt                               |   2 +
 po/{mr => tr}/kded_ktp_integration_module.po       | 181 ++++++++-------
 po/ug/CMakeLists.txt                               |   2 +
 po/{nds => ug}/kded_ktp_integration_module.po      | 104 ++++-----
 po/uk/kded_ktp_integration_module.po               |  50 ++---
 po/zh_CN/kded_ktp_integration_module.po            |  48 ++--
 po/zh_TW/kded_ktp_integration_module.po            |  62 +++---
 screensaveraway.cpp                                |  46 ++--
 screensaveraway.h                                  |   6 +-
 telepathy-kded-module-plugin.cpp                   |   2 +-
 telepathy-kded-module-plugin.h                     |  17 +-
 telepathy-module.cpp                               | 163 +++++++++-----
 telepathy-module.h                                 |   9 +-
 telepathy-mpris.cpp                                |  71 +++---
 telepathy-mpris.h                                  |  17 +-
 tests/CMakeLists.txt                               |  18 ++
 .../contact-cache-main.cpp                         |  30 +--
 72 files changed, 2094 insertions(+), 1756 deletions(-)

-- 
ktp-kded-integration-module packaging