[SCM] libkpeople packaging branch, master, updated. debian/0.2.2-2-11-g144267b

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkpeople.git;a=commitdiff;h=2e66923

The following commit has been merged in the master branch:
commit 2e6692397d481930f2dc6fc3a50765abca00ca8a
Merge: d5999c379c0135eab71f5316c18569dcf6b0567b 5c9f98d751f2309a17dd4a3a953557a27580d7b8
Author: Diane Trout <diane at ghic.org>
Date:   Sat Sep 20 11:28:01 2014 -0700

    Merge tag 'upstream/0.3.0'
    
    Upstream version 0.3.0
    
    Conflicts:
    	CMakeLists.txt
    	po/CMakeLists.txt
    	po/da/libkpeople.po
    	po/fi/libkpeople.po
    	po/fr/libkpeople.po
    	po/pl/libkpeople.po
    	po/ro/libkpeople.po
    	po/sl/libkpeople.po
    	src/personsmodel.cpp
    	src/plugins/akonadi/akonadidatasource.cpp

 CMakeLists.txt                                     |  13 +-
 cmake/COPYING-CMAKE-SCRIPTS                        |  22 ++++
 po/CMakeLists.txt                                  |   2 +
 po/bs/libkpeople.po                                |  20 ++-
 po/cs/libkpeople.po                                |  36 ++++--
 po/da/libkpeople.po                                |  20 ++-
 po/de/libkpeople.po                                |  20 ++-
 po/el/CMakeLists.txt                               |   2 +
 po/{nl => el}/libkpeople.po                        |  56 +++++----
 po/fi/libkpeople.po                                |  26 +++-
 po/fr/libkpeople.po                                |  20 ++-
 po/hu/libkpeople.po                                |  20 ++-
 po/ja/CMakeLists.txt                               |   2 +
 po/{lt => ja}/libkpeople.po                        |  36 ++++--
 po/lt/libkpeople.po                                |  18 ++-
 po/nl/libkpeople.po                                |  20 ++-
 po/pl/libkpeople.po                                |  20 ++-
 po/pt/libkpeople.po                                |  33 +++--
 po/pt_BR/libkpeople.po                             |  23 +++-
 po/ro/libkpeople.po                                |  20 ++-
 po/ru/libkpeople.po                                |  20 ++-
 po/sk/libkpeople.po                                |  22 +++-
 po/sl/libkpeople.po                                |  23 +++-
 po/sv/libkpeople.po                                |  24 +++-
 po/uk/libkpeople.po                                |  29 ++++-
 src/CMakeLists.txt                                 |   2 +-
 src/allcontactsmonitor.cpp                         |  14 ++-
 src/allcontactsmonitor.h                           |  11 +-
 src/contactmonitor.cpp                             |  37 +++---
 src/contactmonitor.h                               |  38 +++---
 src/defaultcontactmonitor.cpp                      |  37 +++---
 src/defaultcontactmonitor_p.h                      |  35 +++---
 src/global.cpp                                     |  35 +++---
 src/global.h                                       |  35 +++---
 src/metacontact.cpp                                |  37 +++---
 src/metacontact_p.h                                |  36 +++---
 src/personmanager.cpp                              |  38 +++---
 src/personmanager_p.h                              |  38 +++---
 src/personsmodel.cpp                               |  33 +++--
 src/personsmodel.h                                 |   6 +-
 src/plugins/akonadi/akonadidatasource.cpp          |  88 ++++++++------
 src/plugins/akonadi/akonadidatasource.h            |  36 +++---
 src/widgets/CMakeLists.txt                         |  18 ++-
 src/widgets/personemailview.cpp                    |  77 ++++++++++++
 .../{persondetailsview.h => personemailview.h}     |  25 ++--
 src/widgets/plugins/emaillistmodel.cpp             |  72 +++++++++++
 .../emaillistmodel.h}                              |  56 ++++-----
 src/widgets/plugins/emaillistviewdelegate.cpp      |  69 +++++++++++
 ...honedetailswidget.h => emaillistviewdelegate.h} |  23 ++--
 src/widgets/plugins/emails.cpp                     | 134 +++++++++++++++++++++
 .../emails.h}                                      |  48 ++++----
 51 files changed, 1176 insertions(+), 449 deletions(-)

-- 
libkpeople packaging