diff -Nru kdepimlibs-15.12.1/akonadi/autotests/CMakeLists.txt kdepimlibs-15.12.3/akonadi/autotests/CMakeLists.txt --- kdepimlibs-15.12.1/akonadi/autotests/CMakeLists.txt 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi/autotests/CMakeLists.txt 2016-02-27 10:45:05.000000000 +0000 @@ -28,8 +28,6 @@ # add testrunner (application for managing a self-contained test # environment) -add_subdirectory(testrunner) -add_subdirectory(testresource) add_subdirectory(testsearchplugin) # convenience macro to add akonadi qtestlib unit-tests diff -Nru kdepimlibs-15.12.1/akonadi/autotests/testresource/knutresource.desktop kdepimlibs-15.12.3/akonadi/autotests/testresource/knutresource.desktop --- kdepimlibs-15.12.1/akonadi/autotests/testresource/knutresource.desktop 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi/autotests/testresource/knutresource.desktop 2016-02-27 10:45:05.000000000 +0000 @@ -53,7 +53,7 @@ Comment[en_GB]=An agent for debugging purpose Comment[es]=Un agente para el propósito de depuración Comment[et]=Silumiseks mõeldud agent -Comment[fi]=Vianjäljitykseen tarkoitettu agentti +Comment[fi]=Virheenpaikannukseen tarkoitettu agentti Comment[fr]=Un agent à des fins de débogage Comment[gl]=Un axente de depuración Comment[hu]=Egy ügynök hibakeresési céllal diff -Nru kdepimlibs-15.12.1/akonadi/CMakeLists.txt kdepimlibs-15.12.3/akonadi/CMakeLists.txt --- kdepimlibs-15.12.1/akonadi/CMakeLists.txt 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi/CMakeLists.txt 2016-02-27 10:45:05.000000000 +0000 @@ -19,7 +19,7 @@ # FIXME: Do we want the same versions in kdepimlibs and kf5? set(KF5_VERSION "5.16.0") -set(KDEPIMLIBS_VERSION "5.1") +set(KDEPIMLIBS_VERSION "5.1.3") set(QT_REQUIRED_VERSION "5.4.0") # Remove it when we split it @@ -93,6 +93,9 @@ configure_file(akonadiprivate_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonadiprivate_export.h") add_subdirectory(src) +add_subdirectory(autotests/testrunner) +add_subdirectory(autotests/testresource) + if(BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) diff -Nru kdepimlibs-15.12.1/akonadi/src/core/jobs/specialcollectionshelperjobs.cpp kdepimlibs-15.12.3/akonadi/src/core/jobs/specialcollectionshelperjobs.cpp --- kdepimlibs-15.12.1/akonadi/src/core/jobs/specialcollectionshelperjobs.cpp 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi/src/core/jobs/specialcollectionshelperjobs.cpp 2016-02-27 10:45:05.000000000 +0000 @@ -44,7 +44,7 @@ #include #include -#define LOCK_WAIT_TIMEOUT_SECONDS 10 +#define LOCK_WAIT_TIMEOUT_SECONDS 30 using namespace Akonadi; diff -Nru kdepimlibs-15.12.1/akonadi-contact/CMakeLists.txt kdepimlibs-15.12.3/akonadi-contact/CMakeLists.txt --- kdepimlibs-15.12.1/akonadi-contact/CMakeLists.txt 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi-contact/CMakeLists.txt 2016-02-27 10:45:05.000000000 +0000 @@ -19,7 +19,7 @@ include(ECMQtDeclareLoggingCategory) set(KF5_VERSION "5.16.0") -set(KDEPIMLIBS_VERSION "5.1") +set(KDEPIMLIBS_VERSION "5.1.3") set(KCONTACTS_VERSION "4.91.0") set(CALENDARCORE_VERSION "4.79.0") set(KMIMELIB_VERSION "4.79.0") diff -Nru kdepimlibs-15.12.1/akonadi-contact/src/actions/contactactionssettings.kcfg.cmake kdepimlibs-15.12.3/akonadi-contact/src/actions/contactactionssettings.kcfg.cmake --- kdepimlibs-15.12.1/akonadi-contact/src/actions/contactactionssettings.kcfg.cmake 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi-contact/src/actions/contactactionssettings.kcfg.cmake 2016-02-27 10:45:05.000000000 +0000 @@ -18,7 +18,7 @@ UseBrowser - http://open.mapquestapi.com/nominatim/v1/search.php?q=%s,+%l,+%c + This URL defines the website that shall be used to show a contact's postal address. The following placeholders can be used in the URL: %s: Street diff -Nru kdepimlibs-15.12.1/akonadi-contact/src/editor/im/imitemdialog.cpp kdepimlibs-15.12.3/akonadi-contact/src/editor/im/imitemdialog.cpp --- kdepimlibs-15.12.1/akonadi-contact/src/editor/im/imitemdialog.cpp 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi-contact/src/editor/im/imitemdialog.cpp 2016-02-27 10:45:05.000000000 +0000 @@ -51,7 +51,7 @@ const QStringList protocols = IMProtocols::self()->protocols(); foreach (const QString &protocol, protocols) { - mProtocolCombo->addItem(QIcon::fromTheme(IMProtocols::self()->icon(protocol + QLatin1String(".png"))), + mProtocolCombo->addItem(QIcon::fromTheme(IMProtocols::self()->icon(protocol)), IMProtocols::self()->name(protocol), protocol); } diff -Nru kdepimlibs-15.12.1/akonadi-contact/src/editor/im/protocols/facebookprotocol.desktop kdepimlibs-15.12.3/akonadi-contact/src/editor/im/protocols/facebookprotocol.desktop --- kdepimlibs-15.12.1/akonadi-contact/src/editor/im/protocols/facebookprotocol.desktop 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi-contact/src/editor/im/protocols/facebookprotocol.desktop 2016-02-27 10:45:05.000000000 +0000 @@ -13,6 +13,7 @@ Comment[de]=Facebook-Protokoll Comment[en_GB]=Facebook Protocol Comment[es]=Protocolo Facebook +Comment[et]=Facebooki protokoll Comment[fi]=Facebook-yhteyskäytäntö Comment[gl]=Protocolo de Facebook Comment[it]=Protocollo di Facebook @@ -42,6 +43,7 @@ Name[de]=Facebook Name[en_GB]=Facebook Name[es]=Facebook +Name[et]=Facebook Name[fi]=Facebook Name[gl]=Facebook Name[it]=Facebook diff -Nru kdepimlibs-15.12.1/akonadi-contact/src/editor/im/protocols/twitterprotocol.desktop kdepimlibs-15.12.3/akonadi-contact/src/editor/im/protocols/twitterprotocol.desktop --- kdepimlibs-15.12.1/akonadi-contact/src/editor/im/protocols/twitterprotocol.desktop 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi-contact/src/editor/im/protocols/twitterprotocol.desktop 2016-02-27 10:45:05.000000000 +0000 @@ -13,6 +13,7 @@ Comment[de]=Twitter-Protokoll Comment[en_GB]=Twitter Protocol Comment[es]=Protocolo Twitter +Comment[et]=Twitteri protokoll Comment[fi]=Twitter-yhteyskäytäntö Comment[gl]=Protocolo de Twitter Comment[it]=Protocollo di Twitter @@ -42,6 +43,7 @@ Name[de]=Twitter Name[en_GB]=Twitter Name[es]=Twitter +Name[et]=Twitter Name[fi]=Twitter Name[gl]=Twitter Name[it]=Twitter diff -Nru kdepimlibs-15.12.1/akonadi-mime/CMakeLists.txt kdepimlibs-15.12.3/akonadi-mime/CMakeLists.txt --- kdepimlibs-15.12.1/akonadi-mime/CMakeLists.txt 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi-mime/CMakeLists.txt 2016-02-27 10:45:05.000000000 +0000 @@ -18,7 +18,7 @@ include(ECMQtDeclareLoggingCategory) set(KF5_VERSION "5.16.0") -set(KDEPIMLIBS_VERSION "5.1") +set(KDEPIMLIBS_VERSION "5.1.3") set(KF5_MIME_VERSION "4.85.0") ecm_setup_version(${KDEPIMLIBS_VERSION} VARIABLE_PREFIX AKONADIMIME diff -Nru kdepimlibs-15.12.1/akonadi-notes/CMakeLists.txt kdepimlibs-15.12.3/akonadi-notes/CMakeLists.txt --- kdepimlibs-15.12.1/akonadi-notes/CMakeLists.txt 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi-notes/CMakeLists.txt 2016-02-27 10:45:05.000000000 +0000 @@ -18,7 +18,7 @@ include(ECMQtDeclareLoggingCategory) set(KF5_VERSION "5.16.0") -set(KDEPIMLIBS_VERSION "5.1") +set(KDEPIMLIBS_VERSION "5.1.3") set(QT_REQUIRED_VERSION "5.4.0") set(KMIMELIB_VERSION "4.83.0") diff -Nru kdepimlibs-15.12.1/akonadi-socialutils/CMakeLists.txt kdepimlibs-15.12.3/akonadi-socialutils/CMakeLists.txt --- kdepimlibs-15.12.1/akonadi-socialutils/CMakeLists.txt 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/akonadi-socialutils/CMakeLists.txt 2016-02-27 10:45:05.000000000 +0000 @@ -18,7 +18,7 @@ include(ECMQtDeclareLoggingCategory) set(KF5_VERSION "5.16.0") -set(KDEPIMLIBS_VERSION "5.1") +set(KDEPIMLIBS_VERSION "5.1.3") ecm_setup_version(${KDEPIMLIBS_VERSION} VARIABLE_PREFIX AKONADISOCIALUTILS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-socialutils_version.h" diff -Nru kdepimlibs-15.12.1/debian/changelog kdepimlibs-15.12.3/debian/changelog --- kdepimlibs-15.12.1/debian/changelog 2016-03-10 02:57:57.000000000 +0000 +++ kdepimlibs-15.12.3/debian/changelog 2016-04-14 22:17:24.000000000 +0000 @@ -1,3 +1,10 @@ +kdepimlibs (4:15.12.3-0ubuntu1) xenial; urgency=medium + + * New upstream bigfix release. + * New upstream bugfix release + + -- Scarlett Clark Thu, 14 Apr 2016 15:17:24 -0700 + kdepimlibs (4:15.12.1-2ubuntu3) xenial; urgency=medium * Add missing epoch kcontacts build dep. diff -Nru kdepimlibs-15.12.1/kioslave/CMakeLists.txt kdepimlibs-15.12.3/kioslave/CMakeLists.txt --- kdepimlibs-15.12.1/kioslave/CMakeLists.txt 2016-01-04 20:31:11.000000000 +0000 +++ kdepimlibs-15.12.3/kioslave/CMakeLists.txt 2016-02-27 10:45:05.000000000 +0000 @@ -21,7 +21,7 @@ # FIXME: Do we want the same versions in kdepimlibs and kf5? set(KF5_VERSION "5.16.0") -set(KDEPIMLIBS_VERSION "5.1") +set(KDEPIMLIBS_VERSION "5.1.3") set(MBOXLIB_VERSION "4.79.0") set(LDABLIB_VERSION "4.79.0") find_package(Sasl2)