[SCM] ktp-accounts-kcm packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-62-g66861ad

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=d93f879

The following commit has been merged in the master branch:
commit d93f8793919754b7021b3aadd6f79e3d5cdda6cf
Merge: a999d65a8b91d5c88c36c981c36fc9339b001259 2d8348bd53d3308ac57813a331c02cac1feb97ba
Author: Diane Trout <diane at ghic.org>
Date:   Sun Aug 9 14:31:06 2015 -0700

    Merge tag 'upstream/15.07.90'
    
    Upstream version 15.07.90

 CMakeLists.txt                                     |  15 +-
 cmake/modules/FindAccountsFileDir.cmake            |  49 ------
 data/kaccounts/CMakeLists.txt                      |  12 +-
 .../disabled/ktp-haze-steam-mobile-im.service.in   |  10 ++
 .../disabled/ktp-haze-steam-mobile.provider.in     |   8 +-
 data/kaccounts/ktp-gadugadu.provider.in            |   8 +-
 data/kaccounts/ktp-haze-aim-im.service.in          |  20 +++
 data/kaccounts/ktp-haze-aim.provider.in            |   9 ++
 data/kaccounts/ktp-haze-gadugadu-im.service.in     |  11 ++
 data/kaccounts/ktp-haze-icq-im.service.in          |  11 ++
 data/kaccounts/ktp-haze-icq.provider.in            |   8 +-
 data/kaccounts/ktp-haze-sametime-im.service.in     |  11 ++
 data/kaccounts/ktp-haze-sametime.provider.in       |   8 +-
 data/kaccounts/ktp-haze-yahoo-im.service.in        |  11 ++
 data/kaccounts/ktp-haze-yahoo.provider.in          |   8 +-
 data/kaccounts/ktp-jabber-im.service.in            |  11 ++
 data/kaccounts/ktp-jabber.provider.in              |   8 +-
 data/kaccounts/ktp-kde-talk-im.service.in          |  11 ++
 data/kaccounts/ktp-kde-talk.provider.in            |   8 +-
 data/kaccounts/ktp-morse-telegram-im.service.in    |  20 +++
 data/kaccounts/ktp-morse-telegram.provider.in      |   9 ++
 data/kaccounts/ktp-sipe-haze-im.service.in         |  20 +++
 data/kaccounts/ktp-sipe-haze.provider.in           |   9 ++
 data/kaccounts/ktp-sipe-im.service.in              |  20 +++
 data/kaccounts/ktp-sipe.provider.in                |   9 ++
 plugins/CMakeLists.txt                             |   8 +-
 .../ktpaccountskcm_plugin_butterfly.desktop.cmake  |   2 +-
 .../ktpaccountskcm_plugin_gabble.desktop.cmake     |   2 +-
 .../haze/ktpaccountskcm_plugin_haze.desktop.cmake  |   2 +-
 .../idle/ktpaccountskcm_plugin_idle.desktop.cmake  |   2 +-
 plugins/kaccounts/kaccounts-ui-provider.cpp        | 175 +++++++++++----------
 plugins/kaccounts/kaccounts-ui-provider.h          |   1 -
 plugins/morse/CMakeLists.txt                       |  12 +-
 plugins/morse/Messages.sh                          |   2 +-
 .../ktpaccountskcm_plugin_morse.desktop.cmake      |   5 +-
 plugins/morse/main-options-widget.ui               |  12 +-
 plugins/morse/morse-account-ui-plugin.cpp          |   1 -
 .../ktpaccountskcm_plugin_pintxo.desktop.cmake     |   2 +-
 .../ktpaccountskcm_plugin_rakia.desktop.cmake      |   2 +-
 .../ktpaccountskcm_plugin_salut.desktop.cmake      |   2 +-
 plugins/sipe/CMakeLists.txt                        |  18 ++-
 .../sipe/ktpaccountskcm_plugin_sipe.desktop.cmake  |   4 +-
 plugins/sipe/sipe-account-ui-plugin.cpp            |   1 -
 plugins/sipe/sipe-advanced-options-widget.ui       |  39 ++---
 plugins/sipe/sipe-main-options-widget.ui           |  17 +-
 plugins/sunshine/CMakeLists.txt                    |   6 +-
 .../ktpaccountskcm_plugin_sunshine.desktop.cmake   |   2 +-
 plugins/sunshine/sunshine-account-ui-plugin.cpp    |   3 -
 .../sunshine/sunshine-advanced-options-widget.ui   |  16 +-
 plugins/sunshine/sunshine-main-options-widget.ui   |  14 +-
 src/KCMTelepathyAccounts/CMakeLists.txt            |   2 -
 src/KCMTelepathyAccounts/PluginMacros              |   7 -
 .../ktpaccountskcminternal-accountuiplugin.desktop |   2 +-
 src/KCMTelepathyAccounts/plugin-macros.h           |  31 ----
 src/settings-im-and-voip.desktop                   |   2 +-
 55 files changed, 369 insertions(+), 349 deletions(-)

-- 
ktp-accounts-kcm packaging