[SCM] ktp-approver packaging branch, master, updated. debian/0.9.0-1-10-g61ef2bf

Diane Trout diane at moszumanska.debian.org
Sun Jul 12 06:29:23 UTC 2015


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

The following commit has been merged in the master branch:
commit d69698ea4ca4aff742432663a121265cb5ff42cb
Merge: 0c54c25c5e8ac58ec3b244b51f2fb151d83d7469 19ec039eb34007123a0a69f3bfe8cd8cf65cde1b
Author: Diane Trout <diane at ghic.org>
Date:   Sat Jul 11 17:13:30 2015 -0700

    Merge tag 'upstream/15.04.3'
    
    Upstream version 15.04.3

 .gitignore                                         |   8 ++
 .reviewboardrc                                     |   2 +
 CMakeLists.txt                                     |  25 ++--
 doc-translations/CMakeLists.txt                    |   0
 ktp-approver.desktop                               |   6 +-
 po/CMakeLists.txt                                  |  42 -------
 po/bs/CMakeLists.txt                               |   2 -
 po/bs/kded_ktp_approver.po                         | 118 -------------------
 po/ca/CMakeLists.txt                               |   2 -
 po/ca/kded_ktp_approver.po                         | 124 --------------------
 po/ca at valencia/CMakeLists.txt                      |   2 -
 po/ca at valencia/kded_ktp_approver.po                | 124 --------------------
 po/cs/CMakeLists.txt                               |   2 -
 po/cs/kded_ktp_approver.po                         | 109 -----------------
 po/da/CMakeLists.txt                               |   2 -
 po/da/kded_ktp_approver.po                         | 121 -------------------
 po/de/CMakeLists.txt                               |   2 -
 po/de/kded_ktp_approver.po                         | 113 ------------------
 po/el/CMakeLists.txt                               |   2 -
 po/el/kded_ktp_approver.po                         | 123 --------------------
 po/en_GB/CMakeLists.txt                            |   2 -
 po/en_GB/kded_ktp_approver.po                      | 108 -----------------
 po/es/CMakeLists.txt                               |   2 -
 po/es/kded_ktp_approver.po                         | 123 --------------------
 po/et/CMakeLists.txt                               |   2 -
 po/et/kded_ktp_approver.po                         | 119 -------------------
 po/fi/CMakeLists.txt                               |   2 -
 po/fi/kded_ktp_approver.po                         | 129 ---------------------
 po/fr/CMakeLists.txt                               |   2 -
 po/fr/kded_ktp_approver.po                         | 125 --------------------
 po/ga/CMakeLists.txt                               |   2 -
 po/ga/kded_ktp_approver.po                         | 110 ------------------
 po/gl/CMakeLists.txt                               |   2 -
 po/gl/kded_ktp_approver.po                         | 125 --------------------
 po/hu/CMakeLists.txt                               |   2 -
 po/hu/kded_ktp_approver.po                         | 122 -------------------
 po/ia/CMakeLists.txt                               |   2 -
 po/ia/kded_ktp_approver.po                         | 114 ------------------
 po/it/CMakeLists.txt                               |   2 -
 po/it/kded_ktp_approver.po                         | 118 -------------------
 po/ja/CMakeLists.txt                               |   2 -
 po/ja/kded_ktp_approver.po                         | 103 ----------------
 po/kk/CMakeLists.txt                               |   2 -
 po/kk/kded_ktp_approver.po                         | 121 -------------------
 po/km/CMakeLists.txt                               |   2 -
 po/km/kded_ktp_approver.po                         | 125 --------------------
 po/ko/CMakeLists.txt                               |   2 -
 po/ko/kded_ktp_approver.po                         | 106 -----------------
 po/lt/CMakeLists.txt                               |   2 -
 po/lt/kded_ktp_approver.po                         | 129 ---------------------
 po/mr/CMakeLists.txt                               |   2 -
 po/mr/kded_ktp_approver.po                         | 109 -----------------
 po/nb/CMakeLists.txt                               |   2 -
 po/nb/kded_ktp_approver.po                         | 110 ------------------
 po/nds/CMakeLists.txt                              |   2 -
 po/nds/kded_ktp_approver.po                        | 114 ------------------
 po/nl/CMakeLists.txt                               |   2 -
 po/nl/kded_ktp_approver.po                         | 121 -------------------
 po/pl/CMakeLists.txt                               |   2 -
 po/pl/kded_ktp_approver.po                         | 123 --------------------
 po/pt/CMakeLists.txt                               |   2 -
 po/pt/kded_ktp_approver.po                         | 111 ------------------
 po/pt_BR/CMakeLists.txt                            |   2 -
 po/pt_BR/kded_ktp_approver.po                      | 115 ------------------
 po/ro/CMakeLists.txt                               |   2 -
 po/ro/kded_ktp_approver.po                         | 122 -------------------
 po/ru/CMakeLists.txt                               |   2 -
 po/ru/kded_ktp_approver.po                         | 126 --------------------
 po/sk/CMakeLists.txt                               |   2 -
 po/sk/kded_ktp_approver.po                         | 107 -----------------
 po/sl/CMakeLists.txt                               |   2 -
 po/sl/kded_ktp_approver.po                         | 111 ------------------
 po/sr/CMakeLists.txt                               |   2 -
 po/sr/kded_ktp_approver.po                         | 115 ------------------
 po/sr at ijekavian/CMakeLists.txt                     |   2 -
 po/sr at ijekavian/kded_ktp_approver.po               | 115 ------------------
 po/sr at ijekavianlatin/CMakeLists.txt                |   2 -
 po/sr at ijekavianlatin/kded_ktp_approver.po          | 115 ------------------
 po/sr at latin/CMakeLists.txt                         |   2 -
 po/sr at latin/kded_ktp_approver.po                   | 115 ------------------
 po/sv/CMakeLists.txt                               |   2 -
 po/sv/kded_ktp_approver.po                         | 121 -------------------
 po/tr/CMakeLists.txt                               |   2 -
 po/tr/kded_ktp_approver.po                         | 115 ------------------
 po/uk/CMakeLists.txt                               |   2 -
 po/uk/kded_ktp_approver.po                         | 124 --------------------
 po/zh_CN/CMakeLists.txt                            |   2 -
 po/zh_CN/kded_ktp_approver.po                      | 120 -------------------
 po/zh_TW/CMakeLists.txt                            |   2 -
 po/zh_TW/kded_ktp_approver.po                      | 120 -------------------
 src/CMakeLists.txt                                 |  16 ++-
 src/dispatchoperation.cpp                          |  10 +-
 src/filetransferchannelapprover.cpp                |  15 +--
 src/filetransferchannelapprover.h                  |   2 +-
 src/handlewithcaller.cpp                           |  11 +-
 src/ktp_approver.desktop                           |   3 +
 src/ktp_approver_debug.cpp                         |  21 ++++
 src/ktp_approver_debug.h                           |  26 +++++
 src/ktpapprovermodule.cpp                          |  20 ++--
 ...esktop.Telepathy.Client.KTp.Approver.service.in |   2 +-
 src/textchannelapprover.cpp                        |  13 +--
 src/textchannelapprover.h                          |   2 +-
 src/tubechannelapprover.cpp                        |  60 +++++-----
 src/tubechannelapprover.h                          |   6 +-
 104 files changed, 160 insertions(+), 5152 deletions(-)

-- 
ktp-approver packaging



More information about the pkg-kde-commits mailing list