[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.10.5-1-12-gb0cfe01

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git;a=commitdiff;h=b0cfe01

The following commit has been merged in the master branch:
commit b0cfe01df061d909304d2bad251bc1a7d02dab49
Merge: 5b78dc787d9b1a4ec8a6723888a3b515f2b9c201 377ca89d96e0dca96595ccf8038a6983a1964d41
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Jul 13 17:09:00 2013 +0200

    Merge branch 'kde4.10'
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/kdepimlibs5-dev.install
    	debian/libakonadi-kde4.symbols
    	debian/libgpgme++2.symbols
    	debian/libkholidays4.symbols
    	debian/libkontactinterface4.symbols
    	debian/patches/series

 debian/changelog                                   |   69 +++++++--
 debian/control                                     |   20 ++-
 debian/kdepimlibs-kio-plugins.install              |    2 +-
 debian/kdepimlibs-kio-plugins.lintian-overrides    |    2 +
 debian/kdepimlibs5-dev.install                     |   41 ++++-
 debian/libakonadi-calendar4.install                |    2 +-
 debian/libakonadi-calendar4.symbols                |    6 +-
 debian/libakonadi-contact4.install                 |    3 +-
 debian/libakonadi-contact4.symbols                 |   15 +-
 debian/libakonadi-kabc4.install                    |    2 +-
 debian/libakonadi-kabc4.symbols                    |    2 +-
 debian/libakonadi-kcal4.install                    |    2 +-
 debian/libakonadi-kcal4.symbols                    |    2 +-
 debian/libakonadi-kde4.install                     |    2 +-
 debian/libakonadi-kde4.lintian-overrides           |    1 +
 debian/libakonadi-kde4.symbols                     |   37 ++++-
 debian/libakonadi-kmime4.install                   |    2 +-
 debian/libakonadi-kmime4.symbols                   |   28 +++-
 debian/libakonadi-notes4.install                   |    2 +-
 debian/libakonadi-notes4.symbols                   |   30 +++-
 debian/libakonadi-socialutils4.install             |    5 +
 debian/libakonadi-socialutils4.symbols             |   80 ++++++++++
 debian/libgpgme++2.symbols                         |  126 +++++++--------
 debian/libkabc4.install                            |    4 +-
 debian/libkabc4.symbols                            |    9 +-
 debian/libkalarmcal2.symbols                       |    9 +-
 debian/libkblog4.install                           |    2 +-
 debian/libkcal4.install                            |    2 +-
 debian/libkcalcore4.install                        |    2 +-
 debian/libkcalcore4.symbols                        |    7 +-
 debian/libkcalutils4.install                       |    2 +-
 debian/libkholidays4.install                       |    2 +-
 debian/libkholidays4.lintian-overrides             |    1 +
 debian/libkholidays4.symbols                       |    7 +-
 debian/libkimap4.install                           |    2 +-
 debian/libkimap4.lintian-overrides                 |    1 +
 debian/libkimap4.symbols                           |    4 +-
 debian/libkldap4.install                           |    2 +-
 debian/libkmbox4.install                           |    2 +-
 debian/libkmbox4.lintian-overrides                 |    1 +
 debian/libkmime4.install                           |    2 +-
 debian/libkmime4.lintian-overrides                 |    1 +
 debian/libkmime4.symbols                           |    4 +
 debian/libkontactinterface4.install                |    2 +-
 debian/libkontactinterface4.symbols                |    2 +-
 debian/libkpimidentities4.install                  |    2 +-
 debian/libkpimidentities4.symbols                  |   13 +-
 debian/libkpimtextedit4.install                    |    2 +-
 debian/libkpimtextedit4.symbols                    |  161 +++++++++++++++++++-
 debian/libkpimutils4.install                       |    2 +-
 debian/libkresources4.install                      |    2 +-
 debian/libktnef4.install                           |    2 +-
 debian/libktnef4.lintian-overrides                 |    1 +
 debian/libkxmlrpcclient4.install                   |    2 +-
 debian/libmailtransport4.install                   |    2 +-
 debian/libmailtransport4.symbols                   |    4 +-
 debian/libmicroblog4.install                       |    2 +-
 debian/libqgpgme1.lintian-overrides                |    1 +
 debian/libsyndication4.install                     |    2 +-
 debian/patches/03_hide_akonadi_progressbar.diff    |   18 ---
 debian/patches/crash_when_marking_folder_read.diff |   36 -----
 debian/patches/series                              |    4 -
 ...m_b92782580756b3858f0381a5200b79688ab0b0a2.diff |   29 ----
 ...m_e1861658fe4b4ec75998c5d08b26e6fbfbe0cdf9.diff |  150 ------------------
 debian/rules                                       |    3 +
 65 files changed, 604 insertions(+), 385 deletions(-)

-- 
KDE PIM Libraries module packaging