[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/0.4.0-1-9-gbd57ecc

Ritesh Raj Sarraf rrs at alioth.debian.org
Sun Apr 7 18:21:56 UTC 2013


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

The following commit has been merged in the master branch:
commit bd57ecc626d94ef37b13275b701744cc552bce68
Merge: f0beaeb90170651bc3962c48f778ad968a5bf2e9 d260a56262acea21e391d30eb213d945b89d0cd7
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Sun Apr 7 23:30:11 2013 +0530

    Merge tag 'upstream/0.6.0'
    
    Upstream version 0.6.0
    
    * tag 'upstream/0.6.0':
      Imported Upstream version 0.6.0

 CMakeLists.txt                                     |    7 +
 data/profiles/{msn.profile => gadugadu.profile}    |    8 +-
 data/profiles/google-talk.profile                  |    2 +-
 data/profiles/kde-talk.profile                     |    2 +-
 plugins/butterfly/CMakeLists.txt                   |    7 +-
 ... ktpaccountskcm_plugin_butterfly.desktop.cmake} |   10 +-
 plugins/butterfly/main-options-widget.cpp          |    5 +
 plugins/butterfly/main-options-widget.h            |    1 +
 plugins/gabble/CMakeLists.txt                      |    7 +-
 plugins/gabble/gabble-account-ui.cpp               |   12 +-
 ... => ktpaccountskcm_plugin_gabble.desktop.cmake} |   16 +-
 plugins/gabble/main-options-widget-facebook.cpp    |   10 +
 plugins/gabble/main-options-widget-facebook.h      |    1 +
 plugins/gabble/main-options-widget-googletalk.cpp  |    5 +
 plugins/gabble/main-options-widget-googletalk.h    |    1 +
 plugins/gabble/main-options-widget-kde-talk.cpp    |    5 +
 plugins/gabble/main-options-widget-kde-talk.h      |    1 +
 plugins/gabble/main-options-widget-msn.cpp         |    8 +-
 plugins/gabble/main-options-widget-msn.h           |    1 +
 plugins/gabble/main-options-widget.cpp             |    5 +
 plugins/gabble/main-options-widget.h               |    1 +
 plugins/haze/CMakeLists.txt                        |    6 +-
 plugins/haze/aim-main-options-widget.cpp           |    5 +
 plugins/haze/aim-main-options-widget.h             |    2 +
 plugins/haze/icq-main-options-widget.cpp           |    5 +
 plugins/haze/icq-main-options-widget.h             |    2 +
 ...op => ktpaccountskcm_plugin_haze.desktop.cmake} |   16 +-
 plugins/haze/msn-main-options-widget.cpp           |    5 +
 plugins/haze/msn-main-options-widget.h             |    1 +
 plugins/haze/myspaceim-main-options-widget.cpp     |    5 +
 plugins/haze/myspaceim-main-options-widget.h       |    2 +
 plugins/haze/skype-main-options-widget.cpp         |    5 +
 plugins/haze/skype-main-options-widget.h           |    2 +
 plugins/haze/yahoo-main-options-widget.cpp         |    5 +
 plugins/haze/yahoo-main-options-widget.h           |    1 +
 plugins/idle/CMakeLists.txt                        |    6 +-
 ...op => ktpaccountskcm_plugin_idle.desktop.cmake} |   10 +-
 plugins/idle/main-options-widget.cpp               |   15 +
 plugins/idle/main-options-widget.h                 |    1 +
 plugins/rakia/CMakeLists.txt                       |    6 +-
 ...p => ktpaccountskcm_plugin_rakia.desktop.cmake} |   16 +-
 plugins/rakia/rakia-main-options-widget.cpp        |    5 +
 plugins/rakia/rakia-main-options-widget.h          |    1 +
 plugins/salut/CMakeLists.txt                       |    7 +-
 ...p => ktpaccountskcm_plugin_salut.desktop.cmake} |   16 +-
 plugins/salut/salut-main-options-widget.cpp        |   41 ++-
 plugins/salut/salut-main-options-widget.h          |    1 +
 plugins/sunshine/CMakeLists.txt                    |    7 +-
 ...> ktpaccountskcm_plugin_sunshine.desktop.cmake} |   16 +-
 plugins/sunshine/sunshine-main-options-widget.cpp  |    5 +
 plugins/sunshine/sunshine-main-options-widget.h    |    1 +
 po/CMakeLists.txt                                  |    4 +
 po/bs/kcm_ktp_accounts.po                          |  180 ++++++----
 po/bs/kcmtelepathyaccounts_plugin_butterfly.po     |    4 +-
 po/bs/kcmtelepathyaccounts_plugin_gabble.po        |   14 +-
 po/bs/kcmtelepathyaccounts_plugin_haze.po          |    4 +-
 po/bs/kcmtelepathyaccounts_plugin_idle.po          |    4 +-
 po/bs/kcmtelepathyaccounts_plugin_rakia.po         |    4 +-
 po/bs/kcmtelepathyaccounts_plugin_salut.po         |    4 +-
 po/bs/kcmtelepathyaccounts_plugin_sunshine.po      |    4 +-
 po/ca/kcm_ktp_accounts.po                          |  182 ++++++----
 po/ca/kcmtelepathyaccounts_plugin_gabble.po        |   16 +-
 po/ca at valencia/CMakeLists.txt                      |    2 +
 po/{ca => ca at valencia}/kcm_ktp_accounts.po         |  210 +++++++-----
 .../kcmtelepathyaccounts_plugin_butterfly.po       |    2 +-
 .../kcmtelepathyaccounts_plugin_gabble.po          |   22 +-
 .../kcmtelepathyaccounts_plugin_haze.po            |    2 +-
 .../kcmtelepathyaccounts_plugin_idle.po            |    2 +-
 .../kcmtelepathyaccounts_plugin_rakia.po           |   12 +-
 .../kcmtelepathyaccounts_plugin_salut.po           |    2 +-
 .../kcmtelepathyaccounts_plugin_sunshine.po        |    2 +-
 po/cs/kcm_ktp_accounts.po                          |  157 +++++----
 po/cs/kcmtelepathyaccounts_plugin_gabble.po        |   16 +-
 po/da/kcm_ktp_accounts.po                          |  183 ++++++----
 po/da/kcmtelepathyaccounts_plugin_gabble.po        |   18 +-
 po/de/kcm_ktp_accounts.po                          |  190 ++++++-----
 po/de/kcmtelepathyaccounts_plugin_gabble.po        |   20 +-
 po/el/kcm_ktp_accounts.po                          |  188 ++++++-----
 po/el/kcmtelepathyaccounts_plugin_gabble.po        |   21 +-
 po/en_GB/kcm_ktp_accounts.po                       |  161 +++++----
 po/eo/kcm_ktp_accounts.po                          |  151 +++++----
 po/es/kcm_ktp_accounts.po                          |  178 ++++++----
 po/es/kcmtelepathyaccounts_plugin_gabble.po        |   19 +-
 po/et/kcm_ktp_accounts.po                          |  178 ++++++----
 po/et/kcmtelepathyaccounts_plugin_gabble.po        |   12 +-
 po/fi/kcm_ktp_accounts.po                          |  188 ++++++----
 po/fi/kcmtelepathyaccounts_plugin_gabble.po        |   14 +-
 po/fi/kcmtelepathyaccounts_plugin_haze.po          |    9 +-
 po/fr/kcm_ktp_accounts.po                          |  183 ++++++-----
 po/fr/kcmtelepathyaccounts_plugin_gabble.po        |   12 +-
 po/fr/kcmtelepathyaccounts_plugin_haze.po          |    2 +-
 po/fr/kcmtelepathyaccounts_plugin_sunshine.po      |    5 +-
 po/ga/kcm_ktp_accounts.po                          |  158 +++++----
 po/ga/kcmtelepathyaccounts_plugin_butterfly.po     |    2 +-
 po/ga/kcmtelepathyaccounts_plugin_gabble.po        |   12 +-
 po/ga/kcmtelepathyaccounts_plugin_haze.po          |    2 +-
 po/ga/kcmtelepathyaccounts_plugin_idle.po          |    2 +-
 po/ga/kcmtelepathyaccounts_plugin_rakia.po         |    2 +-
 po/ga/kcmtelepathyaccounts_plugin_salut.po         |    2 +-
 po/ga/kcmtelepathyaccounts_plugin_sunshine.po      |    2 +-
 po/gl/kcm_ktp_accounts.po                          |  182 ++++++----
 po/gl/kcmtelepathyaccounts_plugin_gabble.po        |   10 +-
 po/hu/kcm_ktp_accounts.po                          |  185 ++++++----
 po/hu/kcmtelepathyaccounts_plugin_gabble.po        |   19 +-
 po/ia/CMakeLists.txt                               |    2 +
 po/{nl => ia}/kcm_ktp_accounts.po                  |  365 ++++++++++----------
 .../kcmtelepathyaccounts_plugin_butterfly.po       |   20 +-
 .../kcmtelepathyaccounts_plugin_gabble.po          |   98 +++---
 po/{nl => ia}/kcmtelepathyaccounts_plugin_haze.po  |   80 +++---
 po/{gl => ia}/kcmtelepathyaccounts_plugin_idle.po  |   35 +-
 po/{da => ia}/kcmtelepathyaccounts_plugin_rakia.po |  101 +++---
 po/{es => ia}/kcmtelepathyaccounts_plugin_salut.po |   26 +-
 .../kcmtelepathyaccounts_plugin_sunshine.po        |   36 +-
 po/it/kcm_ktp_accounts.po                          |  178 ++++++----
 po/it/kcmtelepathyaccounts_plugin_gabble.po        |   14 +-
 po/ja/kcm_ktp_accounts.po                          |  151 +++++----
 po/ja/kcmtelepathyaccounts_plugin_gabble.po        |   10 +-
 po/kk/kcm_ktp_accounts.po                          |  178 ++++++----
 po/kk/kcmtelepathyaccounts_plugin_gabble.po        |   14 +-
 po/km/kcm_ktp_accounts.po                          |  262 ++++++++-------
 po/km/kcmtelepathyaccounts_plugin_butterfly.po     |   19 +-
 po/km/kcmtelepathyaccounts_plugin_gabble.po        |  101 ++++---
 po/km/kcmtelepathyaccounts_plugin_haze.po          |   78 ++--
 po/km/kcmtelepathyaccounts_plugin_idle.po          |   33 +-
 po/km/kcmtelepathyaccounts_plugin_rakia.po         |  105 ++++--
 po/km/kcmtelepathyaccounts_plugin_salut.po         |   27 +-
 po/km/kcmtelepathyaccounts_plugin_sunshine.po      |   35 +-
 po/lt/kcm_ktp_accounts.po                          |  182 ++++++----
 po/lt/kcmtelepathyaccounts_plugin_gabble.po        |   10 +-
 po/mai/kcm_ktp_accounts.po                         |  151 +++++----
 po/mr/kcm_ktp_accounts.po                          |  186 ++++++-----
 .../kcmtelepathyaccounts_plugin_butterfly.po       |   21 +-
 .../kcmtelepathyaccounts_plugin_gabble.po          |   55 ++--
 po/{nds => mr}/kcmtelepathyaccounts_plugin_haze.po |   69 ++---
 po/{sl => mr}/kcmtelepathyaccounts_plugin_idle.po  |   35 +-
 .../kcmtelepathyaccounts_plugin_rakia.po           |   55 ++--
 po/{sl => mr}/kcmtelepathyaccounts_plugin_salut.po |   29 +-
 .../kcmtelepathyaccounts_plugin_sunshine.po        |   35 +-
 po/nb/kcm_ktp_accounts.po                          |  159 +++++----
 po/nb/kcmtelepathyaccounts_plugin_gabble.po        |   18 +-
 po/nb/kcmtelepathyaccounts_plugin_haze.po          |    2 +-
 po/nb/kcmtelepathyaccounts_plugin_rakia.po         |    8 +-
 po/nds/kcm_ktp_accounts.po                         |  170 +++++----
 po/nds/kcmtelepathyaccounts_plugin_butterfly.po    |    1 -
 po/nds/kcmtelepathyaccounts_plugin_gabble.po       |   10 +-
 po/nds/kcmtelepathyaccounts_plugin_haze.po         |    5 -
 po/nds/kcmtelepathyaccounts_plugin_rakia.po        |    2 -
 po/nds/kcmtelepathyaccounts_plugin_sunshine.po     |    1 -
 po/nl/kcm_ktp_accounts.po                          |  184 ++++++----
 po/nl/kcmtelepathyaccounts_plugin_gabble.po        |   18 +-
 po/pa/CMakeLists.txt                               |    2 +
 .../kcmtelepathyaccounts_plugin_butterfly.po       |   20 +-
 .../kcmtelepathyaccounts_plugin_gabble.po          |   65 ++--
 po/{nds => pa}/kcmtelepathyaccounts_plugin_haze.po |   77 ++---
 po/{et => pa}/kcmtelepathyaccounts_plugin_idle.po  |   34 +-
 .../kcmtelepathyaccounts_plugin_rakia.po           |   64 ++--
 po/{da => pa}/kcmtelepathyaccounts_plugin_salut.po |   28 +-
 .../kcmtelepathyaccounts_plugin_sunshine.po        |   35 +-
 po/pl/kcm_ktp_accounts.po                          |  180 ++++++----
 po/pl/kcmtelepathyaccounts_plugin_gabble.po        |   12 +-
 po/pt/kcm_ktp_accounts.po                          |  161 +++++----
 po/pt/kcmtelepathyaccounts_plugin_gabble.po        |   14 +-
 po/pt_BR/kcm_ktp_accounts.po                       |  169 +++++-----
 po/pt_BR/kcmtelepathyaccounts_plugin_gabble.po     |   21 +-
 po/ro/kcm_ktp_accounts.po                          |  182 ++++++----
 po/ro/kcmtelepathyaccounts_plugin_gabble.po        |   10 +-
 po/ru/kcm_ktp_accounts.po                          |  184 ++++++-----
 po/ru/kcmtelepathyaccounts_plugin_gabble.po        |   18 +-
 po/ru/kcmtelepathyaccounts_plugin_rakia.po         |   73 +++-
 po/sk/kcm_ktp_accounts.po                          |  161 +++++----
 po/sk/kcmtelepathyaccounts_plugin_butterfly.po     |   10 +-
 po/sk/kcmtelepathyaccounts_plugin_gabble.po        |   16 +-
 po/sk/kcmtelepathyaccounts_plugin_haze.po          |   24 +-
 po/sk/kcmtelepathyaccounts_plugin_idle.po          |   10 +-
 po/sk/kcmtelepathyaccounts_plugin_rakia.po         |   56 ++--
 po/sk/kcmtelepathyaccounts_plugin_salut.po         |   10 +-
 po/sk/kcmtelepathyaccounts_plugin_sunshine.po      |   12 +-
 po/sl/kcm_ktp_accounts.po                          |  160 +++++----
 po/sl/kcmtelepathyaccounts_plugin_butterfly.po     |    2 +-
 po/sl/kcmtelepathyaccounts_plugin_gabble.po        |   12 +-
 po/sl/kcmtelepathyaccounts_plugin_haze.po          |    2 +-
 po/sl/kcmtelepathyaccounts_plugin_idle.po          |    2 +-
 po/sl/kcmtelepathyaccounts_plugin_rakia.po         |    2 +-
 po/sl/kcmtelepathyaccounts_plugin_salut.po         |    2 +-
 po/sl/kcmtelepathyaccounts_plugin_sunshine.po      |    2 +-
 po/sr/kcm_ktp_accounts.po                          |  165 +++++-----
 po/sr/kcmtelepathyaccounts_plugin_butterfly.po     |   12 +-
 po/sr/kcmtelepathyaccounts_plugin_gabble.po        |   14 +-
 po/sr/kcmtelepathyaccounts_plugin_idle.po          |   34 +--
 po/sr/kcmtelepathyaccounts_plugin_rakia.po         |  118 ++-----
 po/sr/kcmtelepathyaccounts_plugin_salut.po         |   24 +-
 po/sr/kcmtelepathyaccounts_plugin_sunshine.po      |   36 +--
 po/sr at ijekavian/kcm_ktp_accounts.po                |  165 +++++-----
 .../kcmtelepathyaccounts_plugin_butterfly.po       |   12 +-
 .../kcmtelepathyaccounts_plugin_gabble.po          |   14 +-
 .../kcmtelepathyaccounts_plugin_idle.po            |   34 +--
 .../kcmtelepathyaccounts_plugin_rakia.po           |  118 ++-----
 .../kcmtelepathyaccounts_plugin_salut.po           |   24 +-
 .../kcmtelepathyaccounts_plugin_sunshine.po        |   36 +--
 po/sr at ijekavianlatin/kcm_ktp_accounts.po           |  165 +++++-----
 .../kcmtelepathyaccounts_plugin_butterfly.po       |   12 +-
 .../kcmtelepathyaccounts_plugin_gabble.po          |   14 +-
 .../kcmtelepathyaccounts_plugin_idle.po            |   34 +--
 .../kcmtelepathyaccounts_plugin_rakia.po           |  118 ++-----
 .../kcmtelepathyaccounts_plugin_salut.po           |   24 +-
 .../kcmtelepathyaccounts_plugin_sunshine.po        |   36 +--
 po/sr at latin/kcm_ktp_accounts.po                    |  165 +++++-----
 .../kcmtelepathyaccounts_plugin_butterfly.po       |   12 +-
 po/sr at latin/kcmtelepathyaccounts_plugin_gabble.po  |   14 +-
 po/sr at latin/kcmtelepathyaccounts_plugin_idle.po    |   34 +--
 po/sr at latin/kcmtelepathyaccounts_plugin_rakia.po   |  118 ++-----
 po/sr at latin/kcmtelepathyaccounts_plugin_salut.po   |   24 +-
 .../kcmtelepathyaccounts_plugin_sunshine.po        |   36 +--
 po/sv/kcm_ktp_accounts.po                          |  180 ++++++----
 po/sv/kcmtelepathyaccounts_plugin_gabble.po        |   16 +-
 po/tr/kcm_ktp_accounts.po                          |  161 +++++-----
 .../kcmtelepathyaccounts_plugin_butterfly.po       |   20 +-
 po/ug/kcm_ktp_accounts.po                          |  166 +++++----
 po/ug/kcmtelepathyaccounts_plugin_gabble.po        |   10 +-
 po/uk/kcm_ktp_accounts.po                          |  178 ++++++----
 po/uk/kcmtelepathyaccounts_plugin_gabble.po        |   16 +-
 .../kcmtelepathyaccounts_plugin_butterfly.po       |   21 +-
 po/vi/kcmtelepathyaccounts_plugin_gabble.po        |   10 +-
 .../kcmtelepathyaccounts_plugin_haze.po            |   82 +++---
 .../kcmtelepathyaccounts_plugin_idle.po            |   34 +-
 po/{ro => vi}/kcmtelepathyaccounts_plugin_rakia.po |   75 +++--
 .../kcmtelepathyaccounts_plugin_salut.po           |   29 +-
 .../kcmtelepathyaccounts_plugin_sunshine.po        |   36 +-
 po/wa/CMakeLists.txt                               |    2 +
 po/{es => wa}/kcm_ktp_accounts.po                  |  361 ++++++++++----------
 po/zh_CN/kcm_ktp_accounts.po                       |  178 ++++++----
 po/zh_CN/kcmtelepathyaccounts_plugin_butterfly.po  |    8 +-
 po/zh_CN/kcmtelepathyaccounts_plugin_gabble.po     |   17 +-
 po/zh_CN/kcmtelepathyaccounts_plugin_haze.po       |    7 +-
 po/zh_CN/kcmtelepathyaccounts_plugin_idle.po       |    9 +-
 po/zh_CN/kcmtelepathyaccounts_plugin_salut.po      |    8 +-
 po/zh_CN/kcmtelepathyaccounts_plugin_sunshine.po   |   13 +-
 po/zh_TW/kcm_ktp_accounts.po                       |  186 ++++++-----
 po/zh_TW/kcmtelepathyaccounts_plugin_gabble.po     |   22 +-
 src/CMakeLists.txt                                 |    7 +-
 .../abstract-account-parameters-widget.cpp         |    8 +-
 .../abstract-account-parameters-widget.h           |    7 +-
 src/KCMTelepathyAccounts/account-edit-widget.cpp   |   47 +++
 src/KCMTelepathyAccounts/account-edit-widget.h     |    7 +
 .../ktpaccountskcminternal-accountuiplugin.desktop |    9 +-
 src/KCMTelepathyAccounts/parameter-edit-widget.cpp |   10 +
 src/KCMTelepathyAccounts/parameter-edit-widget.h   |    1 +
 .../simple-profile-select-widget.cpp               |    2 -
 .../simple-profile-select-widget.ui                |   28 +--
 src/account-item.cpp                               |  190 ----------
 src/account-item.h                                 |   74 ----
 src/accounts-list-delegate.cpp                     |   17 +-
 src/accounts-list-model.cpp                        |  230 ------------
 src/accounts-list-model.h                          |   71 ----
 src/add-account-assistant.cpp                      |   14 +-
 src/edit-account-dialog.cpp                        |   61 ++--
 src/edit-account-dialog.h                          |   10 +-
 src/kcm-telepathy-accounts.cpp                     |  154 +++++++--
 src/kcm-telepathy-accounts.h                       |   18 +-
 src/kcm_ktp_accounts.desktop                       |   15 +-
 src/main-widget.ui                                 |  334 +++++++++---------
 src/salut-details-dialog.cpp                       |    3 +-
 src/salut-details-dialog.h                         |    2 +-
 src/salut-enabler.cpp                              |   61 ++--
 src/salut-enabler.h                                |    2 +-
 src/settings-im-and-voip.desktop                   |   10 +-
 src/version.h.in                                   |    1 +
 267 files changed, 7133 insertions(+), 6413 deletions(-)

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list