[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=4054702

The following commit has been merged in the master branch:
commit 4054702186d2de3b14267d096d5ecbd4c92856fe
Merge: ff41974d630e41e967c4f469448c8c67e4854f43 c9fe7b73c6161e489fb9ecf179c4051637bf30ec
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Wed Mar 6 09:32:44 2013 +0100

    Merge branch 'version'
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
    REVIEW: 109302

 CMakeLists.txt                                                     | 4 +++-
 plugins/butterfly/CMakeLists.txt                                   | 7 +++++--
 ...erfly.desktop => ktpaccountskcm_plugin_butterfly.desktop.cmake} | 2 +-
 plugins/gabble/CMakeLists.txt                                      | 7 +++++--
 ...n_gabble.desktop => ktpaccountskcm_plugin_gabble.desktop.cmake} | 2 +-
 plugins/haze/CMakeLists.txt                                        | 6 +++++-
 ...lugin_haze.desktop => ktpaccountskcm_plugin_haze.desktop.cmake} | 2 +-
 plugins/idle/CMakeLists.txt                                        | 6 +++++-
 ...lugin_idle.desktop => ktpaccountskcm_plugin_idle.desktop.cmake} | 2 +-
 plugins/rakia/CMakeLists.txt                                       | 6 ++++--
 ...gin_rakia.desktop => ktpaccountskcm_plugin_rakia.desktop.cmake} | 2 +-
 plugins/salut/CMakeLists.txt                                       | 7 +++++--
 ...gin_salut.desktop => ktpaccountskcm_plugin_salut.desktop.cmake} | 2 +-
 plugins/sunshine/CMakeLists.txt                                    | 7 +++++--
 ...nshine.desktop => ktpaccountskcm_plugin_sunshine.desktop.cmake} | 2 +-
 src/CMakeLists.txt                                                 | 2 ++
 src/kcm-telepathy-accounts.cpp                                     | 3 ++-
 src/version.h.in                                                   | 1 +
 18 files changed, 49 insertions(+), 21 deletions(-)

-- 
ktp-accounts-kcm packaging