Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2020-08-12 12:24:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Wed Aug 12 12:24:02 2020 rev:63 rq:825079 version:5.73.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2020-07-14 07:53:51.040732987 +0200 +++ /work/SRC/openSUSE:Factory/.kholidays.new.3399/kholidays.changes 2020-08-12 12:28:33.424177566 +0200 @@ -1,0 +2,11 @@ +Sun Aug 2 07:13:25 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.73.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.73.0 +- Changes since 5.72.0: + * Use Qt's categorized logging, install kholidays.categories file + * Use camelcase include. (scripted) + +------------------------------------------------------------------- Old: ---- kholidays-5.72.0.tar.xz kholidays-5.72.0.tar.xz.sig New: ---- kholidays-5.73.0.tar.xz kholidays-5.73.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.rOrmNz/_old 2020-08-12 12:28:34.364177538 +0200 +++ /var/tmp/diff_new_pack.rOrmNz/_new 2020-08-12 12:28:34.364177538 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Holidays5 -%define _tar_path 5.72 +%define _tar_path 5.73 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kholidays -Version: 5.72.0 +Version: 5.73.0 Release: 0 Summary: Holiday calculation library License: LGPL-2.1-or-later @@ -91,6 +91,7 @@ %license LICENSES/* %dir %{_kf5_qmldir}/org %dir %{_kf5_qmldir}/org/kde +%{_kf5_debugdir}/kholidays.categories %{_kf5_libdir}/libKF5Holidays.so.* %{_kf5_qmldir}/org/kde/kholidays/ ++++++ kholidays-5.72.0.tar.xz -> kholidays-5.73.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.72.0/CMakeLists.txt new/kholidays-5.73.0/CMakeLists.txt --- old/kholidays-5.72.0/CMakeLists.txt 2020-07-04 15:13:10.000000000 +0200 +++ new/kholidays-5.73.0/CMakeLists.txt 2020-08-01 21:47:10.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.72.0") +set(KF5_VERSION "5.73.0") project(KHolidays VERSION ${KF5_VERSION}) -find_package(ECM 5.72.0 REQUIRED NO_MODULE) +find_package(ECM 5.73.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) set(CMAKE_AUTORCC ON) @@ -17,6 +17,7 @@ include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMCoverageOption) +include(ECMQtDeclareLoggingCategory) include(ECMAddQch) include(ECMGeneratePriFile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.72.0/po/da/libkholidays5_qt.po new/kholidays-5.73.0/po/da/libkholidays5_qt.po --- old/kholidays-5.72.0/po/da/libkholidays5_qt.po 2020-07-04 15:13:10.000000000 +0200 +++ new/kholidays-5.73.0/po/da/libkholidays5_qt.po 2020-08-01 21:47:10.000000000 +0200 @@ -3,20 +3,20 @@ # # Erik Kjær Pedersen <e...@binghamton.edu>, 2005. # Jan Madsen <jan.madsen...@gmail.com>, 2008. -# Martin Schlander <mschlan...@opensuse.org>, 2009, 2010, 2012, 2014, 2015. +# Martin Schlander <mschlan...@opensuse.org>, 2009, 2010, 2012, 2014, 2015, 2020. msgid "" msgstr "" "Project-Id-Version: libkholidays\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2015-06-13 09:34+0000\n" -"PO-Revision-Date: 2015-12-08 18:45+0100\n" +"PO-Revision-Date: 2020-07-27 17:43+0200\n" "Last-Translator: Martin Schlander <mschlan...@opensuse.org>\n" -"Language-Team: Danish <da...@dansk-gruppen.dk>\n" +"Language-Team: Danish <kde-i18n-...@kde.org>\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.04.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" @@ -46,77 +46,74 @@ msgstr "Quebec" #: holidayregion.cpp:882 -#, fuzzy -#| msgctxt "HolidayRegion|German region" -#| msgid "Bavaria" msgctxt "HolidayRegion|German region" msgid "Germany, Bavaria" -msgstr "Bayern" +msgstr "Tyskland, Bayern" #: holidayregion.cpp:884 msgctxt "HolidayRegion|German region" msgid "Germany, Brandenburg" -msgstr "" +msgstr "Tyskland, Brandenburg" #: holidayregion.cpp:886 msgctxt "HolidayRegion|German region" msgid "Germany, Berlin" -msgstr "" +msgstr "Tyskland, Berlin" #: holidayregion.cpp:888 msgctxt "HolidayRegion|German region" msgid "Germany, Baden-Wuerttemberg" -msgstr "" +msgstr "Tyskland, Baden-Württemberg" #: holidayregion.cpp:890 msgctxt "HolidayRegion|German region" msgid "Germany, Hesse" -msgstr "" +msgstr "Tyskland, Hesse" #: holidayregion.cpp:892 msgctxt "HolidayRegion|German region" msgid "Germany, Mecklenburg-Hither Pomerania" -msgstr "" +msgstr "Tyskland, Mecklenburg-Vorpommern" #: holidayregion.cpp:894 msgctxt "HolidayRegion|German region" msgid "Germany, Lower Saxony" -msgstr "" +msgstr "Tyskland, Niedersachsen" #: holidayregion.cpp:896 msgctxt "HolidayRegion|German region" msgid "Germany, North Rhine-Westphalia" -msgstr "" +msgstr "Tyskland, Nordrhein-westfalen" #: holidayregion.cpp:898 msgctxt "HolidayRegion|German region" msgid "Germany, Rhineland-Palatinate" -msgstr "" +msgstr "Tyskland, Rheinland-Pfalz" #: holidayregion.cpp:900 msgctxt "HolidayRegion|German region" msgid "Germany, Schleswig-Holstein" -msgstr "" +msgstr "Tyskland, Slesvig-Holsten" #: holidayregion.cpp:902 msgctxt "HolidayRegion|German region" msgid "Germany, Saarland" -msgstr "" +msgstr "Tyskland, Saarland" #: holidayregion.cpp:904 msgctxt "HolidayRegion|German region" msgid "Germany, Saxony" -msgstr "" +msgstr "Tyskland, Sachsen" #: holidayregion.cpp:906 msgctxt "HolidayRegion|German region" msgid "Germany, Saxony-Anhalt" -msgstr "" +msgstr "Tyskland, Sachsen-Anhalt" #: holidayregion.cpp:908 msgctxt "HolidayRegion|German region" msgid "Germany, Thuringia" -msgstr "" +msgstr "Tyskland, Thüringen" #: holidayregion.cpp:911 msgctxt "HolidayRegion|Spanish region" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.72.0/po/zh_CN/libkholidays5_qt.po new/kholidays-5.73.0/po/zh_CN/libkholidays5_qt.po --- old/kholidays-5.72.0/po/zh_CN/libkholidays5_qt.po 2020-07-04 15:13:10.000000000 +0200 +++ new/kholidays-5.73.0/po/zh_CN/libkholidays5_qt.po 2020-08-01 21:47:10.000000000 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2020-06-24 08:00\n" +"PO-Revision-Date: 2020-07-31 15:01\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.72.0/src/CMakeLists.txt new/kholidays-5.73.0/src/CMakeLists.txt --- old/kholidays-5.72.0/src/CMakeLists.txt 2020-07-04 15:13:10.000000000 +0200 +++ new/kholidays-5.73.0/src/CMakeLists.txt 2020-08-01 21:47:10.000000000 +0200 @@ -24,6 +24,14 @@ ../holidays/holidays.qrc ) +ecm_qt_declare_logging_category(kholidays_SRCS + HEADER kholidays_debug.h + IDENTIFIER KHOLIDAYS_LOG + CATEGORY_NAME kf.holidays + DESCRIPTION "KHolidays" + EXPORT KHOLIDAYS +) + add_library(KF5Holidays ${kholidays_SRCS}) generate_export_header(KF5Holidays BASE_NAME KHolidays) @@ -102,3 +110,9 @@ install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) add_subdirectory(declarative) + +ecm_qt_install_logging_categories( + EXPORT KHOLIDAYS + FILE kholidays.categories + DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}" +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.72.0/src/parsers/holidayparserdriver.cpp new/kholidays-5.73.0/src/parsers/holidayparserdriver.cpp --- old/kholidays-5.72.0/src/parsers/holidayparserdriver.cpp 2020-07-04 15:13:10.000000000 +0200 +++ new/kholidays-5.73.0/src/parsers/holidayparserdriver.cpp 2020-08-01 21:47:10.000000000 +0200 @@ -10,7 +10,7 @@ #include "holiday_p.h" #include "astroseasons.h" -#include <QDebug> +#include <kholidays_debug.h> using namespace KHolidays; @@ -91,7 +91,7 @@ void HolidayParserDriver::error(const QString &errorMessage) { - qDebug() << errorMessage; + qCDebug(KHOLIDAYS_LOG) << errorMessage; } void HolidayParserDriver::parse() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.72.0/src/parsers/plan2/holidayparserdriverplan.cpp new/kholidays-5.73.0/src/parsers/plan2/holidayparserdriverplan.cpp --- old/kholidays-5.72.0/src/parsers/plan2/holidayparserdriverplan.cpp 2020-07-04 15:13:10.000000000 +0200 +++ new/kholidays-5.73.0/src/parsers/plan2/holidayparserdriverplan.cpp 2020-08-01 21:47:10.000000000 +0200 @@ -22,8 +22,8 @@ #include "holidayscannerplan_p.h" #include "holidayparserplan.hpp" #include "holiday_p.h" +#include <kholidays_debug.h> -#include <QDebug> #include <QFileInfo> #include <sstream> @@ -70,12 +70,12 @@ Q_UNUSED(errorLocation); //std::cerr << errorLocation << " : " << errorMessage; //Doesn't work??? //qDebug() << errorLocation << " : " << errorMessage; //Doesn't work??? - qDebug() << errorMessage; + qCDebug(KHOLIDAYS_LOG) << errorMessage; } void HolidayParserDriverPlan::error(const QString &errorMessage) { - qDebug() << errorMessage; + qCDebug(KHOLIDAYS_LOG) << errorMessage; } void HolidayParserDriverPlan::parse() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.72.0/src/parsers/plan2/holidayscannerplan.cpp new/kholidays-5.73.0/src/parsers/plan2/holidayscannerplan.cpp --- old/kholidays-5.72.0/src/parsers/plan2/holidayscannerplan.cpp 2020-07-04 15:13:10.000000000 +0200 +++ new/kholidays-5.73.0/src/parsers/plan2/holidayscannerplan.cpp 2020-08-01 21:47:10.000000000 +0200 @@ -1312,7 +1312,7 @@ # include <limits.h> # include <string> -# include <qdebug.h> +# include <kholidays_debug.h> # include "holidayscannerplan_p.h" # include "holidayparserdriverplan_p.h" @@ -3737,7 +3737,7 @@ int HolidayScannerFlexLexer::yylex() { - qDebug() << "in HolidayScannerFlexLexer::yylex() !"; + qCDebug(KHOLIDAYS_LOG) << "in HolidayScannerFlexLexer::yylex() !"; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.72.0/src/parsers/plan2/holidayscannerplan.lpp new/kholidays-5.73.0/src/parsers/plan2/holidayscannerplan.lpp --- old/kholidays-5.72.0/src/parsers/plan2/holidayscannerplan.lpp 2020-07-04 15:13:10.000000000 +0200 +++ new/kholidays-5.73.0/src/parsers/plan2/holidayscannerplan.lpp 2020-08-01 21:47:10.000000000 +0200 @@ -18,7 +18,7 @@ # include <limits.h> # include <string> -# include <qdebug.h> +# include <kholidays_debug.h> # include "holidayscannerplan_p.h" # include "holidayparserdriverplan_p.h" @@ -338,7 +338,7 @@ int HolidayScannerFlexLexer::yylex() { - qDebug() << "in HolidayScannerFlexLexer::yylex() !"; + qCDebug(KHOLIDAYS_LOG) << "in HolidayScannerFlexLexer::yylex() !"; return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-5.72.0/src/parsers/qcalendarsystem.cpp new/kholidays-5.73.0/src/parsers/qcalendarsystem.cpp --- old/kholidays-5.72.0/src/parsers/qcalendarsystem.cpp 2020-07-04 15:13:10.000000000 +0200 +++ new/kholidays-5.73.0/src/parsers/qcalendarsystem.cpp 2020-08-01 21:47:10.000000000 +0200 @@ -8,11 +8,11 @@ #include "qcalendarsystem_p.h" +#include <kholidays_debug.h> + #include <QDate> #include <QSharedData> -#include "qdebug.h" - class QCalendarSystemPrivate : public QSharedData { public:
