diff -Nru akonadi-calendar-21.04.0/CMakeLists.txt akonadi-calendar-21.04.1/CMakeLists.txt --- akonadi-calendar-21.04.0/CMakeLists.txt 2021-04-11 11:08:02.000000000 +0000 +++ akonadi-calendar-21.04.1/CMakeLists.txt 2021-04-26 01:01:16.000000000 +0000 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) -set(PIM_VERSION "5.17.0") +set(PIM_VERSION "5.17.1") project(Akonadi-Calendar VERSION ${PIM_VERSION}) # ECM setup @@ -25,12 +25,12 @@ set(AKONADICALENDAR_LIB_VERSION ${PIM_VERSION}) -set(AKONADICONTACT_LIB_VERSION "5.17.0") -set(AKONADI_LIB_VERSION "5.17.0") -set(MAILTRANSPORT_LIB_VERSION "5.17.0") -set(CALENDARUTILS_LIB_VERSION "5.17.0") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.17.0") -set(GRANTLEETHEME_LIB_VERSION "5.17.0") +set(AKONADICONTACT_LIB_VERSION "5.17.1") +set(AKONADI_LIB_VERSION "5.17.1") +set(MAILTRANSPORT_LIB_VERSION "5.17.1") +set(CALENDARUTILS_LIB_VERSION "5.17.1") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.17.1") +set(GRANTLEETHEME_LIB_VERSION "5.17.1") ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADICALENDAR VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-calendar_version.h" diff -Nru akonadi-calendar-21.04.0/debian/changelog akonadi-calendar-21.04.1/debian/changelog --- akonadi-calendar-21.04.0/debian/changelog 2021-04-29 00:27:37.000000000 +0000 +++ akonadi-calendar-21.04.1/debian/changelog 2021-05-13 08:00:05.000000000 +0000 @@ -1,3 +1,9 @@ +akonadi-calendar (4:21.04.1-0ubuntu1) impish; urgency=medium + + * New upstream release (21.04.1) + + -- Rik Mills Thu, 13 May 2021 09:00:05 +0100 + akonadi-calendar (4:21.04.0-0ubuntu1) impish; urgency=medium [ Rik Mills ] diff -Nru akonadi-calendar-21.04.0/debian/control akonadi-calendar-21.04.1/debian/control --- akonadi-calendar-21.04.0/debian/control 2021-04-29 00:27:37.000000000 +0000 +++ akonadi-calendar-21.04.1/debian/control 2021-05-13 08:00:05.000000000 +0000 @@ -6,18 +6,18 @@ Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), extra-cmake-modules (>= 5.31.0~), - libkf5akonadi-dev (>= 4:21.04.0~), - libkf5akonadicontact-dev (>= 4:21.04.0~), + libkf5akonadi-dev (>= 4:21.04.1~), + libkf5akonadicontact-dev (>= 4:21.04.1~), libkf5calendarcore-dev (>= 4:19.08.3~), - libkf5calendarutils-dev (>= 4:21.04.0~), + libkf5calendarutils-dev (>= 4:21.04.1~), libkf5codecs-dev (>= 5.31.0~), - libkf5contacteditor-dev (>= 4:21.04.0~), + libkf5contacteditor-dev (>= 4:21.04.1~), libkf5contacts-dev (>= 4:19.08.3~), - libkf5grantleetheme-dev (>= 21.04.0~), - libkf5identitymanagement-dev (>= 21.04.0~), + libkf5grantleetheme-dev (>= 21.04.1~), + libkf5identitymanagement-dev (>= 21.04.1~), libkf5kdelibs4support-dev (>= 5.31.0~), libkf5kio-dev (>= 5.31.0~), - libkf5mailtransport-dev (>= 21.04.0~), + libkf5mailtransport-dev (>= 21.04.1~), libkf5wallet-dev (>= 5.31.0~), pkg-kde-tools (>> 0.15.15), qtbase5-dev (>= 5.6.1~), @@ -39,9 +39,9 @@ Package: libkf5akonadicalendar-dev Section: libdevel Architecture: any -Depends: libkf5akonadi-dev (>= 4:21.04.0~), +Depends: libkf5akonadi-dev (>= 4:21.04.1~), libkf5akonadicalendar5abi2 (= ${binary:Version}), - libkf5akonadicontact-dev (>= 4:21.04.0~), + libkf5akonadicontact-dev (>= 4:21.04.1~), libkf5calendarcore-dev (>= 4:19.08.3~), ${misc:Depends}, Description: akonadi-calendar - development files diff -Nru akonadi-calendar-21.04.0/po/zh_CN/libakonadi-calendar5.po akonadi-calendar-21.04.1/po/zh_CN/libakonadi-calendar5.po --- akonadi-calendar-21.04.0/po/zh_CN/libakonadi-calendar5.po 2021-04-16 08:45:40.000000000 +0000 +++ akonadi-calendar-21.04.1/po/zh_CN/libakonadi-calendar5.po 2021-05-11 07:28:01.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-02-02 02:45+0100\n" -"PO-Revision-Date: 2021-03-27 17:31\n" +"PO-Revision-Date: 2021-04-24 15:44\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru akonadi-calendar-21.04.0/po/zh_CN/libakonadi-calendar5-serializer.po akonadi-calendar-21.04.1/po/zh_CN/libakonadi-calendar5-serializer.po --- akonadi-calendar-21.04.0/po/zh_CN/libakonadi-calendar5-serializer.po 2021-04-16 08:45:40.000000000 +0000 +++ akonadi-calendar-21.04.1/po/zh_CN/libakonadi-calendar5-serializer.po 2021-05-11 07:28:01.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2021-01-27 03:05+0100\n" -"PO-Revision-Date: 2021-03-27 17:31\n" +"PO-Revision-Date: 2021-04-24 15:44\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru akonadi-calendar-21.04.0/src/incidencechanger.h akonadi-calendar-21.04.1/src/incidencechanger.h --- akonadi-calendar-21.04.0/src/incidencechanger.h 2021-04-11 11:08:02.000000000 +0000 +++ akonadi-calendar-21.04.1/src/incidencechanger.h 2021-04-26 01:01:16.000000000 +0000 @@ -158,8 +158,7 @@ * Returns -1 if @p incidence is invalid. The createFinished() signal * won't be emitted in this case. */ - Q_REQUIRED_RESULT int - createIncidence(const KCalendarCore::Incidence::Ptr &incidence, const Akonadi::Collection &collection = Akonadi::Collection(), QWidget *parent = nullptr); + int createIncidence(const KCalendarCore::Incidence::Ptr &incidence, const Akonadi::Collection &collection = Akonadi::Collection(), QWidget *parent = nullptr); /** * Creates a new incidence. @@ -176,8 +175,7 @@ * Returns -1 if @p item is invalid. The createFinished() signal * won't be emitted in this case. */ - Q_REQUIRED_RESULT int - createFromItem(const Akonadi::Item &item, const Akonadi::Collection &collection = Akonadi::Collection(), QWidget *parent = nullptr); + int createFromItem(const Akonadi::Item &item, const Akonadi::Collection &collection = Akonadi::Collection(), QWidget *parent = nullptr); /** * Deletes an incidence. If it's recurring, all occurrences are deleted. @@ -191,7 +189,7 @@ * Returns -1 if item is invalid. The deleteFinished() signal won't be emitted in this * case. */ - Q_REQUIRED_RESULT int deleteIncidence(const Akonadi::Item &item, QWidget *parent = nullptr); + int deleteIncidence(const Akonadi::Item &item, QWidget *parent = nullptr); /** * Deletes a list of Items. @@ -204,7 +202,7 @@ * Returns -1 if any item is invalid or if @p items is empty. The deleteFinished() signal * won't be emitted in this case. */ - Q_REQUIRED_RESULT int deleteIncidences(const Akonadi::Item::List &items, QWidget *parent = nullptr); + int deleteIncidences(const Akonadi::Item::List &items, QWidget *parent = nullptr); /** * Modifies an incidence. @@ -221,7 +219,7 @@ * Returns -1 if the item doesn't have a valid payload. The modifyFinished() signal * won't be emitted in this case. */ - Q_REQUIRED_RESULT int modifyIncidence(const Akonadi::Item &item, + int modifyIncidence(const Akonadi::Item &item, const KCalendarCore::Incidence::Ptr &originalPayload = KCalendarCore::Incidence::Ptr(), QWidget *parent = nullptr);