[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 14c73a56985bc29b940fb33a0393624edfd9c3d1
Merge: e8f89fcb77e4c7d0daf47950bf79b401b69db61c 8dfac172069cc3cdd9a840562ac51dac59273540
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue May 26 18:27:05 2015 +0200

    Merge branch 'master' into accountStorageInterface
    
    Conflicts:
    	plugins/morse/ktpaccountskcm_plugin_morse.desktop.cmake
    	plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake

 CMakeLists.txt                                     |  3 --
 cmake/modules/FindAccountsFileDir.cmake            | 49 ----------------------
 data/kaccounts/CMakeLists.txt                      | 12 ++----
 data/kaccounts/ktp-morse-telegram-im.service.in    |  9 ++++
 ....provider.in => ktp-morse-telegram.provider.in} |  9 ++--
 .../ktpaccountskcm_plugin_butterfly.desktop.cmake  |  1 -
 .../ktpaccountskcm_plugin_gabble.desktop.cmake     |  2 -
 .../haze/ktpaccountskcm_plugin_haze.desktop.cmake  |  2 -
 .../idle/ktpaccountskcm_plugin_idle.desktop.cmake  |  1 -
 .../ktpaccountskcm_plugin_morse.desktop.cmake      |  1 -
 .../ktpaccountskcm_plugin_pintxo.desktop.cmake     |  2 -
 .../ktpaccountskcm_plugin_rakia.desktop.cmake      |  2 -
 .../ktpaccountskcm_plugin_salut.desktop.cmake      |  2 -
 .../sipe/ktpaccountskcm_plugin_sipe.desktop.cmake  |  2 -
 .../ktpaccountskcm_plugin_sunshine.desktop.cmake   |  2 -
 .../ktpaccountskcminternal-accountuiplugin.desktop |  1 -
 src/kcm_ktp_accounts.desktop                       |  2 -
 src/settings-im-and-voip.desktop                   |  2 -
 18 files changed, 16 insertions(+), 88 deletions(-)

-- 
ktp-accounts-kcm packaging