diff -pruN 4:20.08.3-1/autotests/notestest.cpp 4:21.04.0-0ubuntu1/autotests/notestest.cpp --- 4:20.08.3-1/autotests/notestest.cpp 2020-10-10 19:56:55.000000000 +0000 +++ 4:21.04.0-0ubuntu1/autotests/notestest.cpp 2021-04-11 11:08:47.000000000 +0000 @@ -6,9 +6,9 @@ #include "noteutils.h" -#include -#include #include +#include +#include #include #include @@ -31,13 +31,14 @@ private Q_SLOTS: note.setLastModifiedDate(QDateTime(QDate(2012, 3, 3), QTime(4, 4, 4), Qt::UTC)); Attachment a("testfile2", QStringLiteral("mimetype/mime3")); a.setLabel(QStringLiteral("label")); - note.attachments() << Attachment(QUrl(QStringLiteral("file://url/to/file")), QStringLiteral("mimetype/mime")) << Attachment("testfile", QStringLiteral("mimetype/mime2")) << a; + note.attachments() << Attachment(QUrl(QStringLiteral("file://url/to/file")), QStringLiteral("mimetype/mime")) + << Attachment("testfile", QStringLiteral("mimetype/mime2")) << a; note.custom().insert(QStringLiteral("key1"), QStringLiteral("value1")); note.custom().insert(QStringLiteral("key2"), QStringLiteral("value2")); note.custom().insert(QStringLiteral("key3"), QStringLiteral("value3")); KMime::MessagePtr msg = note.message(); -// qWarning() << msg->encodedContent(); + // qWarning() << msg->encodedContent(); NoteMessageWrapper result(msg); @@ -52,7 +53,7 @@ private Q_SLOTS: QCOMPARE(result.custom(), note.custom()); QCOMPARE(result.attachments(), note.attachments()); -// qWarning() << result.message()->encodedContent(); + // qWarning() << result.message()->encodedContent(); } void createIfEmpty() @@ -66,7 +67,8 @@ private Q_SLOTS: void testNormalTextWithoutAttachments() { NoteMessageWrapper note; - QString text(QStringLiteral(" \ + QString text( + QStringLiteral(" \ \ \

sdfg

\ @@ -83,7 +85,8 @@ private Q_SLOTS: void testRichTextWithoutAttachments() { NoteMessageWrapper note; - QString text(QStringLiteral(" \ + QString text( + QStringLiteral(" \ \ \

sdfg

\ @@ -100,7 +103,8 @@ private Q_SLOTS: void testRichTextWithAttachments() { NoteMessageWrapper note; - QString text(QStringLiteral(" \ + QString text( + QStringLiteral(" \ \ \

sdfg

\ @@ -118,7 +122,6 @@ private Q_SLOTS: QCOMPARE(result.textFormat(), Qt::RichText); QCOMPARE(result.attachments(), note.attachments()); } - }; QTEST_MAIN(NotesTest) diff -pruN 4:20.08.3-1/.clang-format 4:21.04.0-0ubuntu1/.clang-format --- 4:20.08.3-1/.clang-format 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/.clang-format 2021-04-11 11:08:47.000000000 +0000 @@ -0,0 +1,76 @@ +--- +# SPDX-FileCopyrightText: 2019 Christoph Cullmann +# SPDX-FileCopyrightText: 2019 Gernot Gebhard +# +# SPDX-License-Identifier: MIT + +# Style for C++ +Language: Cpp + +# base is WebKit coding style: https://webkit.org/code-style-guidelines/ +# below are only things set that diverge from this style! +BasedOnStyle: WebKit + +# enforce C++11 (e.g. for std::vector> +Standard: Cpp11 + +# 4 spaces indent +TabWidth: 4 + +# 2 * 80 wide lines +ColumnLimit: 160 + +# sort includes inside line separated groups +SortIncludes: true + +# break before braces on function, namespace and class definitions. +BreakBeforeBraces: Linux + +# CrlInstruction *a; +PointerAlignment: Right + +# horizontally aligns arguments after an open bracket. +AlignAfterOpenBracket: Align + +# don't move all parameters to new line +AllowAllParametersOfDeclarationOnNextLine: false + +# no single line functions +AllowShortFunctionsOnASingleLine: None + +# always break before you encounter multi line strings +AlwaysBreakBeforeMultilineStrings: true + +# don't move arguments to own lines if they are not all on the same +BinPackArguments: false + +# don't move parameters to own lines if they are not all on the same +BinPackParameters: false + +# In case we have an if statement whith multiple lines the operator should be at the beginning of the line +# but we do not want to break assignments +BreakBeforeBinaryOperators: NonAssignment + +# format C++11 braced lists like function calls +Cpp11BracedListStyle: true + +# do not put a space before C++11 braced lists +SpaceBeforeCpp11BracedList: false + +# remove empty lines +KeepEmptyLinesAtTheStartOfBlocks: false + +# no namespace indentation to keep indent level low +NamespaceIndentation: None + +# we use template< without space. +SpaceAfterTemplateKeyword: false + +# macros for which the opening brace stays attached. +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] + +# keep lambda formatting multi-line if not empty +AllowShortLambdasOnASingleLine: Empty + +# We do not want clang-format to put all arguments on a new line +AllowAllArgumentsOnNextLine: false diff -pruN 4:20.08.3-1/CMakeLists.txt 4:21.04.0-0ubuntu1/CMakeLists.txt --- 4:20.08.3-1/CMakeLists.txt 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/CMakeLists.txt 2021-04-11 11:08:47.000000000 +0000 @@ -1,10 +1,10 @@ -cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.15.3") +cmake_minimum_required(VERSION 3.5 FATAL_ERROR) +set(PIM_VERSION "5.17.0") project(Akonadi-Notes VERSION ${PIM_VERSION}) # ECM setup -set(KF5_MIN_VERSION "5.71.0") +set(KF5_MIN_VERSION "5.79.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -19,13 +19,14 @@ include(ECMGeneratePriFile) include(ECMSetupVersion) include(FeatureSummary) +include(KDEGitCommitHooks) include(ECMQtDeclareLoggingCategory) -set(QT_REQUIRED_VERSION "5.13.0") +set(QT_REQUIRED_VERSION "5.14.0") set(AKONADI_NOTES_VERSION ${PIM_VERSION}) -set(KMIMELIB_VERSION "5.15.3") -set(AKONADI_VERSION "5.15.3") +set(KMIMELIB_VERSION "5.17.0") +set(AKONADI_VERSION "5.17.0") ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADINOTES VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-notes_version.h" @@ -43,10 +44,10 @@ find_package(KF5Mime ${KMIMELIB_VERSION} add_definitions(-DTRANSLATION_DOMAIN=\"akonadinotes5\") add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054800) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) + -add_definitions(-DQT_NO_KEYWORDS) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_subdirectory(src) @@ -76,5 +77,6 @@ install(FILES DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) ki18n_install(po) +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -pruN 4:20.08.3-1/CMakePresets.json 4:21.04.0-0ubuntu1/CMakePresets.json --- 4:20.08.3-1/CMakePresets.json 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/CMakePresets.json 2021-04-11 11:08:47.000000000 +0000 @@ -0,0 +1,56 @@ +{ + "version": 1, + "configurePresets": [ + { + "name": "dev", + "displayName": "Build as debug", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + } + }, + { + "name": "asan", + "displayName": "Build with Asan support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-asan", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "ECM_ENABLE_SANITIZERS" : "'address;undefined'", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + } + }, + { + "name": "unity", + "displayName": "Build with CMake unity support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-unity", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_UNITY_CMAKE_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + } + }, + { + "name": "release", + "displayName": "Build as release mode.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-release", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + } + }, + { + "name": "profile", + "displayName": "profile", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-profile", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + } + } + ] +} diff -pruN 4:20.08.3-1/CMakePresets.json.license 4:21.04.0-0ubuntu1/CMakePresets.json.license --- 4:20.08.3-1/CMakePresets.json.license 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/CMakePresets.json.license 2021-04-11 11:08:47.000000000 +0000 @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2021 Laurent Montel +# SPDX-License-Identifier: BSD-3-Clause diff -pruN 4:20.08.3-1/debian/changelog 4:21.04.0-0ubuntu1/debian/changelog --- 4:20.08.3-1/debian/changelog 2020-12-16 00:39:49.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/changelog 2021-04-29 00:28:02.000000000 +0000 @@ -1,278 +1,142 @@ -akonadi-notes (4:20.08.3-1) unstable; urgency=medium +akonadi-notes (4:21.04.0-0ubuntu1) impish; urgency=medium - [ Sandro Knauß ] - * New upstream release (20.08.3). - * Update build-deps and deps with the info from cmake. - * Bump Standards-Version to 4.5.1 (No changes needed). - * Minimize the upstream GPG signing key. + * New upstream release (21.04.0) - -- Sandro Knauß Wed, 16 Dec 2020 01:39:49 +0100 + -- Rik Mills Thu, 29 Apr 2021 01:28:02 +0100 -akonadi-notes (4:20.08.2-2) unstable; urgency=medium +akonadi-notes (4:20.12.3-0ubuntu1) hirsute; urgency=medium - * Team upload to unstable. + * New upstream release (20.12.3) - -- Sandro Knauß Tue, 20 Oct 2020 00:08:06 +0200 + -- Rik Mills Thu, 04 Mar 2021 15:13:51 +0000 -akonadi-notes (4:20.08.2-1) experimental; urgency=medium +akonadi-notes (4:20.12.2-0ubuntu1) hirsute; urgency=medium - [ Sandro Knauß ] - * Switch from dhmk to the dh sequencer: - - invoke the dh sequencer using the kf5 addon - - call the right debhelper command instead of $(overridden_command) - * New upstream release (20.08.2). - * Update build-deps and deps with the info from cmake. - * Update Homepage link to point to new invent.kde.org - * Update field Source in debian/copyright to invent.kde.org move. - * Update repository related entries to metadata file. + * New upstream release (20.12.2) - -- Sandro Knauß Fri, 16 Oct 2020 00:52:31 +0200 + -- Rik Mills Thu, 04 Feb 2021 09:48:18 +0000 -akonadi-notes (4:20.04.1-1) unstable; urgency=medium +akonadi-notes (4:20.12.1-0ubuntu1) hirsute; urgency=medium - [ Sandro Knauß ] - * New upstream release (20.04.1). - * Update build-deps and deps with the info from cmake. - * Remove not needed Build-Depends. + * New upstream release (20.12.1) - -- Sandro Knauß Tue, 26 May 2020 23:59:56 +0200 + -- Rik Mills Wed, 20 Jan 2021 23:06:24 +0000 -akonadi-notes (4:20.04.0-1) experimental; urgency=medium +akonadi-notes (4:20.12.0-0ubuntu1) hirsute; urgency=medium - [ Sandro Knauß ] - * Update watch file to the new release-service location. - * Bump compat level to 13. - * Bump Standards-Version to 4.5.0 (No changes needed). - * Add Rules-Requires-Root field to control. - * New upstream release (19.12.3). - * Update build-deps and deps with the info from cmake. - * New upstream release (20.04.0). - * Enable hardening all. - * Set field Upstream-Contact in debian/copyright. - * Remove obsolete fields Contact, Name from debian/upstream/metadata - (already present in machine-readable debian/copyright). + * New upstream release (20.12.0) - -- Sandro Knauß Wed, 13 May 2020 12:22:12 +0200 + -- Rik Mills Fri, 11 Dec 2020 14:21:13 +0000 -akonadi-notes (4:19.08.3-1) unstable; urgency=medium +akonadi-notes (4:20.08.3-0ubuntu1) hirsute; urgency=medium - [ Sandro Knauß ] - * New upstream release (19.08.3). - * Update build-deps and deps with the info from cmake. + * New upstream release (20.08.3) - -- Sandro Knauß Sat, 30 Nov 2019 22:54:38 +0100 + -- Rik Mills Wed, 11 Nov 2020 09:46:02 +0000 -akonadi-notes (4:19.08.2-1) experimental; urgency=medium +akonadi-notes (4:20.08.1-0ubuntu1) groovy; urgency=medium - [ Sandro Knauß ] - * Bump Standards-Version to 4.4.1 (No changes needed). - * New upstream release (19.08.2). - * Update build-deps and deps with the info from cmake. - * Remove breaks against kde-l10n packages. - * Update libkf5akonadinotes-dev dependencies. + * New upstream release (20.08.1) - -- Sandro Knauß Fri, 08 Nov 2019 10:39:22 +0100 + -- Rik Mills Thu, 03 Sep 2020 13:47:30 +0100 -akonadi-notes (4:18.08.3-3) unstable; urgency=medium +akonadi-notes (4:20.08.0-0ubuntu1) groovy; urgency=medium - * Release to unstable. + * New upstream release (20.08.0) + * Update symbols. - -- Sandro Knauß Thu, 14 Nov 2019 23:49:32 +0100 + -- Rik Mills Wed, 26 Aug 2020 12:18:51 +0100 -akonadi-notes (4:18.08.3-2) experimental; urgency=medium +akonadi-notes (4:19.12.3-0ubuntu1) focal; urgency=medium - [ Sandro Knauß ] - * Bump Standards-Version to 4.4.0 (No changes needed). - * Bump compat level to 12. - * Add myself to Uploaders. - * Delete not needed Breaks/Confilcts. - * Use virtual packages to bundle KDEPIM. - * Enforce depdendencies between KDEPIM packages to enable bundling. + * New upstream release (19.12.3) - -- Sandro Knauß Sat, 05 Oct 2019 00:04:34 +0200 + -- Rik Mills Sat, 11 Apr 2020 13:56:24 +0100 -akonadi-notes (4:18.08.3-1) unstable; urgency=medium +akonadi-notes (4:19.04.3-0ubuntu2) focal; urgency=medium - * Team upload. + * No-change rebuild for libgcc-s1 package name change. - [ Sandro Knauß ] - * New upstream release (18.08.3). - * Update build-deps and deps with the info from cmake. - * Bump Standards-Version to 4.3.0 (No changes needed). - * Removed acc autopkgtest. - * Removed testsuite autopkgtest. + -- Matthias Klose Mon, 23 Mar 2020 19:15:19 +0100 - -- Sandro Knauß Mon, 04 Feb 2019 15:58:50 +0100 +akonadi-notes (4:19.04.3-0ubuntu1) eoan; urgency=medium -akonadi-notes (4:18.08.1-1) unstable; urgency=medium + * New upstream release (19.04.3) - * Team upload. + -- Rik Mills Tue, 23 Jul 2019 18:53:17 +0100 - [ Sandro Knauß ] - * Bump Standards-Version to 4.2.1 (No changes needed). - * Follow stable releases in KDE again. - * New upstream release (18.08.1). - * Update build-deps and deps with the info from cmake. +akonadi-notes (4:18.12.3-0ubuntu2) disco; urgency=medium - -- Sandro Knauß Tue, 02 Oct 2018 23:18:09 +0200 + * No-change rebuild for fixed akonadi server. -akonadi-notes (4:18.07.90-1) experimental; urgency=medium + -- Rik Mills Sun, 07 Apr 2019 17:44:00 +0100 - * Team upload. +akonadi-notes (4:18.12.3-0ubuntu1) disco; urgency=medium - [ Sandro Knauß ] - * Update watch file to match unstable releases, too. - * New upstream release (18.07.90). - * Bump Standards-Version to 4.2.0 (No changes needed). - * Update build-deps and deps with the info from cmake. + * New upstream release (18.12.3) - -- Sandro Knauß Fri, 17 Aug 2018 18:17:29 +0200 + -- Rik Mills Sat, 16 Mar 2019 15:03:43 +0000 -akonadi-notes (4:17.12.3-1) unstable; urgency=medium +akonadi-notes (4:18.04.3-0ubuntu1) cosmic; urgency=medium - * Team upload. + * New upstream release (18.03.80) + * New upstream release (18.04.0) + * New upstream release (18.04.1) + * New upstream release (18.04.3) - [ Sandro Knauß ] - * New upstream release (17.12.3). - * bump epoch in symbolsfiles to match version of the package. - * Update build-deps and deps with the info from cmake. - * use secure copyright format uri. + -- Rik Mills Tue, 21 Aug 2018 18:52:34 +0100 - -- Sandro Knauß Sat, 31 Mar 2018 18:22:30 +0200 +akonadi-notes (4:17.12.3-0ubuntu1) bionic; urgency=medium -akonadi-notes (4:17.12.2-1) experimental; urgency=medium + * New upstream release (17.12.3) - * Team upload. + -- Rik Mills Fri, 16 Mar 2018 13:21:47 +0000 - [ Sandro Knauß ] - * New upstream release (17.12.2). - * Update Vcs links to salsa. - * Update build-deps and deps with the info from cmake - * Enable build tests - * Add symbol file. - * Bump debhelper build-dep and compat to 11. +akonadi-notes (4:17.12.2-0ubuntu1) bionic; urgency=medium - -- Sandro Knauß Fri, 09 Mar 2018 15:13:17 +0100 + * New upstream release (17.11.80) + * New upstream release (17.11.90) + * New upstream release (17.12.0) + * Follow debian marking libkf5akonadinotes-dev as Multi-Arch: same + * New upstream release (17.12.2) -akonadi-notes (4:17.08.3-2) unstable; urgency=medium + -- Rik Mills Wed, 28 Feb 2018 09:43:23 +0000 - * Team upload. - * Mark libkf5akonadinotes-dev as Multi-Arch: same, not foreign. - * Bump Standards-Version to 4.1.3, no changes required. - * Simplify watch file, and switch it to https. +akonadi-notes (4:17.08.3-0ubuntu1) bionic; urgency=medium - -- Pino Toscano Sat, 20 Jan 2018 09:26:36 +0100 + * d/rules: Remove obsolete architecture specific section to silence + lintian + * New upstream release (17.08.3) -akonadi-notes (4:17.08.3-1) unstable; urgency=medium + -- Rik Mills Fri, 01 Dec 2017 15:00:11 +0000 - * Team upload. +akonadi-notes (4:17.04.3-0ubuntu1) artful; urgency=low - [ Maximiliano Curia ] - * New revision - * Update uploaders list as requested by MIA team + * New upstream release (17.04.1) + * Add libkf5akonadinotes-data installing usr/share/locale + * New upstream release (17.04.2) + * New upstream release (17.04.3) - [ Sandro Knauß ] - * New upstream release (17.08.3). - * Get rid of unnessary break/replaces of kde-l10n-(ast|eo). - * Bump Standards-Version to 4.1.2 (No changes needed). - * Remove not needed Build-Deps. - * Bump debhelper build-dep and compat to 10. - * Set l10npkgs_firstversion_ok to 4:16.04.3-9~ + -- José Manuel Santamaría Lema Mon, 21 Aug 2017 14:33:22 +0100 - -- Sandro Knauß Thu, 21 Dec 2017 17:49:31 +0100 +akonadi-notes (4:16.12.3-0ubuntu1) artful; urgency=medium -akonadi-notes (4:17.08.0-1) experimental; urgency=medium + [ Clive Johnston ] + * Initial packaging for akonadi-notes which has been split from kdepimlibs - * New upstream release (17.08.0) - * Update upstream metadata - * Bump Standards-Version to 4.0.1. - * Update build-deps and deps with the info from cmake - * wrap-and-sort - * Bump group breaks (17.08) - * Update copyright file - * Release to experimental - - -- Maximiliano Curia Fri, 01 Sep 2017 22:08:06 +0200 - -akonadi-notes (4:17.08.0-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Thu, 17 Aug 2017 09:29:48 +0000 - -akonadi-notes (4:17.04.3-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 12 Jul 2017 10:17:25 +0000 - -akonadi-notes (4:17.04.2-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 07 Jun 2017 12:19:27 +0000 - -akonadi-notes (4:17.04.1-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Thu, 11 May 2017 18:07:43 +0000 - -akonadi-notes (4:17.04.0-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 19 Apr 2017 13:01:58 +0000 - -akonadi-notes (4:16.12.3-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 08 Mar 2017 13:45:39 +0000 + [ Simon Quigley ] + * Got the package to build correctly + * Ran wrap-and-sort -akonadi-notes (4:16.12.2-0neon) xenial; urgency=medium + [ Rik Mills ] + * New upstream release (16.12.0) + * New upstream release (16.12.1) - * New release + [ Darin Miller ] + * New upstream release (16.12.2) - -- Neon CI Wed, 08 Feb 2017 16:55:21 +0000 - -akonadi-notes (4:16.12.1-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 11 Jan 2017 13:12:26 +0000 - -akonadi-notes (4:16.12.0-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Wed, 14 Dec 2016 16:21:52 +0000 - -akonadi-notes (4:16.08.3-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Mon, 21 Nov 2016 13:51:46 +0000 - -akonadi-notes (4:16.08.2-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Fri, 14 Oct 2016 13:38:12 +0000 - -akonadi-notes (4:16.08.1-0neon) xenial; urgency=medium - - * New release - - -- Neon CI Fri, 16 Sep 2016 13:04:51 +0000 - -akonadi-notes (4:16.08.0-1~) UNRELEASED; urgency=medium - - * Initial packaging based on kdepimlibs - - -- Jonathan Riddell Wed, 10 Aug 2016 16:20:38 +0000 -akonadi-notes (4:16.08.0-0neon) xenial; urgency=medium - - * New release + [ José Manuel Santamaría Lema ] + * New upstream release (16.12.3) + * Update copyright file - -- Neon CI Wed, 17 Aug 2016 11:47:04 +0000 + -- José Manuel Santamaría Lema Mon, 01 May 2017 20:28:03 +0100 diff -pruN 4:20.08.3-1/debian/compat 4:21.04.0-0ubuntu1/debian/compat --- 4:20.08.3-1/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/compat 2021-04-29 00:28:02.000000000 +0000 @@ -0,0 +1,2 @@ +10 + diff -pruN 4:20.08.3-1/debian/control 4:21.04.0-0ubuntu1/debian/control --- 4:20.08.3-1/debian/control 2020-12-11 15:17:25.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/control 2021-04-29 00:28:02.000000000 +0000 @@ -3,36 +3,48 @@ Section: libs Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers Uploaders: Sune Vuorela , + Fathi Boudra , Modestas Vainius , George Kiagiadakis , Eshat Cakar , Lisandro Damián Nicanor Pérez Meyer , Maximiliano Curia , - Sandro Knauß -Build-Depends: cmake (>= 3.5~), - debhelper-compat (= 13), - extra-cmake-modules (>= 5.71.0~), - libkf5i18n-dev (>= 5.71.0~), - libkf5mime-dev (>= 20.08.3~), +Build-Depends: cmake (>= 2.8.12~), + debhelper (>= 9), + extra-cmake-modules (>= 5.31.0~), + libkf5akonadi-dev (>= 4:21.04.0~), + libkf5i18n-dev (>= 5.31.0~), + libkf5mime-dev (>= 21.04.0~), pkg-config, pkg-kde-tools (>= 0.12), - qtbase5-dev (>= 5.13.0~) -Standards-Version: 4.5.1 -Homepage: https://invent.kde.org/pim/akonadi-notes -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/akonadi-notes -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/akonadi-notes.git -Rules-Requires-Root: no + qtbase5-dev (>= 5.6.1~), +Standards-Version: 3.9.7 +Homepage: http://pim.kde.org/ +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi-notes +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi-notes + +Package: libkf5akonadinotes-data +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Breaks: ${kde-l10n:all} +Replaces: ${kde-l10n:all} +Description: Akonadi notes access library - data files + This library provides notes manipulation helpers using the + Akonadi PIM data server. + . + This package is part of the KDE Development Platform PIM libraries module. Package: libkf5akonadinotes-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libkf5akonadinotes5 (= ${binary:Version}), - libkf5i18n-dev (>= 5.71.0~), - libkf5mime-dev (>= 20.08.3~), - qtbase5-dev (>= 5.13.0~), +Depends: libkf5akonadi-dev (>= 4:21.04.0~), + libkf5akonadinotes5 (= ${binary:Version}), + libkf5kdelibs4support-dev (>= 5.31.0~), + libkf5mime-dev (>= 21.04.0~), ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, Description: Akonadi notes access library - development files This library provides notes manipulation helpers using the Akonadi PIM data server. @@ -44,10 +56,11 @@ Description: Akonadi notes access librar Package: libkf5akonadinotes5 Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: libkf5akonadinotes-data (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends}, Description: Akonadi notes access library This library provides notes manipulation helpers using the Akonadi PIM data server. . This package is part of the KDE Development Platform PIM libraries module. -Provides: ${ABI:VirtualPackage} diff -pruN 4:20.08.3-1/debian/copyright 4:21.04.0-0ubuntu1/debian/copyright --- 4:20.08.3-1/debian/copyright 2020-10-19 21:54:02.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/copyright 2021-04-29 00:28:02.000000000 +0000 @@ -1,49 +1,21 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: akonadi-notes -Source: https://invent.kde.org/pim/akonadi-notes -Comment: Numerous people, too many to count, have contributed to akonadi-notes as +Source: git://anongit.kde.org/akonadi-notes +Comment: Numerous people, too many to count, have contributed to kdepimlibs as a whole. The KDE project tries to make an extensive list of people who contributed to KDE at http://www.kde.org/people/credits/ . Unless something else is mentioned, copyright is Copyright: 1996-2015, The KDE project http://www.kde.org -Upstream-Contact: kde-devel@kde.org Files: * -Copyright: 2011, Christian Mollekopf - 2012, Christian Mollekopf - 2012, Rosetta Contributors and Canonical Ltd 2012 - 2011-2014, This_file_is_part_of_KDE +Copyright: 2011-2012, Christian Mollekopf License: LGPL-2+ -Files: po/ca/* - po/ca@valencia/* - po/uk/* -Copyright: 2014, This_file_is_part_of_KDE -License: LGPL-2.1+3+KDEeV - Files: debian/* Copyright: 2007-2015, Debian Qt/KDE Maintainers License: GPL-2+ -License: GPL-2+ - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - . - On Debian systems, the complete text of the GNU General Public License - version 2 can be found in `/usr/share/common-licenses/GPL-2'. - License: LGPL-2+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by @@ -63,11 +35,20 @@ License: LGPL-2+ On Debian systems, the complete text of the GNU Library General Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'. -License: LGPL-2.1+3+KDEeV - This file is distributed under the license LGPL version 2.1 or - version 3 or later versions approved by the membership of KDE e.V. - . - The complete text of the GNU Lesser General Public License version 2.1 - can be found in `/usr/share/common-licenses/LGPL-2.1', likewise, - the complete text of the GNU Lesser General Public License version 3 - can be found in `/usr/share/common-licenses/LGPL-3'. +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in `/usr/share/common-licenses/GPL-2'. diff -pruN 4:20.08.3-1/debian/libkf5akonadinotes5.install 4:21.04.0-0ubuntu1/debian/libkf5akonadinotes5.install --- 4:20.08.3-1/debian/libkf5akonadinotes5.install 2018-03-08 23:04:38.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/libkf5akonadinotes5.install 2021-04-29 00:28:02.000000000 +0000 @@ -1,3 +1,2 @@ usr/lib/*/libKF5AkonadiNotes.so.5 usr/lib/*/libKF5AkonadiNotes.so.5.* -usr/share/locale/ diff -pruN 4:20.08.3-1/debian/libkf5akonadinotes5.symbols 4:21.04.0-0ubuntu1/debian/libkf5akonadinotes5.symbols --- 4:20.08.3-1/debian/libkf5akonadinotes5.symbols 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/libkf5akonadinotes5.symbols 2021-04-29 00:28:02.000000000 +0000 @@ -0,0 +1,50 @@ +# SymbolsHelper-Confirmed: 4:20.08.0 amd64 arm64 armhf ppc64el s390x +libKF5AkonadiNotes.so.5 libkf5akonadinotes5 #MINVER# + _ZN7Akonadi9NoteUtils10Attachment12setContentIDERK7QString@Base 4:20.08.0 + _ZN7Akonadi9NoteUtils10Attachment20setDataBase64EncodedEb@Base 4:20.08.0 + _ZN7Akonadi9NoteUtils10Attachment8setLabelERK7QString@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentC1ERK10QByteArrayRK7QString@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentC1ERK4QUrlRK7QString@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentC1ERKS1_@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentC1Ev@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentC2ERK10QByteArrayRK7QString@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentC2ERK4QUrlRK7QString@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentC2ERKS1_@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentC2Ev@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentD1Ev@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentD2Ev@Base 15.07.90 + _ZN7Akonadi9NoteUtils10AttachmentaSERKS1_@Base 15.07.90 + _ZN7Akonadi9NoteUtils12noteIconNameEv@Base 15.07.90 + _ZN7Akonadi9NoteUtils12noteMimeTypeEv@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapper11attachmentsEv@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapper15setCreationDateERK9QDateTime@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapper17setClassificationENS1_14ClassificationE@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapper19setLastModifiedDateERK9QDateTime@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapper6customEv@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapper6setUidERK7QString@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapper7setFromERK7QString@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapper7setTextERK7QStringN2Qt10TextFormatE@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapper8setTitleERK7QString@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapperC1ERK14QSharedPointerIN5KMime7MessageEE@Base 4:15.12.0 + _ZN7Akonadi9NoteUtils18NoteMessageWrapperC1Ev@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapperC2ERK14QSharedPointerIN5KMime7MessageEE@Base 4:15.12.0 + _ZN7Akonadi9NoteUtils18NoteMessageWrapperC2Ev@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapperD1Ev@Base 15.07.90 + _ZN7Akonadi9NoteUtils18NoteMessageWrapperD2Ev@Base 15.07.90 + _ZNK7Akonadi9NoteUtils10Attachment17dataBase64EncodedEv@Base 4:20.08.0 + _ZNK7Akonadi9NoteUtils10Attachment3urlEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils10Attachment4dataEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils10Attachment5labelEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils10Attachment8mimetypeEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils10Attachment9contentIDEv@Base 4:20.08.0 + _ZNK7Akonadi9NoteUtils10AttachmenteqERKS1_@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper10textFormatEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper11toPlainTextEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper12creationDateEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper14classificationEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper16lastModifiedDateEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper3uidEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper4fromEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper4textEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper5titleEv@Base 15.07.90 + _ZNK7Akonadi9NoteUtils18NoteMessageWrapper7messageEv@Base 15.07.90 diff -pruN 4:20.08.3-1/debian/libkf5akonadinotes-data.install 4:21.04.0-0ubuntu1/debian/libkf5akonadinotes-data.install --- 4:20.08.3-1/debian/libkf5akonadinotes-data.install 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/libkf5akonadinotes-data.install 2021-04-29 00:28:02.000000000 +0000 @@ -0,0 +1 @@ +usr/share/locale/ diff -pruN 4:20.08.3-1/debian/rules 4:21.04.0-0ubuntu1/debian/rules --- 4:20.08.3-1/debian/rules 2020-10-19 21:54:02.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/rules 2021-04-29 00:28:02.000000000 +0000 @@ -1,18 +1,13 @@ #!/usr/bin/make -f -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +l10npkgs_firstversion_ok := 4:17.03.90-0~ -include /usr/share/dpkg/pkg-info.mk +include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk +include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk -AbiVirtualPackageVersion = $(call dpkg_late_eval,AbiVirtualPackageVersion,echo '${DEB_VERSION_UPSTREAM}' | sed -e 's/\.[0-9]\+$$//') -pkgs_lib = $(filter-out %-dev %-dbg %-bin %-data,$(filter lib%,$(shell dh_listpackages))) +override_dh_auto_test: + # Disable dh_auto_test at build time -%: - dh $@ --with kf5 +override_dh_strip: + $(overridden_command) --dbgsym-migration='akonadi-notes-dbg (<= 4:15.12.1-1~~)' -override_dh_makeshlibs: - for pkg in $(pkgs_lib); do \ - name=$$( echo "$${pkg}" | sed -e 's/abi[0-9]\+\s*//'); \ - echo "ABI:VirtualPackage=$${name}-${AbiVirtualPackageVersion}" >> debian/$${pkg}.substvars; \ - dh_makeshlibs -p$${pkg} -V "$${pkg} (>= $(DEB_VERSION_EPOCH_UPSTREAM)), $${name}-${AbiVirtualPackageVersion}"; \ - done diff -pruN 4:20.08.3-1/debian/salsa/extra_repository.list 4:21.04.0-0ubuntu1/debian/salsa/extra_repository.list --- 4:20.08.3-1/debian/salsa/extra_repository.list 2020-05-24 23:37:42.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/salsa/extra_repository.list 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -deb https://qt-kde-team.debian.net/debian qt-kde-snapshots main diff -pruN 4:20.08.3-1/debian/salsa/qt-kde-team.debian.net.asc 4:21.04.0-0ubuntu1/debian/salsa/qt-kde-team.debian.net.asc --- 4:20.08.3-1/debian/salsa/qt-kde-team.debian.net.asc 2020-05-24 23:37:42.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/salsa/qt-kde-team.debian.net.asc 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBFbRhD8BEADR1NNpDI/ekbEMKy0rn8wYWMFgkdg8T7U7iok+QbNd6pad7ZmY -vMZ9YydyKFDXzrXdx06SFDUMdFnYHhedReROJF3C6/IWBQHHKsad1cxu6HtHwBER -P7CMqyjwbQaNf7VR40iSPLiSH4AhpW4L9G0POCrl3oMVKRreMhk86aST6H5YLafb -CTwoELE5GU50pNMena98MUdjCrDNPRdUu1+GFxjjGB5T2ESeQ1zsa1OhMxHw8dgt -pk35WTyD5ETGYs6JVpN1GYvGruCm6dKjMMgIiH0OO7oNUtkqiUE/jAzb0UEX1VqS -d74QrFpqfRpDy+gatglYt3aK1k6HX2aGR3NJshtjejjVhDpOTn8oQrslD+Rtn7nN -bdzf5agYFzyfWBA/466VXWpRp0n+2QfDYnpabuzKN+CYaWsIdpNgVgr3PshpTzKV -vN3wle0V5kEeA1wO5lNRcc+NG98SvL+gNIrH0BZzNOVKAGuZ83pm2cr636IJSBTo -wP40+RWCy5skB67s6MlXa3tq4Q/EVoL9VdgyffOQHgVb6d2jMiXXEjPYqPVnsWkp -w7+PgqaH32wLKwyUbYRz21WVzkwbFr7LvDgaj0PiI9r5c/qN4cKmi4+1zgJuAFOh -wjKbRIzFOApYmcIWXA8suVhUHgzKye1Cix4mD0eoKIGA2nM+wEvLy0DcaQARAQAB -tDxMWFF0IFBhY2thZ2luZyBUZWFtIDxwa2ctbHhxdC1kZXZlbEBsaXN0cy5hbGlv -dGguZGViaWFuLm9yZz6JAjcEEwEKACEFAlbRhD8CGwMFCwkIBwMFFQoJCAsFFgID -AQACHgECF4AACgkQOgXVl5oByVEhUxAAp3TQOStOjwRN26/I4YFeMttDQ3AlWuSB -PycTZbkHoZLNkvIJJuzoXkGXiGZLA7UVuEPTEztB3Bo3IgB+FiDkXWUtG5qj42KV -vqGYq8IjIO8gxRQH+ZK0aiPIZrcCE2z7jFi5ocGVDveS9PbXs7FxVnuP+nBvpuI9 -e43rJM5VgQZbVQbqSmyeaM5KFd+izTfkm0qDVRz6X0l+q1lb2fRjalYXtrueeQro -0E7r1QrYgCxvWT8L71E8eRAdrDbmtCTUebIE/Dle6TDm/tagS9I05COEdOFi2SPa -I4esRzU1tuQxtCVb8E+1rSi1wmNRQSDr2GumIGAJC8ME5StuntwLAJXbzWu/NjJT -uNz2noyfk4ZRNVRuJAZjFivJQqAC1ycRJpLPZuHFJy8Z+8ugKD3sE6MJJfM/tZi1 -hD1nZzgV35uPo2kgVe96zZQlDAZJVlNIF5GOFNOgSN/s+Bq8/zmBJGrkz6/kwRp7 -dJJG1BSMGoyi1vh3Iy9H+Eq1TYd2C1u3GbV2wE7UR2d9Obt+NmCwTpG0nimsW0DD -KNNuzkgBjBQUpt0b99gJULI6aYxWFIvTD77fsmjaKgnlx4shS0y4i+L5sOWqdTXX -ICu+Xnq0ROzmf1+aOGeR500RR7OjU+PmShDklmdE5Ss3Hzqi36tTipGpjKDaDoKA -lM6xZCxUi+25Ag0EVtGEPwEQALR3uffc7bq+xGUVUtCiEbeOYvEDYzoZPvt/Yu57 -BQ56Ar/SkrKthAt7C+IMOJ2NJDHRWtkcYOqQqb4anAlf9a7NSkIwtZh4KeXfA6VZ -3T3JubIrMcO0YFKi11wga2BNkDPv+z9MdYPq9ocoP7pyIWSz70TE/Yo1aaA18l6g -Rx1Wdg/+vjrNjcz8BVEM1szaZTGSb8W2lPqESiG/lTUC90rGKh+7fbEOJPvf1CG9 -wzGgH5NhcU4evu14obvQTwmXo6XPjmx7YtvcfQynNBECdJOyZg2O6qR4wwMKYzSU -+U0KnntCxSFGt4cspnMvnC13DhRmfRJoZxCaCA2GE6ThLu6aqAqcXvaUQUZRP9o/ -HIQm4rEPaZSdJq4pgPv8QKOXWhvk88uh0xW5j2tYyrS8klok42tXIKmGhYej13rJ -e2CJ57bZTGz12ferGCLUUMTH3oAUxdzykrao/gDk+kKxxYpCe6MAbtamVbsBbiar -rp11y4WhLmeb69SXrE2uNJSf71f7GvjjiZQoCvRJL/1OFtpUCj/c8Dz+8gnMsPwU -lXJa7tbsxLrOhkNf/clBt4Nf/v60o7Ig9glgyuNXc2cq8VtP+vU3Pde1GNJp4qsP -JgmlU97n1eIdubg2o7HBsSBJ860+Fn2CfnO1umQoMP0uzF4M5fyfTWXy0A/DgFEH -7o03ABEBAAGJAh8EGAEKAAkFAlbRhD8CGwwACgkQOgXVl5oByVHfeA/9HCaVGqpv -RaZa5ciomYsg9vsZoMB6WhM1kyG11utwgV+Hl9XhktAFFo6B9BnyzhxYGn8Tcefi -Et3lKi/vt6vvk9BU5sKmE9Pt+T9tnjK8MKcOHco0bmnCByE6HZxtVkcSlYgnyf4s -II9kQoSADwwodQn4f5JSb9NIxHxBD+Aga3d4yYBDOLrBzW2BN6xilqTGZpcMioht -8VIOvs/YUOpLhZuARtPszCUjGB/WGspQlrIldSRIpvshSUd79SrcYM5OyzeuF7aP -h1xt+3l5kxDE1oKYgW9rKycp6liillOQyZlIJmeU2D30IqVQshYDfYvy/3cL9TO6 -CcYGkBaFFf8fKGEEBWG35M0+PXaiivQ2efBfekt1i3MaFn25t2Lgjt31wKjZqRfZ -xRFodkRx/qSxZcaJU8NYSxVC2OEwlEIN0v3/eWZMOzYwFvCcg/a3M7ARlQOwt1YZ -Lsj83SJ263KjdGpgDE0Rk6B416dT/vClRmGg5jyX05keymzzfl//z93rerwPqbV/ -ygi4vRVswBSrACwRKXEzaUEeutGX8L49XFNi/p5gYL8RCTGOM4PxD5AmTC7+VnnO -T1155UsunpBrlFUTKhxJGUux11TgojiGJY3ID7fP8EqyZWp6z3CXqXTxv8CP8Ye1 -bMTcHe5rk6snXqz1neEmP2K7qdNwwakRdAA= -=o8PI ------END PGP PUBLIC KEY BLOCK----- diff -pruN 4:20.08.3-1/debian/salsa-ci.yml 4:21.04.0-0ubuntu1/debian/salsa-ci.yml --- 4:20.08.3-1/debian/salsa-ci.yml 2020-12-11 14:54:14.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,8 +0,0 @@ -include: -- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml -- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml -variables: - EXTRA_REPOSITORY: debian/salsa/extra_repository.list - EXTRA_REPOSITORY_KEY: debian/salsa/qt-kde-team.debian.net.asc - RELEASE: unstable - SALSA_CI_REPROTEST_ARGS: --variations=-build-path diff -pruN 4:20.08.3-1/debian/source/format 4:21.04.0-0ubuntu1/debian/source/format --- 4:20.08.3-1/debian/source/format 2017-12-13 16:24:18.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/source/format 2021-04-29 00:28:02.000000000 +0000 @@ -1 +1,2 @@ 3.0 (quilt) + diff -pruN 4:20.08.3-1/debian/upstream/metadata 4:21.04.0-0ubuntu1/debian/upstream/metadata --- 4:20.08.3-1/debian/upstream/metadata 2020-10-19 21:54:02.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -Changelog: https://invent.kde.org/pim/akonadi-notes/-/commits/master -Donation: https://www.kde.org/community/donations/index.php -Repository: https://invent.kde.org/pim/akonadi-notes.git -Repository-Browse: https://invent.kde.org/pim/akonadi-notes -Security-Contact: security@kde.org diff -pruN 4:20.08.3-1/debian/upstream/signing-key.asc 4:21.04.0-0ubuntu1/debian/upstream/signing-key.asc --- 4:20.08.3-1/debian/upstream/signing-key.asc 2020-12-15 19:06:39.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBFlRpEYBCACecX3F5xzF6wzeXiuBAuHq74bVHON7I89U+ROloEWYUYMRNTz2 -l1BkNHWRTTqfmPO7LhMY6g4gOPeQVCwgTGVjI8bn6sJd3SFdeiRvvaFBpmn7SjBd -s1rkKKJIjeMUl1w8dFnmf22V0PnhSSepmNwmd8RQnl1umCTSihDJydGxixw6ZNhr -4tzbn+Rfadybli61H2hc6/JJHe91i+V1ltgkHwGcs6MUCqXgSL0dUIJs49gSrla0 -gkrcJYF5MWyGxKlajbCjkMCJtN+8bhEmpc4Oe8NZ33arEWnlyh1RVgi5p3RTNApY -Pxctcg57ExczbKn9R8VLYmPJ7Di3gX0cmotrABEBAAG0HkNocmlzdG9waCBGZWNr -IDxjZmVja0BrZGUub3JnPokBTgQTAQgAOBYhBPIydeS/EK/B32kUptvSzok+LRyH -BQJZUaRGAhsDBQsJCAcCBhUICQoLAgQWAgMBAh4BAheAAAoJENvSzok+LRyHeWcH -/A1E2d5UL2oHsrLIolIiWMmheRorcac+0Hgll1mMUQ5tfPH+LVzgrlMMG7g1Amky -Hk1qZ5oszrXUg2H/28/cOF/WVlHgQcSGr7aQbHieUivPtZMua+lHUdILC3UV2l1V -22Zz8HIDl4kxmK6EpoNIOK5Mo550S3e3AKYq5pa/FlckCV9/JoK9+thRCsoAAj3g -oWwTx9RY5pmLPtklqyC5961Je7KHSIVqapJ/G5DX+yfOC1Psc+vIfyQVqnaefZPW -dIxXQQhn46i6IRRimw94Gkwca+wslkimt/L/Z7ByZqBsXMyixSQPq+dtSO9CMgr0 -WxTX78wATkTGzh5oSwKCMga5AQ0EWVGkRgEIAMuUnfNfrdx8xn7Jjcm6MGkB/Yep -XVysrlHxUUS6q7629JdSlVWnQo9GFO927GZClWI9rCGLQMfZZk/jfgKV/nkpLod3 -I51remOg7ohSkwRLAdwJ7xCuNrafhKntFh5/NxuaXxaVIY1muvZbTAsIRyks2jCE -pUoK43Z8dr4/QPhBstssB8czDME1Tw4r7X+RwjFrQqDItFv6f0BIdEwR462khLEw -vbXRN1nzs+6Y0foJbJCS3VDZC9scsrrMVMV+OEBF3DXp9ypSWsLnkuBPPIus6Y8G -j7JvYUBtrUhKL5a7o5G3Te9YhwGgOKVqWlncs6ZLiOV6HnG0BO3xdPcn09cAEQEA -AYkBNgQYAQgAIBYhBPIydeS/EK/B32kUptvSzok+LRyHBQJZUaRGAhsMAAoJENvS -zok+LRyHaRMIAI5YaTfGeQDmR08I2LvztOEH/3YF63cNCP/Vp+WAtF/Kr8mMFpFS -oTHJNMi7p964lHYTTPzPeQzLzV3ayiQjq+DHs6HFmYl73ukzlGGc7KDlyhugQjm6 -AqNtqqXAVykaixnFj8jf2WtQGl1hqpm8GhDRBmZycqMqne4tZokujhtpdC6suRvc -AB0S+lRZUwrY05k6Nc1A8J8k/lxXXa9KzXNaqKsqppgBZoqKN3zS4146uEjvuLsh -CarZ/6uUidvP0LBTR7HKye5A9Qdbjlg9qvtR7YF3hqy4g1PRNZWRlsQ1pkCdCTfN -TA+HYUzK0ESVpY72lWvH49lNg+ufZ1bKvKI= -=MZJ5 ------END PGP PUBLIC KEY BLOCK----- diff -pruN 4:20.08.3-1/debian/watch 4:21.04.0-0ubuntu1/debian/watch --- 4:20.08.3-1/debian/watch 2020-05-26 22:05:05.000000000 +0000 +++ 4:21.04.0-0ubuntu1/debian/watch 2021-04-29 00:28:02.000000000 +0000 @@ -1,2 +1,2 @@ -version=4 -opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/release-service/([\d.]+)/src/@PACKAGE@-([\d.]+)\.tar\.xz +version=3 +http://download.kde.org/(un)?stable/applications/([\d.]+)/src/akonadi-notes-([\d.]+).tar.xz diff -pruN 4:20.08.3-1/.git-blame-ignore-revs 4:21.04.0-0ubuntu1/.git-blame-ignore-revs --- 4:20.08.3-1/.git-blame-ignore-revs 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/.git-blame-ignore-revs 2021-04-11 11:08:47.000000000 +0000 @@ -0,0 +1,2 @@ +# clang-format +f19faa834111f28b6acf5380bdfa50985d04c037 diff -pruN 4:20.08.3-1/.gitignore 4:21.04.0-0ubuntu1/.gitignore --- 4:20.08.3-1/.gitignore 2020-10-10 19:56:55.000000000 +0000 +++ 4:21.04.0-0ubuntu1/.gitignore 2021-04-11 11:08:47.000000000 +0000 @@ -18,3 +18,4 @@ Makefile .cmake/ CMakeLists.txt.user* *.unc-backup* +compile_commands.json diff -pruN 4:20.08.3-1/.gitlab-ci.yml 4:21.04.0-0ubuntu1/.gitlab-ci.yml --- 4:20.08.3-1/.gitlab-ci.yml 2020-10-10 19:56:55.000000000 +0000 +++ 4:21.04.0-0ubuntu1/.gitlab-ci.yml 2021-04-11 11:08:47.000000000 +0000 @@ -1,10 +1,14 @@ +# SPDX-FileCopyrightText: 2020-2021 Laurent Montel +# SPDX-FileCopyrightText: 2021 Laurent Montel +# SPDX-License-Identifier: CC0-1.0 + include: - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml build_clazy_clang_tidy: stage: build - image: kdeorg/ci-suse-qt514 + image: kdeorg/ci-suse-qt515 extends: .linux #only: # - merge_requests @@ -26,5 +30,5 @@ build_clazy_clang_tidy: - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --usingInstall $INSTALL_PREFIX - cd build && run-clang-tidy variables: - PLATFORM: SUSEQt5.14 + PLATFORM: SUSEQt5.15 BRANCH_GROUP: kf5-qt5 diff -pruN 4:20.08.3-1/LICENSES/CC0-1.0.txt 4:21.04.0-0ubuntu1/LICENSES/CC0-1.0.txt --- 4:20.08.3-1/LICENSES/CC0-1.0.txt 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/LICENSES/CC0-1.0.txt 2021-04-11 11:08:47.000000000 +0000 @@ -0,0 +1,119 @@ +Creative Commons Legal Code + +CC0 1.0 Universal CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES +NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE +AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION +ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE +OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS +LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION +OR WORKS PROVIDED HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer exclusive +Copyright and Related Rights (defined below) upon the creator and subsequent +owner(s) (each and all, an "owner") of an original work of authorship and/or +a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for the +purpose of contributing to a commons of creative, cultural and scientific +works ("Commons") that the public can reliably and without fear of later claims +of infringement build upon, modify, incorporate in other works, reuse and +redistribute as freely as possible in any form whatsoever and for any purposes, +including without limitation commercial purposes. These owners may contribute +to the Commons to promote the ideal of a free culture and the further production +of creative, cultural and scientific works, or to gain reputation or greater +distribution for their Work in part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any expectation +of additional consideration or compensation, the person associating CC0 with +a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright +and Related Rights in the Work, voluntarily elects to apply CC0 to the Work +and publicly distribute the Work under its terms, with knowledge of his or +her Copyright and Related Rights in the Work and the meaning and intended +legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be protected +by copyright and related or neighboring rights ("Copyright and Related Rights"). +Copyright and Related Rights include, but are not limited to, the following: + +i. the right to reproduce, adapt, distribute, perform, display, communicate, +and translate a Work; + + ii. moral rights retained by the original author(s) and/or performer(s); + +iii. publicity and privacy rights pertaining to a person's image or likeness +depicted in a Work; + +iv. rights protecting against unfair competition in regards to a Work, subject +to the limitations in paragraph 4(a), below; + +v. rights protecting the extraction, dissemination, use and reuse of data +in a Work; + +vi. database rights (such as those arising under Directive 96/9/EC of the +European Parliament and of the Council of 11 March 1996 on the legal protection +of databases, and under any national implementation thereof, including any +amended or successor version of such directive); and + +vii. other similar, equivalent or corresponding rights throughout the world +based on applicable law or treaty, and any national implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention of, +applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and +unconditionally waives, abandons, and surrenders all of Affirmer's Copyright +and Related Rights and associated claims and causes of action, whether now +known or unknown (including existing as well as future claims and causes of +action), in the Work (i) in all territories worldwide, (ii) for the maximum +duration provided by applicable law or treaty (including future time extensions), +(iii) in any current or future medium and for any number of copies, and (iv) +for any purpose whatsoever, including without limitation commercial, advertising +or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the +benefit of each member of the public at large and to the detriment of Affirmer's +heirs and successors, fully intending that such Waiver shall not be subject +to revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason be +judged legally invalid or ineffective under applicable law, then the Waiver +shall be preserved to the maximum extent permitted taking into account Affirmer's +express Statement of Purpose. In addition, to the extent the Waiver is so +judged Affirmer hereby grants to each affected person a royalty-free, non +transferable, non sublicensable, non exclusive, irrevocable and unconditional +license to exercise Affirmer's Copyright and Related Rights in the Work (i) +in all territories worldwide, (ii) for the maximum duration provided by applicable +law or treaty (including future time extensions), (iii) in any current or +future medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional purposes +(the "License"). The License shall be deemed effective as of the date CC0 +was applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder of +the License, and in such case Affirmer hereby affirms that he or she will +not (i) exercise any of his or her remaining Copyright and Related Rights +in the Work or (ii) assert any associated claims and causes of action with +respect to the Work, in either case contrary to Affirmer's express Statement +of Purpose. + + 4. Limitations and Disclaimers. + +a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, +licensed or otherwise affected by this document. + +b. Affirmer offers the Work as-is and makes no representations or warranties +of any kind concerning the Work, express, implied, statutory or otherwise, +including without limitation warranties of title, merchantability, fitness +for a particular purpose, non infringement, or the absence of latent or other +defects, accuracy, or the present or absence of errors, whether or not discoverable, +all to the greatest extent permissible under applicable law. + +c. Affirmer disclaims responsibility for clearing rights of other persons +that may apply to the Work or any use thereof, including without limitation +any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims +responsibility for obtaining any necessary consents, permissions or other +rights required for any use of the Work. + +d. Affirmer understands and acknowledges that Creative Commons is not a party +to this document and has no duty or obligation with respect to this CC0 or +use of the Work. diff -pruN 4:20.08.3-1/po/ar/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ar/akonadinotes5.po --- 4:20.08.3-1/po/ar/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ar/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2014-09-12 14:20+0300\n" "Last-Translator: Safa Alfulaij \n" "Language-Team: Arabic \n" @@ -18,7 +18,7 @@ msgstr "" "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Lokalize 1.5\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ast/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ast/akonadinotes5.po --- 4:20.08.3-1/po/ast/akonadinotes5.po 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ast/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -0,0 +1,24 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the akonadi-notes package. +# +# enolp , 2020. +msgid "" +msgstr "" +"Project-Id-Version: akonadi-notes\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" +"PO-Revision-Date: 2020-11-07 16:46+0100\n" +"Last-Translator: enolp \n" +"Language-Team: Asturian \n" +"Language: ast\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 20.08.3\n" + +#: noteutils.cpp:382 +#, kde-format +msgctxt "The default name for new notes." +msgid "New Note" +msgstr "Nota nueva" diff -pruN 4:20.08.3-1/po/bg/akonadinotes5.po 4:21.04.0-0ubuntu1/po/bg/akonadinotes5.po --- 4:20.08.3-1/po/bg/akonadinotes5.po 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/bg/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -0,0 +1,24 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the akonadi-notes package. +# +# Yasen Pramatarov , 2021. +msgid "" +msgstr "" +"Project-Id-Version: akonadi-notes\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" +"PO-Revision-Date: 2021-01-06 18:21+0200\n" +"Last-Translator: Yasen Pramatarov \n" +"Language-Team: Bulgarian \n" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 20.08.2\n" + +#: noteutils.cpp:382 +#, kde-format +msgctxt "The default name for new notes." +msgid "New Note" +msgstr "Нова бележка" diff -pruN 4:20.08.3-1/po/bs/akonadinotes5.po 4:21.04.0-0ubuntu1/po/bs/akonadinotes5.po --- 4:20.08.3-1/po/bs/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/bs/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: bosnianuniversetranslation\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2012-10-05 19:44+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ca/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ca/akonadinotes5.po --- 4:20.08.3-1/po/ca/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ca/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadi-notes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2012-01-07 22:09+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ca@valencia/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ca@valencia/akonadinotes5.po --- 4:20.08.3-1/po/ca@valencia/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ca@valencia/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadi-notes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2012-01-07 22:09+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/cs/akonadinotes5.po 4:21.04.0-0ubuntu1/po/cs/akonadinotes5.po --- 4:20.08.3-1/po/cs/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/cs/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-08 10:53+0200\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/da/akonadinotes5.po 4:21.04.0-0ubuntu1/po/da/akonadinotes5.po --- 4:20.08.3-1/po/da/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/da/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-12-29 19:31+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/de/akonadinotes5.po 4:21.04.0-0ubuntu1/po/de/akonadinotes5.po --- 4:20.08.3-1/po/de/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/de/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-10-31 23:48+0100\n" "Last-Translator: Frederik Schwarzer \n" "Language-Team: German \n" @@ -14,7 +14,7 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/el/akonadinotes5.po 4:21.04.0-0ubuntu1/po/el/akonadinotes5.po --- 4:20.08.3-1/po/el/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/el/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2012-10-25 18:28+0300\n" "Last-Translator: Stelios \n" "Language-Team: Greek \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/en_GB/akonadinotes5.po 4:21.04.0-0ubuntu1/po/en_GB/akonadinotes5.po --- 4:20.08.3-1/po/en_GB/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/en_GB/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2014-08-17 13:13+0100\n" "Last-Translator: Steve Allewell \n" "Language-Team: British English \n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/es/akonadinotes5.po 4:21.04.0-0ubuntu1/po/es/akonadinotes5.po --- 4:20.08.3-1/po/es/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/es/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2013-11-25 14:08+0100\n" "Last-Translator: Javier Vinal \n" "Language-Team: Spanish \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/et/akonadinotes5.po 4:21.04.0-0ubuntu1/po/et/akonadinotes5.po --- 4:20.08.3-1/po/et/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/et/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-12-22 04:12+0200\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/eu/akonadinotes5.po 4:21.04.0-0ubuntu1/po/eu/akonadinotes5.po --- 4:20.08.3-1/po/eu/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/eu/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: akonadi-notes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" -"PO-Revision-Date: 2020-08-04 22:50+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" +"PO-Revision-Date: 2020-08-04 22:51+0200\n" "Last-Translator: Iñigo Salvador Azurmendi \n" "Language-Team: Basque \n" "Language: eu\n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 20.04.3\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/fi/akonadinotes5.po 4:21.04.0-0ubuntu1/po/fi/akonadinotes5.po --- 4:20.08.3-1/po/fi/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/fi/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2013-01-20 20:04:09+0000\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish \n" @@ -19,7 +19,7 @@ msgstr "" "X-POT-Import-Date: 2012-12-01 22:25:16+0000\n" "X-Generator: MediaWiki 1.21alpha (963ddae); Translate 2012-11-08\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/fr/akonadinotes5.po 4:21.04.0-0ubuntu1/po/fr/akonadinotes5.po --- 4:20.08.3-1/po/fr/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/fr/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2012-04-15 15:54+0200\n" "Last-Translator: Joëlle Cornavin \n" "Language-Team: French \n" @@ -20,7 +20,7 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ga/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ga/akonadinotes5.po --- 4:20.08.3-1/po/ga/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ga/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-12-28 12:28-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? " "3 : 4\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/gl/akonadinotes5.po 4:21.04.0-0ubuntu1/po/gl/akonadinotes5.po --- 4:20.08.3-1/po/gl/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/gl/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2013-01-01 11:28+0100\n" "Last-Translator: Marce Villarino \n" "Language-Team: Galician \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/he/akonadinotes5.po 4:21.04.0-0ubuntu1/po/he/akonadinotes5.po --- 4:20.08.3-1/po/he/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/he/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2017-05-16 07:04-0400\n" "Last-Translator: Copied by Zanata \n" "Language-Team: Hebrew \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Zanata 3.9.6\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/hi/akonadinotes5.po 4:21.04.0-0ubuntu1/po/hi/akonadinotes5.po --- 4:20.08.3-1/po/hi/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/hi/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: akonadi-notes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" -"PO-Revision-Date: 2020-08-25 22:22+0530\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" +"PO-Revision-Date: 2020-08-20 19:13+0530\n" "Last-Translator: Raghavendra Kamath \n" "Language-Team: Kde-hindi\n" "Language: hi\n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Lokalize 20.04.3\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/hu/akonadinotes5.po 4:21.04.0-0ubuntu1/po/hu/akonadinotes5.po --- 4:20.08.3-1/po/hu/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/hu/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-10-25 13:03+0200\n" "Last-Translator: Kristóf Kiszel \n" "Language-Team: Hungarian \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ia/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ia/akonadinotes5.po --- 4:20.08.3-1/po/ia/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ia/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-11-07 11:28+0100\n" "Last-Translator: g.sora \n" "Language-Team: Interlingua \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/it/akonadinotes5.po 4:21.04.0-0ubuntu1/po/it/akonadinotes5.po --- 4:20.08.3-1/po/it/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/it/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2012-01-12 01:23+0100\n" "Last-Translator: Luigi Toscano \n" "Language-Team: Italian \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ja/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ja/akonadinotes5.po --- 4:20.08.3-1/po/ja/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ja/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-10 22:32-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -14,7 +14,7 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/kk/akonadinotes5.po 4:21.04.0-0ubuntu1/po/kk/akonadinotes5.po --- 4:20.08.3-1/po/kk/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/kk/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-12-13 02:37+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.1\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/km/akonadinotes5.po 4:21.04.0-0ubuntu1/po/km/akonadinotes5.po --- 4:20.08.3-1/po/km/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/km/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2012-06-08 09:39+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer\n" @@ -18,7 +18,7 @@ msgstr "" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ko/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ko/akonadinotes5.po --- 4:20.08.3-1/po/ko/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ko/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2014-03-03 00:24+0900\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/lt/akonadinotes5.po 4:21.04.0-0ubuntu1/po/lt/akonadinotes5.po --- 4:20.08.3-1/po/lt/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/lt/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-25 12:28+0300\n" "Last-Translator: Remigijus Jarmalavičius \n" "Language-Team: Lithuanian \n" @@ -20,7 +20,7 @@ msgstr "" "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" "X-Generator: Lokalize 1.2\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/mr/akonadinotes5.po 4:21.04.0-0ubuntu1/po/mr/akonadinotes5.po --- 4:20.08.3-1/po/mr/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/mr/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2013-03-13 15:18+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Lokalize 1.5\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/nb/akonadinotes5.po 4:21.04.0-0ubuntu1/po/nb/akonadinotes5.po --- 4:20.08.3-1/po/nb/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/nb/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-10 19:33+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -19,7 +19,7 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/nds/akonadinotes5.po 4:21.04.0-0ubuntu1/po/nds/akonadinotes5.po --- 4:20.08.3-1/po/nds/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/nds/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-07 22:33+0200\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -18,7 +18,7 @@ msgstr "" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/nl/akonadinotes5.po 4:21.04.0-0ubuntu1/po/nl/akonadinotes5.po --- 4:20.08.3-1/po/nl/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/nl/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-12 16:56+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/nn/akonadinotes5.po 4:21.04.0-0ubuntu1/po/nn/akonadinotes5.po --- 4:20.08.3-1/po/nn/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/nn/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadi-notes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2020-06-14 13:18+0200\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" @@ -19,7 +19,7 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/pl/akonadinotes5.po 4:21.04.0-0ubuntu1/po/pl/akonadinotes5.po --- 4:20.08.3-1/po/pl/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/pl/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2014-08-16 07:55+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -18,7 +18,7 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/pt/akonadinotes5.po 4:21.04.0-0ubuntu1/po/pt/akonadinotes5.po --- 4:20.08.3-1/po/pt/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/pt/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-07 11:18+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" @@ -12,7 +12,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/pt_BR/akonadinotes5.po 4:21.04.0-0ubuntu1/po/pt_BR/akonadinotes5.po --- 4:20.08.3-1/po/pt_BR/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/pt_BR/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2014-08-16 10:47-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ro/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ro/akonadinotes5.po --- 4:20.08.3-1/po/ro/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ro/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2014-10-03 11:02+0300\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ru/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ru/akonadinotes5.po --- 4:20.08.3-1/po/ru/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ru/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2013-05-25 14:40+0400\n" "Last-Translator: Alexander Lakhin \n" "Language-Team: Russian \n" @@ -21,7 +21,7 @@ msgstr "" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/sk/akonadinotes5.po 4:21.04.0-0ubuntu1/po/sk/akonadinotes5.po --- 4:20.08.3-1/po/sk/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/sk/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2014-08-14 14:17+0200\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" @@ -15,7 +15,7 @@ msgstr "" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/sl/akonadinotes5.po 4:21.04.0-0ubuntu1/po/sl/akonadinotes5.po --- 4:20.08.3-1/po/sl/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/sl/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2020-06-01 13:51+0200\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" @@ -18,7 +18,7 @@ msgstr "" "%100==4 ? 3 : 0);\n" "X-Generator: Poedit 2.3.1\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/sv/akonadinotes5.po 4:21.04.0-0ubuntu1/po/sv/akonadinotes5.po --- 4:20.08.3-1/po/sv/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/sv/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-07 14:39+0200\n" "Last-Translator: Stefan Asserhall \n" "Language-Team: Swedish \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/tr/akonadinotes5.po 4:21.04.0-0ubuntu1/po/tr/akonadinotes5.po --- 4:20.08.3-1/po/tr/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/tr/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: kdepimlibs-kde4\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2014-11-12 01:06+0200\n" "Last-Translator: Kaan Ozdincer \n" "Language-Team: Turkish \n" @@ -20,7 +20,7 @@ msgstr "" "X-Generator: Lokalize 1.4\n" "(http: //www.transifex.com/projects/p/kdepimlibs-k-tr/language/tr/)\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/ug/akonadinotes5.po 4:21.04.0-0ubuntu1/po/ug/akonadinotes5.po --- 4:20.08.3-1/po/ug/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/ug/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/uk/akonadinotes5.po 4:21.04.0-0ubuntu1/po/uk/akonadinotes5.po --- 4:20.08.3-1/po/uk/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/uk/akonadinotes5.po 2021-04-16 08:45:44.000000000 +0000 @@ -1,5 +1,5 @@ # Translation of akonadinotes5.po to Ukrainian -# Copyright (C) 2014 This_file_is_part_of_KDE +# Copyright (C) 2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: akonadinotes5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-07 07:53+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -20,7 +20,7 @@ msgstr "" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/zh_CN/akonadinotes5.po 4:21.04.0-0ubuntu1/po/zh_CN/akonadinotes5.po --- 4:20.08.3-1/po/zh_CN/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/zh_CN/akonadinotes5.po 2021-04-16 08:45:45.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" -"PO-Revision-Date: 2020-10-08 19:23\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" +"PO-Revision-Date: 2021-03-27 17:31\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -21,7 +21,7 @@ msgstr "" "X-Crowdin-File: /kf5-stable/messages/akonadi-notes/akonadinotes5.pot\n" "X-Crowdin-File-ID: 3113\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/po/zh_TW/akonadinotes5.po 4:21.04.0-0ubuntu1/po/zh_TW/akonadinotes5.po --- 4:20.08.3-1/po/zh_TW/akonadinotes5.po 2020-11-03 00:45:10.000000000 +0000 +++ 4:21.04.0-0ubuntu1/po/zh_TW/akonadinotes5.po 2021-04-16 08:45:45.000000000 +0000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2020-07-13 07:46+0200\n" +"POT-Creation-Date: 2021-01-27 03:05+0100\n" "PO-Revision-Date: 2011-09-16 09:25+0800\n" "Last-Translator: Franklin Weng \n" "Language-Team: Chinese Traditional \n" @@ -17,7 +17,7 @@ msgstr "" "X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: noteutils.cpp:390 +#: noteutils.cpp:382 #, kde-format msgctxt "The default name for new notes." msgid "New Note" diff -pruN 4:20.08.3-1/sanitizers.supp 4:21.04.0-0ubuntu1/sanitizers.supp --- 4:20.08.3-1/sanitizers.supp 1970-01-01 00:00:00.000000000 +0000 +++ 4:21.04.0-0ubuntu1/sanitizers.supp 2021-04-11 11:08:47.000000000 +0000 @@ -0,0 +1,14 @@ +# Suppression file for ASAN/LSAN + +leak:libspeechd +leak:getdelim +leak:g_malloc +leak:libfontconfig +leak:libdbus +leak:QEasingCurve:: +leak:QtSharedPointer::ExternalRefCountData::getAndRef +leak:QArrayData::allocate +leak:QObject::QObject +leak:QObjectPrivate::addConnection +leak:QObjectPrivate::connectImpl +leak:QPropertyAnimation::QPropertyAnimation diff -pruN 4:20.08.3-1/src/CMakeLists.txt 4:21.04.0-0ubuntu1/src/CMakeLists.txt --- 4:20.08.3-1/src/CMakeLists.txt 2020-10-10 19:56:55.000000000 +0000 +++ 4:21.04.0-0ubuntu1/src/CMakeLists.txt 2021-04-11 11:08:47.000000000 +0000 @@ -58,7 +58,7 @@ install(FILES ecm_generate_pri_file(BASE_NAME AkonadiNotes LIB_NAME KF5AkonadiNotes - DEPS "Mime" FILENAME_VAR PRI_FILENAME + DEPS "KMime" FILENAME_VAR PRI_FILENAME ) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -pruN 4:20.08.3-1/src/noteutils.cpp 4:21.04.0-0ubuntu1/src/noteutils.cpp --- 4:20.08.3-1/src/noteutils.cpp 2020-10-10 19:56:55.000000000 +0000 +++ 4:21.04.0-0ubuntu1/src/noteutils.cpp 2021-04-11 11:08:47.000000000 +0000 @@ -6,11 +6,12 @@ #include "noteutils.h" +#include "akonadi_notes_debug.h" #include #include #include -#include "akonadi_notes_debug.h" +#include #include #include #include @@ -19,7 +20,6 @@ namespace Akonadi { namespace NoteUtils { - #define X_NOTES_UID_HEADER "X-Akonotes-UID" #define X_NOTES_LASTMODIFIED_HEADER "X-Akonotes-LastModified" #define X_NOTES_CLASSIFICATION_HEADER "X-Akonotes-Classification" @@ -68,7 +68,6 @@ public: Attachment::Attachment() : d_ptr(new Attachment::AttachmentPrivate(QUrl(), QString())) { - } Attachment::Attachment(const QUrl &url, const QString &mimetype) @@ -95,17 +94,11 @@ bool Attachment::operator==(const Attach { Q_D(const Attachment); if (d->mUrl.isEmpty()) { - return d->mUrl == a.d_func()->mUrl && - d->mDataBase64Encoded == a.d_func()->mDataBase64Encoded && - d->mMimetype == a.d_func()->mMimetype && - d->mContentID == a.d_func()->mContentID && - d->mLabel == a.d_func()->mLabel; - } - return d->mData == a.d_func()->mData && - d->mDataBase64Encoded == a.d_func()->mDataBase64Encoded && - d->mMimetype == a.d_func()->mMimetype && - d->mContentID == a.d_func()->mContentID && - d->mLabel == a.d_func()->mLabel; + return d->mUrl == a.d_func()->mUrl && d->mDataBase64Encoded == a.d_func()->mDataBase64Encoded && d->mMimetype == a.d_func()->mMimetype + && d->mContentID == a.d_func()->mContentID && d->mLabel == a.d_func()->mLabel; + } + return d->mData == a.d_func()->mData && d->mDataBase64Encoded == a.d_func()->mDataBase64Encoded && d->mMimetype == a.d_func()->mMimetype + && d->mContentID == a.d_func()->mContentID && d->mLabel == a.d_func()->mLabel; } void Attachment::operator=(const Attachment &a) @@ -193,7 +186,7 @@ public: QString from; QDateTime creationDate; QDateTime lastModifiedDate; - QMap< QString, QString > custom; + QMap custom; QVector attachments; Classification classification = Public; Qt::TextFormat textFormat = Qt::PlainText; @@ -206,7 +199,7 @@ void NoteMessageWrapper::NoteMessageWrap return; } title = msg->subject(true)->asUnicodeString(); - text = msg->mainBodyPart()->decodedText(true); //remove trailing whitespace, so we get rid of " " in empty notes + text = msg->mainBodyPart()->decodedText(true); // remove trailing whitespace, so we get rid of " " in empty notes if (msg->from(false)) { from = msg->from(false)->asUnicodeString(); } @@ -281,8 +274,8 @@ KMime::Content *NoteMessageWrapper::Note QDomDocument document = createXMLDocument(); QDomElement element = document.createElement(QStringLiteral("custom")); element.setAttribute(QStringLiteral("version"), QStringLiteral("1.0")); - QMap ::const_iterator end = custom.end(); - for (QMap ::const_iterator it = custom.begin(); it != end; ++it) { + QMap::const_iterator end = custom.end(); + for (QMap::const_iterator it = custom.begin(); it != end; ++it) { QDomElement e = element.ownerDocument().createElement(it.key()); QDomText t = element.ownerDocument().createTextNode(it.value()); e.appendChild(t); @@ -301,8 +294,7 @@ void NoteMessageWrapper::NoteMessageWrap } QDomElement top = document.documentElement(); if (top.tagName() != QLatin1String("custom")) { - qWarning("XML error: Top tag was %s instead of the expected custom", - top.tagName().toLatin1().data()); + qWarning("XML error: Top tag was %s instead of the expected custom", top.tagName().toLatin1().data()); return; } @@ -368,12 +360,12 @@ void NoteMessageWrapper::NoteMessageWrap } NoteMessageWrapper::NoteMessageWrapper() - : d_ptr(new NoteMessageWrapperPrivate()) + : d_ptr(new NoteMessageWrapperPrivate()) { } NoteMessageWrapper::NoteMessageWrapper(const KMime::MessagePtr &msg) - : d_ptr(new NoteMessageWrapperPrivate(msg)) + : d_ptr(new NoteMessageWrapperPrivate(msg)) { } @@ -435,7 +427,7 @@ KMime::MessagePtr NoteMessageWrapper::me classification = CLASSIFICATION_CONFIDENTIAL; break; default: - //do nothing + // do nothing break; } header = new KMime::Headers::Generic(X_NOTES_CLASSIFICATION_HEADER); @@ -556,12 +548,11 @@ QString NoteMessageWrapper::toPlainText( return d->text; } - //From cleanHtml in kdepimlibs/kcalutils/incidenceformatter.cpp - QRegExp rx(QStringLiteral("]*>(.*)"), Qt::CaseInsensitive); - rx.indexIn(d->text); - QString body = rx.cap(1); + // From cleanHtml in kdepimlibs/kcalutils/incidenceformatter.cpp + const QRegularExpression rx(QStringLiteral("]*>(.*)"), QRegularExpression::CaseInsensitiveOption); + QString body = rx.match(d->text).captured(1); - return body.remove(QRegExp(QStringLiteral("<[^>]*>"))).trimmed().toHtmlEscaped(); + return body.remove(QRegularExpression(QStringLiteral("<[^>]*>"))).trimmed().toHtmlEscaped(); } QVector &NoteMessageWrapper::attachments() @@ -570,7 +561,7 @@ QVector &NoteMessageWrapper: return d->attachments; } -QMap< QString, QString > &NoteMessageWrapper::custom() +QMap &NoteMessageWrapper::custom() { Q_D(NoteMessageWrapper); return d->custom; @@ -586,5 +577,5 @@ QString noteMimeType() return QStringLiteral("text/x-vnd.akonadi.note"); } -} //End Namespace -} //End Namespace +} // End Namespace +} // End Namespace diff -pruN 4:20.08.3-1/src/noteutils.h 4:21.04.0-0ubuntu1/src/noteutils.h --- 4:20.08.3-1/src/noteutils.h 2020-10-10 19:56:55.000000000 +0000 +++ 4:21.04.0-0ubuntu1/src/noteutils.h 2021-04-11 11:08:47.000000000 +0000 @@ -9,12 +9,12 @@ #include "akonadi-notes_export.h" -#include #include +#include class QDateTime; class QString; -template class QSharedPointer; +template class QSharedPointer; namespace KMime { @@ -25,23 +25,22 @@ namespace Akonadi { namespace NoteUtils { - /** -* @return mimetype for notes -* @since 4.8 -*/ + * @return mimetype for notes + * @since 4.8 + */ AKONADI_NOTES_EXPORT QString noteMimeType(); /** -* @return icon for notes -* @since 4.8 -*/ + * @return icon for notes + * @since 4.8 + */ AKONADI_NOTES_EXPORT QString noteIconName(); /** -* An attachment for a note -* @since 4.9 -*/ + * An attachment for a note + * @since 4.9 + */ class AKONADI_NOTES_EXPORT Attachment { public: @@ -86,7 +85,7 @@ public: */ QString contentID() const; - /** + /** * Set this to true if inline data provided via ctor * is alredy base64 encoded. Default value is false. * @@ -101,7 +100,7 @@ public: */ bool dataBase64Encoded() const; - /** + /** * Returns the mimetype */ QString mimetype() const; @@ -115,6 +114,7 @@ public: * Returns the label of the attachment */ QString label() const; + private: //@cond PRIVATE class AttachmentPrivate; @@ -124,43 +124,43 @@ private: }; /** -* A convenience wrapper around KMime::MessagePtr for notes -* -* This is the format used by the Akonotes Resource -* -* A note has the following properties: -* uid: globally unique identifier (generated if empty) -* creationDate: timestamp when the note was created (generated if empty) -* lastModified: lastModified (generated if empty) -* classification: one of private, confidential, public. This is only meant as an indication to the user. -* title: title of the note -* text: textual content -* from: author (generated if empty) -* attachments: inline or url only -* custom: key value pair for custom values -* -* Reading a note from an Akonotes akonadi item: -* @code -* if ( item.hasPayload() ) { -* NoteUtils::NoteMessageWrapper note(item.payload()); -* qCDebug(AKONADINOTES_LOG) << note.text(); -* textIsRich = messageWrapper.textFormat() == Qt::RichText; -* } -* @endcode -* -* Setting the note as payload of an akonadi Item -* @code -* item.setMimeType(NoteUtils::noteMimeType()); -* NoteUtils::NoteMessageWrapper note; -* note.setTitle( "title" ); -* note.setText( "text" ); -* note.setFrom( QString::fromLatin1( "MyApplication@kde4" ) ); -* item.setPayload( note.message() ); -* @endcode -* -* @author Christian Mollekopf -* @since 4.8 -*/ + * A convenience wrapper around KMime::MessagePtr for notes + * + * This is the format used by the Akonotes Resource + * + * A note has the following properties: + * uid: globally unique identifier (generated if empty) + * creationDate: timestamp when the note was created (generated if empty) + * lastModified: lastModified (generated if empty) + * classification: one of private, confidential, public. This is only meant as an indication to the user. + * title: title of the note + * text: textual content + * from: author (generated if empty) + * attachments: inline or url only + * custom: key value pair for custom values + * + * Reading a note from an Akonotes akonadi item: + * @code + * if ( item.hasPayload() ) { + * NoteUtils::NoteMessageWrapper note(item.payload()); + * qCDebug(AKONADINOTES_LOG) << note.text(); + * textIsRich = messageWrapper.textFormat() == Qt::RichText; + * } + * @endcode + * + * Setting the note as payload of an akonadi Item + * @code + * item.setMimeType(NoteUtils::noteMimeType()); + * NoteUtils::NoteMessageWrapper note; + * note.setTitle( "title" ); + * note.setText( "text" ); + * note.setFrom( QString::fromLatin1( "MyApplication@kde4" ) ); + * item.setPayload( note.message() ); + * @endcode + * + * @author Christian Mollekopf + * @since 4.8 + */ class AKONADI_NOTES_EXPORT NoteMessageWrapper { public: @@ -169,112 +169,108 @@ public: ~NoteMessageWrapper(); /** - * Set the uid of the note - * @param uid should be globally unique - */ + * Set the uid of the note + * @param uid should be globally unique + */ void setUid(const QString &uid); /** - * Returns the uid of the note - */ + * Returns the uid of the note + */ QString uid() const; - enum Classification { - Public, - Private, - Confidential - }; + enum Classification { Public, Private, Confidential }; /** - * Set the classification of the note - */ + * Set the classification of the note + */ void setClassification(Classification); /** - * Returns the classification of the note - */ + * Returns the classification of the note + */ Classification classification() const; /** - * Set the title of the note - */ + * Set the title of the note + */ void setTitle(const QString &title); /** - * Returns the title of the note - */ + * Returns the title of the note + */ QString title() const; /** - * Set the text of the note - * - * @param format only Qt::PlainText and Qt::RichText is supported - */ + * Set the text of the note + * + * @param format only Qt::PlainText and Qt::RichText is supported + */ void setText(const QString &text, Qt::TextFormat format = Qt::PlainText); /** - * Returns the text of the note - */ + * Returns the text of the note + */ QString text() const; /** - * @return Qt::PlainText or Qt::RichText - */ + * @return Qt::PlainText or Qt::RichText + */ Qt::TextFormat textFormat() const; /** - * @return plaintext version of the text (if richtext) - */ + * @return plaintext version of the text (if richtext) + */ QString toPlainText() const; /** - * Set the creation date of the note (stored in the mime header) - */ + * Set the creation date of the note (stored in the mime header) + */ void setCreationDate(const QDateTime &creationDate); /** - * Returns the creation date of the note - */ + * Returns the creation date of the note + */ QDateTime creationDate() const; /** - * Set the lastModified-date of the note - */ + * Set the lastModified-date of the note + */ void setLastModifiedDate(const QDateTime &lastModifiedDate); /** - * Returns the lastModified-date of the note - */ + * Returns the lastModified-date of the note + */ QDateTime lastModifiedDate() const; /** - * Set the origin (creator) of the note (stored in the mime header) - * This is usually the application creating the note. - * @param from must be an address in the style of foo@kde.org. - */ + * Set the origin (creator) of the note (stored in the mime header) + * This is usually the application creating the note. + * @param from must be an address in the style of foo@kde.org. + */ void setFrom(const QString &from); /** - * Returns the origin (creator) of the note - */ + * Returns the origin (creator) of the note + */ QString from() const; /** - * Returns a reference to the list of attachments of the note - */ + * Returns a reference to the list of attachments of the note + */ QVector &attachments(); /** - * Returns a reference to the custom-value map - * @return key-value map containing all custom values - */ + * Returns a reference to the custom-value map + * @return key-value map containing all custom values + */ QMap &custom(); /** - * Assemble a KMime message with the given values - * - * The message can then i.e. be stored inside an akonadi item - */ + * Assemble a KMime message with the given values + * + * The message can then i.e. be stored inside an akonadi item + */ KMime::MessagePtr message() const; private: