diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/agent/CMakeLists.txt akonadi-search-19.08.3+p19.10+git20200328.1255/agent/CMakeLists.txt --- akonadi-search-19.08.3+p19.10+git20200311.1051/agent/CMakeLists.txt 2020-03-11 10:51:41.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/agent/CMakeLists.txt 2020-03-28 12:55:37.000000000 +0000 @@ -20,15 +20,11 @@ collectionupdatejob.cpp ) -if (ECM_VERSION VERSION_LESS "5.68.0") - ecm_qt_declare_logging_category(akonadi_indexing_agent_SRCS HEADER akonadi_indexer_agent_debug.h IDENTIFIER AKONADI_INDEXER_AGENT_LOG CATEGORY_NAME org.kde.pim.akonadi_indexer_agent) -else() - ecm_qt_declare_logging_category(akonadi_indexing_agent_SRCS HEADER akonadi_indexer_agent_debug.h IDENTIFIER AKONADI_INDEXER_AGENT_LOG CATEGORY_NAME org.kde.pim.akonadi_indexer_agent +ecm_qt_declare_logging_category(akonadi_indexing_agent_SRCS HEADER akonadi_indexer_agent_debug.h IDENTIFIER AKONADI_INDEXER_AGENT_LOG CATEGORY_NAME org.kde.pim.akonadi_indexer_agent DESCRIPTION "akonadisearch (akonadi indexer agent)" OLD_CATEGORY_NAMES log_akonadi_indexer_agent EXPORT AKONADISEARCH ) -endif() qt5_add_dbus_adaptor(akonadi_indexing_agent_SRCS org.freedesktop.Akonadi.Indexer.xml agent.h AkonadiIndexingAgent) diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/akonadiplugin/CMakeLists.txt akonadi-search-19.08.3+p19.10+git20200328.1255/akonadiplugin/CMakeLists.txt --- akonadi-search-19.08.3+p19.10+git20200311.1051/akonadiplugin/CMakeLists.txt 2020-03-11 10:51:41.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/akonadiplugin/CMakeLists.txt 2020-03-28 12:55:37.000000000 +0000 @@ -1,15 +1,11 @@ kde_enable_exceptions() set(akonadi_search_plugin_SRCS searchplugin.cpp) -if (ECM_VERSION VERSION_LESS "5.68.0") - ecm_qt_declare_logging_category(akonadi_search_plugin_SRCS HEADER akonadiplugin_indexer_debug.h IDENTIFIER AKONADIPLUGIN_INDEXER_LOG CATEGORY_NAME org.kde.pim.akonadiplugin_indexer) -else() - ecm_qt_declare_logging_category(akonadi_search_plugin_SRCS HEADER akonadiplugin_indexer_debug.h IDENTIFIER AKONADIPLUGIN_INDEXER_LOG CATEGORY_NAME org.kde.pim.akonadiplugin_indexer +ecm_qt_declare_logging_category(akonadi_search_plugin_SRCS HEADER akonadiplugin_indexer_debug.h IDENTIFIER AKONADIPLUGIN_INDEXER_LOG CATEGORY_NAME org.kde.pim.akonadiplugin_indexer DESCRIPTION "akonadisearch (akonadi plugin indexer)" OLD_CATEGORY_NAMES log_akonadiplugin_indexer EXPORT AKONADISEARCH ) -endif() add_library(akonadi_search_plugin diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/akonadi-search.categories akonadi-search-19.08.3+p19.10+git20200328.1255/akonadi-search.categories --- akonadi-search-19.08.3+p19.10+git20200311.1051/akonadi-search.categories 2020-03-11 10:51:41.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/akonadi-search.categories 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -org.kde.pim.akonadi_indexer_agent akonadisearch (akonadi indexer agent) IDENTIFIER [AKONADI_INDEXER_AGENT_LOG] -org.kde.pim.akonadiplugin_indexer akonadisearch (akonadi plugin indexer) IDENTIFIER [AKONADIPLUGIN_INDEXER_LOG] -org.kde.pim.akonadi_search_xapian akonadisearch (akonadi indexer xapian) IDENTIFIER [AKONADI_SEARCH_XAPIAN_LOG] -org.kde.pim.akonadi_krunner_plugin akonadisearch (akonadi plugin krunner) IDENTIFIER [AKONADI_KRUNNER_LOG] -org.kde.pim.akonadi_search_pim akonadisearch akonadisearch(akonadi pim lib) IDENTIFIER [AKONADI_SEARCH_PIM_LOG] -org.kde.pim.akonadi_search_core akonadisearch (akonadi core lib) IDENTIFIER [AKONADI_SEARCH_CORE_LOG] diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/akonadi-search.renamecategories akonadi-search-19.08.3+p19.10+git20200328.1255/akonadi-search.renamecategories --- akonadi-search-19.08.3+p19.10+git20200311.1051/akonadi-search.renamecategories 2020-03-11 10:51:41.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/akonadi-search.renamecategories 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -log_akonadi_indexer_agent org.kde.pim.akonadi_indexer_agent -log_akonadiplugin_indexer org.kde.pim.akonadiplugin_indexer -log_akonadi_search_xapian org.kde.pim.akonadi_search_xapian -log_akonadi_krunner_plugin org.kde.pim.akonadi_krunner_plugin -log_akonadi_search_pim org.kde.pim.akonadi_search_pim diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/CMakeLists.txt akonadi-search-19.08.3+p19.10+git20200328.1255/CMakeLists.txt --- akonadi-search-19.08.3+p19.10+git20200311.1051/CMakeLists.txt 2020-03-11 10:51:41.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/CMakeLists.txt 2020-03-28 12:55:37.000000000 +0000 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.13.80") +set(PIM_VERSION "5.14.40") project(AkonadiSearch VERSION ${PIM_VERSION}) # ECM setup @@ -31,9 +31,9 @@ set(AKONADISEARCH_VERSION ${PIM_VERSION}) -set(AKONADI_VERSION "5.13.40") -set(AKONADI_MIMELIB_VERSION "5.13.40") -set(KMIME_LIB_VERSION "5.13.40") +set(AKONADI_VERSION "5.13.80") +set(AKONADI_MIMELIB_VERSION "5.13.80") +set(KMIME_LIB_VERSION "5.13.80") set(QT_REQUIRED_VERSION "5.12.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Test) @@ -67,8 +67,8 @@ # Compiler flags add_definitions(-DTRANSLATION_DOMAIN=\"akonadi_search\") if (EXISTS "${CMAKE_SOURCE_DIR}/.git") - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) - add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000) + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400) endif() add_definitions(-DQT_NO_FOREACH) @@ -123,15 +123,11 @@ COMPONENT Devel ) -if (ECM_VERSION VERSION_LESS "5.68.0") - install(FILES akonadi-search.renamecategories akonadi-search.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -else () - ecm_qt_install_logging_categories( +ecm_qt_install_logging_categories( EXPORT AKONADISEARCH FILE akonadi-search.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} ) -endif() feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/core/CMakeLists.txt akonadi-search-19.08.3+p19.10+git20200328.1255/core/CMakeLists.txt --- akonadi-search-19.08.3+p19.10+git20200311.1051/core/CMakeLists.txt 2020-03-11 10:51:41.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/core/CMakeLists.txt 2020-03-28 12:55:37.000000000 +0000 @@ -7,14 +7,10 @@ resultiterator.cpp ) -if (ECM_VERSION VERSION_LESS "5.68.0") - ecm_qt_declare_logging_category(CORE_SRCS HEADER akonadi_search_core_debug.h IDENTIFIER AKONADI_SEARCH_CORE_LOG CATEGORY_NAME org.kde.pim.akonadi_search_core) -else() - ecm_qt_declare_logging_category(CORE_SRCS HEADER akonadi_search_core_debug.h IDENTIFIER AKONADI_SEARCH_CORE_LOG CATEGORY_NAME org.kde.pim.akonadi_search_core +ecm_qt_declare_logging_category(CORE_SRCS HEADER akonadi_search_core_debug.h IDENTIFIER AKONADI_SEARCH_CORE_LOG CATEGORY_NAME org.kde.pim.akonadi_search_core DESCRIPTION "akonadisearch (akonadi core lib)" EXPORT AKONADISEARCH ) -endif() diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/debian/changelog akonadi-search-19.08.3+p19.10+git20200328.1255/debian/changelog --- akonadi-search-19.08.3+p19.10+git20200311.1051/debian/changelog 2020-03-11 10:51:42.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/debian/changelog 2020-03-28 12:55:38.000000000 +0000 @@ -1,4 +1,4 @@ -akonadi-search (4:19.08.3+p19.10+git20200311.1051-0) eoan; urgency=high +akonadi-search (4:19.08.3+p19.10+git20200328.1255-0) eoan; urgency=high [ Rik Mills ] * Move qdebug categories files to new location. @@ -10,7 +10,13 @@ [ Kubuntu CI ] * Automatic Ubuntu CI Build - -- Kubuntu CI Wed, 11 Mar 2020 10:51:42 +0000 + -- Kubuntu CI Sat, 28 Mar 2020 12:55:38 +0000 + +akonadi-search (4:19.04.3-0ubuntu2) focal; urgency=medium + + * No-change rebuild for libgcc-s1 package name change. + + -- Matthias Klose Mon, 23 Mar 2020 19:15:20 +0100 akonadi-search (4:19.04.3-0ubuntu1) eoan; urgency=medium diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/lib/CMakeLists.txt akonadi-search-19.08.3+p19.10+git20200328.1255/lib/CMakeLists.txt --- akonadi-search-19.08.3+p19.10+git20200311.1051/lib/CMakeLists.txt 2020-03-11 10:51:41.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/lib/CMakeLists.txt 2020-03-28 12:55:37.000000000 +0000 @@ -16,15 +16,11 @@ ../search/email/agepostingsource.cpp ) -if (ECM_VERSION VERSION_LESS "5.68.0") - ecm_qt_declare_logging_category(AKONADI_SEARCH_PIM_LIB_SRCS HEADER akonadi_search_pim_debug.h IDENTIFIER AKONADI_SEARCH_PIM_LOG CATEGORY_NAME org.kde.pim.akonadi_search_pim) -else() - ecm_qt_declare_logging_category(AKONADI_SEARCH_PIM_LIB_SRCS HEADER akonadi_search_pim_debug.h IDENTIFIER AKONADI_SEARCH_PIM_LOG CATEGORY_NAME org.kde.pim.akonadi_search_pim +ecm_qt_declare_logging_category(AKONADI_SEARCH_PIM_LIB_SRCS HEADER akonadi_search_pim_debug.h IDENTIFIER AKONADI_SEARCH_PIM_LOG CATEGORY_NAME org.kde.pim.akonadi_search_pim DESCRIPTION "akonadisearch(akonadi pim lib)" OLD_CATEGORY_NAMES log_akonadi_search_pim EXPORT AKONADISEARCH ) -endif() add_library(KF5AkonadiSearchPIM ${AKONADI_SEARCH_PIM_LIB_SRCS}) diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/runner/CMakeLists.txt akonadi-search-19.08.3+p19.10+git20200328.1255/runner/CMakeLists.txt --- akonadi-search-19.08.3+p19.10+git20200311.1051/runner/CMakeLists.txt 2020-03-11 10:51:41.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/runner/CMakeLists.txt 2020-03-28 12:55:37.000000000 +0000 @@ -1,18 +1,11 @@ -if (ECM_VERSION VERSION_LESS "5.68.0") - ecm_qt_declare_logging_category(pimcontactsrunner_DEBUG HEADER akonadi_runner_debug.h - IDENTIFIER AKONADI_KRUNNER_LOG - CATEGORY_NAME org.kde.pim.akonadi_krunner_plugin - ) -else() - ecm_qt_declare_logging_category(pimcontactsrunner_DEBUG HEADER akonadi_runner_debug.h +ecm_qt_declare_logging_category(pimcontactsrunner_DEBUG HEADER akonadi_runner_debug.h IDENTIFIER AKONADI_KRUNNER_LOG CATEGORY_NAME org.kde.pim.akonadi_krunner_plugin DESCRIPTION "akonadisearch (akonadi plugin krunner)" OLD_CATEGORY_NAMES log_akonadi_krunner_plugin EXPORT AKONADISEARCH ) -endif() set(pimcontactsrunner_SRCS diff -Nru akonadi-search-19.08.3+p19.10+git20200311.1051/xapian/CMakeLists.txt akonadi-search-19.08.3+p19.10+git20200328.1255/xapian/CMakeLists.txt --- akonadi-search-19.08.3+p19.10+git20200311.1051/xapian/CMakeLists.txt 2020-03-11 10:51:41.000000000 +0000 +++ akonadi-search-19.08.3+p19.10+git20200328.1255/xapian/CMakeLists.txt 2020-03-28 12:55:37.000000000 +0000 @@ -8,15 +8,11 @@ xapianqueryparser.cpp ) -if (ECM_VERSION VERSION_LESS "5.68.0") - ecm_qt_declare_logging_category(XAPIAN_SRCS HEADER akonadi_search_xapian_debug.h IDENTIFIER AKONADI_SEARCH_XAPIAN_LOG CATEGORY_NAME org.kde.pim.akonadi_search_xapian) -else() - ecm_qt_declare_logging_category(XAPIAN_SRCS HEADER akonadi_search_xapian_debug.h IDENTIFIER AKONADI_SEARCH_XAPIAN_LOG CATEGORY_NAME org.kde.pim.akonadi_search_xapian +ecm_qt_declare_logging_category(XAPIAN_SRCS HEADER akonadi_search_xapian_debug.h IDENTIFIER AKONADI_SEARCH_XAPIAN_LOG CATEGORY_NAME org.kde.pim.akonadi_search_xapian DESCRIPTION "akonadisearch (akonadi indexer xapian)" OLD_CATEGORY_NAMES log_akonadi_search_xapian EXPORT AKONADISEARCH ) -endif() add_library(KF5AkonadiSearchXapian ${XAPIAN_SRCS})