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

[Ritesh Raj Sarraf]

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

The following commit has been merged in the master branch:
commit ca5e2f8bb9a63d2cd92b9a74f427a972bd553660
Merge: 30bf5c6ef629b9e77ef1daf9fea5e9c4720bcacf 1313d6e9a6ec1b7367c859d94f4d84d917e74203
Author: Ritesh Raj Sarraf <rrs at debian.org>
Date:   Sun Apr 7 23:35:36 2013 +0530

    Merge tag 'upstream/0.6.0'
    
    Upstream version 0.6.0
    
    * tag 'upstream/0.6.0':
      Imported Upstream version 0.6.0
      Imported Upstream version 0.5.3
    
    Conflicts:
    	po/CMakeLists.txt
    	po/bs/kded_ktp_approver.po
    	po/cs/kded_ktp_approver.po
    	po/de/kded_ktp_approver.po
    	po/et/kded_ktp_approver.po
    	po/fi/kded_ktp_approver.po
    	po/fr/kded_ktp_approver.po
    	po/gl/kded_ktp_approver.po
    	po/hu/kded_ktp_approver.po
    	po/kk/kded_ktp_approver.po
    	po/lt/kded_ktp_approver.po
    	po/nb/kded_ktp_approver.po
    	po/ro/kded_ktp_approver.po
    	po/ru/kded_ktp_approver.po
    	po/sl/kded_ktp_approver.po
    	po/sr/kded_ktp_approver.po
    	po/sr at ijekavian/kded_ktp_approver.po
    	po/sr at ijekavianlatin/kded_ktp_approver.po
    	po/sr at latin/kded_ktp_approver.po
    	po/zh_CN/kded_ktp_approver.po
    	src/ktp_approver.desktop
    	src/ktpapprovermodule.cpp

 CMakeLists.txt                                     |    7 +
 ktp-approver.service                               |   19 +++
 po/CMakeLists.txt                                  |    5 +
 po/bs/kded_ktp_approver.po                         |   85 +++++------
 po/ca/kded_ktp_approver.po                         |   77 +++++-----
 po/ca at valencia/CMakeLists.txt                      |    2 +
 po/{ca => ca at valencia}/kded_ktp_approver.po        |   86 ++++++-----
 po/cs/kded_ktp_approver.po                         |   81 +++++-----
 po/da/kded_ktp_approver.po                         |   90 ++++++-----
 po/de/kded_ktp_approver.po                         |   86 ++++++------
 po/el/kded_ktp_approver.po                         |   94 ++++++------
 po/es/kded_ktp_approver.po                         |   88 ++++++-----
 po/et/kded_ktp_approver.po                         |   81 ++++++-----
 po/fi/kded_ktp_approver.po                         |   82 ++++++-----
 po/fr/kded_ktp_approver.po                         |   83 ++++++-----
 po/ga/kded_ktp_approver.po                         |   71 +++++----
 po/gl/kded_ktp_approver.po                         |   77 +++++-----
 po/hu/kded_ktp_approver.po                         |   81 ++++++-----
 po/ia/CMakeLists.txt                               |    2 +
 po/ia/kded_ktp_approver.po                         |  112 ++++++++++++++
 po/it/kded_ktp_approver.po                         |   82 ++++++-----
 po/ja/kded_ktp_approver.po                         |   63 ++++----
 po/kk/kded_ktp_approver.po                         |   80 ++++++-----
 po/km/CMakeLists.txt                               |    2 +
 po/km/kded_ktp_approver.po                         |  126 ++++++++++++++++
 po/lt/kded_ktp_approver.po                         |   81 ++++++-----
 po/mr/CMakeLists.txt                               |    2 +
 po/{nds => mr}/kded_ktp_approver.po                |  101 ++++++-------
 po/nb/kded_ktp_approver.po                         |   75 +++++-----
 po/nds/kded_ktp_approver.po                        |   66 ++++----
 po/nl/kded_ktp_approver.po                         |   86 ++++++-----
 po/pl/kded_ktp_approver.po                         |   85 ++++++-----
 po/pt/kded_ktp_approver.po                         |   77 +++++-----
 po/pt_BR/kded_ktp_approver.po                      |   92 ++++++------
 po/ro/kded_ktp_approver.po                         |   86 ++++++-----
 po/ru/kded_ktp_approver.po                         |   93 ++++++------
 po/sk/kded_ktp_approver.po                         |   81 +++++-----
 po/sl/kded_ktp_approver.po                         |   79 +++++-----
 po/sr/kded_ktp_approver.po                         |   82 +++++-----
 po/sr at ijekavian/kded_ktp_approver.po               |   82 +++++-----
 po/sr at ijekavianlatin/kded_ktp_approver.po          |   82 +++++-----
 po/sr at latin/kded_ktp_approver.po                   |   82 +++++-----
 po/sv/kded_ktp_approver.po                         |   82 ++++++-----
 po/tr/CMakeLists.txt                               |    2 +
 po/{zh_TW => tr}/kded_ktp_approver.po              |  102 +++++++-------
 po/uk/kded_ktp_approver.po                         |   86 ++++++-----
 po/zh_CN/kded_ktp_approver.po                      |   79 ++++++-----
 po/zh_TW/kded_ktp_approver.po                      |   83 ++++++-----
 src/CMakeLists.txt                                 |    2 +-
 src/approverdaemon.cpp                             |    3 +-
 src/channelapprover.cpp                            |    8 +-
 src/handlewithcaller.cpp                           |    6 +-
 src/ktp_approver.desktop                           |   23 +++-
 src/ktpapprovermodule.cpp                          |    8 +-
 src/streamtubechannelapprover.cpp                  |  122 ---------------
 src/tubechannelapprover.cpp                        |  158 ++++++++++++++++++++
 ...tubechannelapprover.h => tubechannelapprover.h} |   37 +++--
 version.h.in                                       |    1 +
 58 files changed, 2126 insertions(+), 1670 deletions(-)

-- 
ktp-approver packaging