Hello community, here is the log from the commit of package akonadi-server for openSUSE:Factory checked in at 2019-05-14 13:15:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-server (Old) and /work/SRC/openSUSE:Factory/.akonadi-server.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server" Tue May 14 13:15:28 2019 rev:57 rq:702148 version:19.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-server/akonadi-server.changes 2019-04-26 22:46:00.337595773 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-server.new.5148/akonadi-server.changes 2019-05-14 13:15:29.601119063 +0200 @@ -1,0 +2,11 @@ +Fri May 10 05:37:10 UTC 2019 - lbeltr...@kde.org + +- Update to 19.04.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-19.04.1.php +- Changes since 19.04.0: + * Don't use qAsConst over a temporary variable + * Improve error message "multiple merge candidates" to indicate the collection name + +------------------------------------------------------------------- Old: ---- akonadi-19.04.0.tar.xz New: ---- akonadi-19.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-server.spec ++++++ --- /var/tmp/diff_new_pack.zufYyR/_old 2019-05-14 13:15:31.225123199 +0200 +++ /var/tmp/diff_new_pack.zufYyR/_new 2019-05-14 13:15:31.253123269 +0200 @@ -22,7 +22,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: akonadi-server -Version: 19.04.0 +Version: 19.04.1 Release: 0 Summary: PIM Storage Service License: LGPL-2.1-or-later ++++++ akonadi-19.04.0.tar.xz -> akonadi-19.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-19.04.0/CMakeLists.txt new/akonadi-19.04.1/CMakeLists.txt --- old/akonadi-19.04.0/CMakeLists.txt 2019-04-12 02:13:42.000000000 +0200 +++ new/akonadi-19.04.1/CMakeLists.txt 2019-05-07 02:29:51.000000000 +0200 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.11.0") +set(PIM_VERSION "5.11.1") project(Akonadi VERSION ${PIM_VERSION}) if (MSVC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-19.04.0/po/ko/libakonadi5.po new/akonadi-19.04.1/po/ko/libakonadi5.po --- old/akonadi-19.04.0/po/ko/libakonadi5.po 2019-04-12 02:13:42.000000000 +0200 +++ new/akonadi-19.04.1/po/ko/libakonadi5.po 2019-05-07 02:29:49.000000000 +0200 @@ -1,21 +1,21 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Shinjo Park <k...@peremen.name>, 2014, 2015, 2016, 2017, 2018. +# Shinjo Park <k...@peremen.name>, 2014, 2015, 2016, 2017, 2018, 2019. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-02-24 03:18+0100\n" -"PO-Revision-Date: 2018-08-15 12:29+0100\n" +"PO-Revision-Date: 2019-04-22 01:03+0200\n" "Last-Translator: Shinjo Park <k...@peremen.name>\n" -"Language-Team: Korean <kde-i18n-...@kde.org>\n" +"Language-Team: Korean <k...@peremen.name>\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -36,7 +36,7 @@ #, kde-format msgctxt "Name and type of Akonadi resource" msgid "%1 of type %2" -msgstr "%2 형식 %1" +msgstr "%1(%2 형식)" #: agentbase/agentbase.cpp:926 #, kde-format @@ -129,7 +129,7 @@ #, kde-format msgctxt "@info:status" msgid "Syncing folder '%1'" -msgstr "폴더 '%1' 동기화 중" +msgstr "'%1' 폴더 동기화 중" #: agentbase/resourcebase.cpp:992 agentbase/resourcebase.cpp:999 #, kde-format @@ -620,33 +620,32 @@ #, kde-format msgctxt "%1 = agent name" msgid "%1 Configuration" -msgstr "" +msgstr "%1 설정" #: widgets/agentconfigurationdialog.cpp:100 #, kde-format msgid "%1 Handbook" -msgstr "" +msgstr "%1 도움말" #: widgets/agentconfigurationdialog.cpp:101 #, kde-format msgid "About %1" -msgstr "" +msgstr "%1 정보" #: widgets/agentconfigurationwidget.cpp:118 #, kde-format msgid "The configuration dialog has been opened in another window" -msgstr "" +msgstr "다른 창에서 설정 대화 상자를 열었음" #: widgets/agentconfigurationwidget.cpp:125 #, kde-format msgid "Configuration for %1 is already opened elsewhere." -msgstr "" +msgstr "다른 곳에서 %1 설정을 열었습니다." #: widgets/agentconfigurationwidget.cpp:127 -#, fuzzy, kde-format -#| msgid "Failed to create relation." +#, kde-format msgid "Failed to register %1 configuration dialog." -msgstr "관계를 만들 수 없습니다." +msgstr "%1 설정 대화 상자를 등록할 수 없습니다." #: widgets/cachepolicypage.cpp:54 widgets/cachepolicypage.cpp:59 #, kde-format @@ -2346,8 +2345,7 @@ msgstr "태그 관리" #: widgets/tagwidget.cpp:55 -#, fuzzy, kde-format -#| msgid "Click to Add Tags" +#, kde-format msgid "Click to add tags" msgstr "태그를 추가하려면 누르십시오" @@ -2409,7 +2407,7 @@ #: xml/xmldocument.cpp:167 #, kde-format msgid "Unable to create schema parser context." -msgstr "스키마 파서 컨텍스트를 만들 수 없습니다." +msgstr "스키마 파서 콘텍스트를 만들 수 없습니다." #: xml/xmldocument.cpp:172 #, kde-format @@ -2419,7 +2417,7 @@ #: xml/xmldocument.cpp:177 #, kde-format msgid "Unable to create schema validation context." -msgstr "스키마 검증 컨텍스트를 만들 수 없습니다." +msgstr "스키마 검증 콘텍스트를 만들 수 없습니다." #: xml/xmldocument.cpp:182 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-19.04.0/po/nb/libakonadi5.po new/akonadi-19.04.1/po/nb/libakonadi5.po --- old/akonadi-19.04.0/po/nb/libakonadi5.po 2019-04-12 02:13:42.000000000 +0200 +++ new/akonadi-19.04.1/po/nb/libakonadi5.po 2019-05-07 02:29:50.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libakonadi\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2019-01-09 03:23+0100\n" +"POT-Creation-Date: 2019-02-24 03:18+0100\n" "PO-Revision-Date: 2014-09-23 21:56+0200\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" @@ -159,7 +159,7 @@ msgid "No such collection." msgstr "Ingen slik samling." -#: core/collectionsync.cpp:500 core/collectionsync.cpp:638 +#: core/collectionsync.cpp:528 core/collectionsync.cpp:666 #, kde-format msgid "Found unresolved orphan collections" msgstr "Fant foreldreløse samlinger uten løsning" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-19.04.0/po/sr/libakonadi5.po new/akonadi-19.04.1/po/sr/libakonadi5.po --- old/akonadi-19.04.0/po/sr/libakonadi5.po 2019-04-12 02:13:42.000000000 +0200 +++ new/akonadi-19.04.1/po/sr/libakonadi5.po 2019-05-07 02:29:50.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libakonadi5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-12-18 03:16+0100\n" +"POT-Creation-Date: 2019-02-24 03:18+0100\n" "PO-Revision-Date: 2017-12-17 18:01+0100\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -133,17 +133,17 @@ msgid "Syncing folder '%1'" msgstr "Синхронизујем фасциклу „%1“" -#: agentbase/resourcebase.cpp:991 agentbase/resourcebase.cpp:998 +#: agentbase/resourcebase.cpp:992 agentbase/resourcebase.cpp:999 #, kde-format msgid "Failed to retrieve collection for sync." msgstr "Не могу да добавим збирку за синхронизовање." -#: agentbase/resourcebase.cpp:1038 +#: agentbase/resourcebase.cpp:1039 #, kde-format msgid "Failed to retrieve collection for attribute sync." msgstr "Не могу да добавим збирку за синхронизовање атрибута." -#: agentbase/resourcebase.cpp:1088 +#: agentbase/resourcebase.cpp:1089 #, kde-format msgid "The requested item no longer exists" msgstr "Захтевана ставка више не постоји." @@ -159,7 +159,7 @@ msgid "No such collection." msgstr "Нема такве збирке." -#: core/collectionsync.cpp:500 core/collectionsync.cpp:638 +#: core/collectionsync.cpp:528 core/collectionsync.cpp:666 #, kde-format msgid "Found unresolved orphan collections" msgstr "Нађене су неразрешене збирке сирочићи." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-19.04.0/po/zh_CN/akonadi_knut_resource.po new/akonadi-19.04.1/po/zh_CN/akonadi_knut_resource.po --- old/akonadi-19.04.0/po/zh_CN/akonadi_knut_resource.po 2019-04-12 02:13:42.000000000 +0200 +++ new/akonadi-19.04.1/po/zh_CN/akonadi_knut_resource.po 2019-05-07 02:29:51.000000000 +0200 @@ -8,8 +8,8 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-10-08 03:51+0200\n" -"PO-Revision-Date: 2019-04-09 18:52\n" -"Last-Translator: guoyunhe <i...@guoyunhe.me>\n" +"PO-Revision-Date: 2019-05-05 22:30\n" +"Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-19.04.0/po/zh_CN/libakonadi5.po new/akonadi-19.04.1/po/zh_CN/libakonadi5.po --- old/akonadi-19.04.0/po/zh_CN/libakonadi5.po 2019-04-12 02:13:42.000000000 +0200 +++ new/akonadi-19.04.1/po/zh_CN/libakonadi5.po 2019-05-07 02:29:51.000000000 +0200 @@ -8,8 +8,8 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-02-24 03:18+0100\n" -"PO-Revision-Date: 2019-04-09 18:52\n" -"Last-Translator: guoyunhe <i...@guoyunhe.me>\n" +"PO-Revision-Date: 2019-05-05 22:30\n" +"Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-19.04.0/src/server/handler/itemcreatehandler.cpp new/akonadi-19.04.1/src/server/handler/itemcreatehandler.cpp --- old/akonadi-19.04.0/src/server/handler/itemcreatehandler.cpp 2019-04-07 15:04:53.000000000 +0200 +++ new/akonadi-19.04.1/src/server/handler/itemcreatehandler.cpp 2019-04-19 06:59:33.000000000 +0200 @@ -442,7 +442,7 @@ } // Nor GID or RID are guaranteed to be unique, so make sure we don't merge // something we don't want - return failureResponse(QStringLiteral("Multiple merge candidates, aborting")); + return failureResponse(QStringLiteral("Multiple merge candidates in collection '%1', aborting").arg(item.collection().name())); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-19.04.0/src/server/storage/dbupdater.cpp new/akonadi-19.04.1/src/server/storage/dbupdater.cpp --- old/akonadi-19.04.0/src/server/storage/dbupdater.cpp 2019-04-07 15:04:53.000000000 +0200 +++ new/akonadi-19.04.1/src/server/storage/dbupdater.cpp 2019-04-19 06:59:33.000000000 +0200 @@ -100,7 +100,8 @@ success = m_database.transaction(); if (success) { hasTransaction = true; - for (const QString &statement : qAsConst(it.value().statements)) { + const QStringList statements = it.value().statements; + for (const QString &statement : statements) { QSqlQuery query(m_database); success = query.exec(statement); if (!success) {
