Hello community, here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2017-08-24 17:44:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kholidays (Old) and /work/SRC/openSUSE:Factory/.kholidays.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays" Thu Aug 24 17:44:46 2017 rev:25 rq:516368 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2017-07-25 11:29:27.093078418 +0200 +++ /work/SRC/openSUSE:Factory/.kholidays.new/kholidays.changes 2017-08-24 17:44:46.404868625 +0200 @@ -1,0 +2,24 @@ +Fri Aug 11 22:45:32 UTC 2017 - [email protected] + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Revert "Update Turkish Holiday File (EN and TR)" + * Update Turkish Holiday File (EN and TR) Differential Revision: https://phabricator.kde.org/D6009 + * Update Japanese holidays + * Port qSort + * Add .gitignore + * Activate by default QT_NO_NARROWING_CONVERSIONS_IN_CONNECT + * Const'ify + * Adding Cameroon Holidays + +------------------------------------------------------------------- +Sat Aug 5 18:17:50 UTC 2017 - [email protected] + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kholidays-17.04.3.tar.xz New: ---- kholidays-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kholidays.spec ++++++ --- /var/tmp/diff_new_pack.226xrH/_old 2017-08-24 17:44:47.040779056 +0200 +++ /var/tmp/diff_new_pack.226xrH/_new 2017-08-24 17:44:47.040779056 +0200 @@ -19,10 +19,10 @@ %bcond_without lang Name: kholidays -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Holiday API for KDE PIM License: LGPL-2.1+ @@ -35,7 +35,9 @@ BuildRequires: cmake(Qt5LinguistTools) BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 BuildRequires: pkgconfig(Qt5Qml) >= 5.4.0 +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -85,18 +87,18 @@ %files -n libKF5Holidays5 %defattr(-,root,root) %doc COPYING.LIB -%{_kf5_datadir}/libkholidays/ -%{_kf5_libdir}/libKF5Holidays.so.* %dir %{_kf5_qmldir}/org %dir %{_kf5_qmldir}/org/kde +%{_kf5_datadir}/libkholidays/ +%{_kf5_libdir}/libKF5Holidays.so.* %{_kf5_qmldir}/org/kde/kholidays/ %files devel %defattr(-,root,root) %doc COPYING.LIB +%{_kf5_cmakedir}/KF5Holidays/ %{_kf5_includedir}/KHolidays/ %{_kf5_includedir}/kholidays_version.h -%{_kf5_libdir}/cmake/KF5Holidays/ %{_kf5_libdir}/libKF5Holidays.so %{_kf5_mkspecsdir}/qt_KHolidays.pri ++++++ kholidays-17.04.3.tar.xz -> kholidays-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/.gitignore new/kholidays-17.08.0/.gitignore --- old/kholidays-17.04.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-17.08.0/.gitignore 2017-08-04 20:50:16.000000000 +0200 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/CMakeLists.txt new/kholidays-17.08.0/CMakeLists.txt --- old/kholidays-17.04.3/CMakeLists.txt 2017-07-11 02:26:04.000000000 +0200 +++ new/kholidays-17.08.0/CMakeLists.txt 2017-08-11 02:49:43.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.5.3") +set(PIM_VERSION "5.6.0") project(KHolidays VERSION ${PIM_VERSION}) # ECM setup -set(KF5_VERSION "5.32.0") +set(KF5_VERSION "5.35.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -31,10 +31,11 @@ ) ########### Find packages ########### -set(REQUIRED_QT_VERSION 5.6.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Qml) +set(QT_REQUIRED_VERSION 5.7.0) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml) remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII) +add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) ########### Targets ########### add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/autotests/testholidayregion.h new/kholidays-17.08.0/autotests/testholidayregion.h --- old/kholidays-17.04.3/autotests/testholidayregion.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/autotests/testholidayregion.h 2017-08-04 20:50:16.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TESTHOLIDAYREGION_H #define TESTHOLIDAYREGION_H -#include <QtCore/QObject> +#include <QObject> #include "holidayregion.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/autotests/testlunar.h new/kholidays-17.08.0/autotests/testlunar.h --- old/kholidays-17.04.3/autotests/testlunar.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/autotests/testlunar.h 2017-08-04 20:50:16.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TESTLUNAR_H #define TESTLUNAR_H -#include <QtCore/QObject> +#include <QObject> class LunarTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/autotests/testseasons.h new/kholidays-17.08.0/autotests/testseasons.h --- old/kholidays-17.04.3/autotests/testseasons.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/autotests/testseasons.h 2017-08-04 20:50:16.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TESTSEASONS_H #define TESTSEASONS_H -#include <QtCore/QObject> +#include <QObject> class SeasonsTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/autotests/testsunriseset.h new/kholidays-17.08.0/autotests/testsunriseset.h --- old/kholidays-17.04.3/autotests/testsunriseset.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/autotests/testsunriseset.h 2017-08-04 20:50:16.000000000 +0200 @@ -22,7 +22,7 @@ #ifndef TESTSUNRISE_H #define TESTSUNRISE_H -#include <QtCore/QObject> +#include <QObject> class SunriseTest : public QObject { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/holidays/plan2/holiday_cm_en new/kholidays-17.08.0/holidays/plan2/holiday_cm_en --- old/kholidays-17.04.3/holidays/plan2/holiday_cm_en 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-17.08.0/holidays/plan2/holiday_cm_en 2017-08-04 20:50:16.000000000 +0200 @@ -0,0 +1,62 @@ +:: +:: Country: Cameroon +:: +:: Language: English +:: +:: Author: Sébastien Demanou <[email protected]> +:: +:: Updated: 2016-03-26 +:: +:: Source: http://www.minfopra.gov.cm/textes/REPARATIONS/LOI%20N%C2%B0%2073-5%20DU%207%20DEC%201973.pdf +:: http://www.mintour.gov.cm/infos-pratiques/fetes-legales-et-feries/ +:: https://yaounde.usembassy.gov/holidays.html +:: http://www.ambafrance-cm.org/Histoire-du-Cameroon +:: https://www.francophonie.org/Statut-et-date-d-adhesion-des.html +:: +:: Missing: Missing muslim religious holidays due to their indeterminate date +:: + +:: Metadata +country "CM" +language "en" +:name "optional - defaults to country name" +: "National holiday file for Cameroon" +description "National holiday file for Cameroon" + +:: Public Holidays +"New Year's Day" public on january 1 +"Women's Day" public cultural on march 8 +"Labor Day" public on may 1 +"Youth Day" public cultural on february 11 +"National Day" public on may 20 + +:: Religious Holidays +"Easter Day" public religious on easter length 1 day +"Ascension Day" public religious on easter plus 39 days +"Pentecost Day" public religious on easter plus 49 days length 2 days +"Assumption Day" public religious on august 15 +"All Saints Day" public religious on november 1 +"Christmas Day" public religious on december 25 +"Epiphany Day" religious on first sunday in january +"Ash Wednesday" public religious on easter minus 46 days +"Good Friday" religious on easter minus 2 days +"Halloween" religious on november 2 + +:: Historical Dates +"Independence Day" historical on 1.1.1960 +"Adoption of the Constitution of Cameroon" historical on 21.2.1960 +"Reunification of Cameroon" historical on 1.10.1961 +"Accession of Cameroon to the Commonwealth" historical on 1.11.1995 + +:: Financial + +:: Cultural +"Valentine's Day" cultural on february 14 + +:: School + +:: Daylight Saving + +:: Seasons + +:: Name Days diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/holidays/plan2/holiday_cm_fr new/kholidays-17.08.0/holidays/plan2/holiday_cm_fr --- old/kholidays-17.04.3/holidays/plan2/holiday_cm_fr 1970-01-01 01:00:00.000000000 +0100 +++ new/kholidays-17.08.0/holidays/plan2/holiday_cm_fr 2017-08-04 20:50:16.000000000 +0200 @@ -0,0 +1,62 @@ +:: +:: Country: Cameroun +:: +:: Language: French +:: +:: Author: Sébastien Demanou <[email protected]> +:: +:: Updated: 2016-03-26 +:: +:: Source: http://www.minfopra.gov.cm/textes/REPARATIONS/LOI%20N%C2%B0%2073-5%20DU%207%20DEC%201973.pdf +:: http://www.mintour.gov.cm/infos-pratiques/fetes-legales-et-feries/ +:: https://french.yaounde.usembassy.gov/holidays-fr.html +:: http://www.ambafrance-cm.org/Histoire-du-Cameroun +:: https://www.francophonie.org/Statut-et-date-d-adhesion-des.html +:: +:: Missing: Missing muslim religious holidays due to their indeterminate date +:: + +:: Metadata +country "CM" +language "fr" +:name "optional - defaults to country name" +: "National holiday file for Cameroun" +description "Fêtes et jours fériés au Cameroun" + +:: Public Holidays +"Jour de l'an" public on january 1 +"Journée de la femme" public cultural on march 8 +"Fête du Travail" public on may 1 +"Fête de la Jeunesse" public cultural on february 11 +"Fête Nationale" public on may 20 + +:: Religious Holidays +"Pâques" public religious on easter length 1 day +"Ascension" public religious on easter plus 39 days +"Pentecôte" public religious on easter plus 49 days length 2 days +"Assomption" public religious on august 15 +"Toussaint" public religious on november 1 +"Noël" public religious on december 25 +"Épiphanie" religious on first sunday in january +"Mercredi des Cendres" public religious on easter minus 46 days +"Vendredi Saint" religious on easter minus 2 days +"Fête des morts" religious on november 2 + +:: Historical Dates +"Jour de l'indépendance du Cameroun" historical on 1.1.1960 +"Adoption de la Constitution du Cameroun" historical on 21.2.1960 +"Réunification du Cameroun" historical on 1.10.1961 +"Adhésion du Cameroun au Commonwealth" historical on 1.11.1995 + +:: Financial + +:: Cultural +"St Valentin" cultural on february 14 + +:: School + +:: Daylight Saving + +:: Seasons + +:: Name Days diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/holidays/plan2/holiday_jp_en-us new/kholidays-17.08.0/holidays/plan2/holiday_jp_en-us --- old/kholidays-17.04.3/holidays/plan2/holiday_jp_en-us 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/holidays/plan2/holiday_jp_en-us 2017-08-04 20:50:16.000000000 +0200 @@ -2,12 +2,17 @@ :: Country: Japan :: :: Author: Toyohiro Asukai <[email protected]> +:: Jumpei Ogawa <[email protected]> :: :: Language: English :: -:: Updated: 2004-11-16 +:: Updated: 2017-05-07 :: -:: Source: +:: Source: http://www8.cao.go.jp/chosei/shukujitsu/gaiyou.html +:: http://www.nao.ac.jp/faq/a0301.html +:: +:: Note: On each Februaries, Vernal and Autumnal Equinox Days of next year are announced by government. +:: Currently Equinox Days on and after 2019 are expected dates and may be changed. :: :: Metadata @@ -18,50 +23,110 @@ :: Public Holidays "New Year's Day" public on january 1 -"Coming of Age" public on second monday in january +"Coming of Age Day" public on second monday in january "National Foundation Day" public on february 11 -"Vernal Equinox Day" public on 20.3.2005 -"Vernal Equinox Day" public on 21.3.2006 -"Vernal Equinox Day" public on 21.3.2007 -"Vernal Equinox Day" public on 20.3.2008 -"Vernal Equinox Day" public on 20.3.2009 -"Vernal Equinox Day" public on 21.3.2010 -"Greenery Day" public on april 29 + +:: Equinox Days on and after 2019 are expected dates. See notes above. +"Vernal Equinox Day" public on march 20 2000 +"Vernal Equinox Day" public on march 20 2001 +"Vernal Equinox Day" public on march 21 2002 +"Vernal Equinox Day" public on march 21 2003 +"Vernal Equinox Day" public on march 20 2004 +"Vernal Equinox Day" public on march 20 2005 +"Vernal Equinox Day" public on march 21 2006 +"Vernal Equinox Day" public on march 21 2007 +"Vernal Equinox Day" public on march 20 2008 +"Vernal Equinox Day" public on march 20 2009 +"Vernal Equinox Day" public on march 21 2010 +"Vernal Equinox Day" public on march 21 2011 +"Vernal Equinox Day" public on march 20 2012 +"Vernal Equinox Day" public on march 20 2013 +"Vernal Equinox Day" public on march 21 2014 +"Vernal Equinox Day" public on march 21 2015 +"Vernal Equinox Day" public on march 20 2016 +"Vernal Equinox Day" public on march 20 2017 +"Vernal Equinox Day" public on march 21 2018 +"Vernal Equinox Day" public on march 21 2019 +"Vernal Equinox Day" public on march 20 2020 +"Vernal Equinox Day" public on march 20 2021 +"Vernal Equinox Day" public on march 21 2022 +"Vernal Equinox Day" public on march 21 2023 +"Vernal Equinox Day" public on march 20 2024 +"Vernal Equinox Day" public on march 20 2025 +"Vernal Equinox Day" public on march 20 2026 +"Vernal Equinox Day" public on march 21 2027 +"Vernal Equinox Day" public on march 20 2028 +"Vernal Equinox Day" public on march 20 2029 +"Vernal Equinox Day" public on march 20 2030 + +"Showa Day" public on april 29 "Constitution Day" public on may 3 -"Holiday" public on may 4 +"Greenery Day" public on may 4 "Children's Day" public on may 5 "Oceans' Day" public on third monday in july +"Mountain Day" public on august 11 "Respect for Senior Citizens Day" public on third monday in september -"Autumnal Equinox Day" public on september 23 + +:: Equinox Days on and after 2019 are expected dates. See notes above. +"Autumnal Equinox Day" public on september 23 2000 +"Autumnal Equinox Day" public on september 23 2001 +"Autumnal Equinox Day" public on september 23 2002 +"Autumnal Equinox Day" public on september 23 2003 +"Autumnal Equinox Day" public on september 23 2004 +"Autumnal Equinox Day" public on september 23 2005 +"Autumnal Equinox Day" public on september 23 2006 +"Autumnal Equinox Day" public on september 23 2007 +"Autumnal Equinox Day" public on september 23 2008 +"Autumnal Equinox Day" public on september 23 2009 +"Autumnal Equinox Day" public on september 23 2010 +"Autumnal Equinox Day" public on september 23 2011 +"Autumnal Equinox Day" public on september 22 2012 +"Autumnal Equinox Day" public on september 23 2013 +"Autumnal Equinox Day" public on september 23 2014 +"Autumnal Equinox Day" public on september 23 2015 +"Autumnal Equinox Day" public on september 22 2016 +"Autumnal Equinox Day" public on september 23 2017 +"Autumnal Equinox Day" public on september 23 2018 +"Autumnal Equinox Day" public on september 23 2019 +"Autumnal Equinox Day" public on september 22 2020 +"Autumnal Equinox Day" public on september 23 2021 +"Autumnal Equinox Day" public on september 23 2022 +"Autumnal Equinox Day" public on september 23 2023 +"Autumnal Equinox Day" public on september 22 2024 +"Autumnal Equinox Day" public on september 23 2025 +"Autumnal Equinox Day" public on september 23 2026 +"Autumnal Equinox Day" public on september 23 2027 +"Autumnal Equinox Day" public on september 22 2028 +"Autumnal Equinox Day" public on september 23 2029 +"Autumnal Equinox Day" public on september 23 2030 + "Sports Day" public on second monday in october "Culture Day" public on november 3 "Labor Thanksgiving Day" public on november 23 "The Emperor's Birthday" public on december 23 + :: If a "National Holiday" is on Sunday,the following day :: shall be a substitute holiday. -"Substitute holiday" public on 21.3.2005 -"Substitute holiday" public on 2.1.2006 -"Substitute holiday" public on 12.2.2007 -"Substitute holiday" public on 30.4.2007 -"Substitute holiday" public on 24.9.2007 -"Substitute holiday" public on 24.12.2007 -"Substitute holiday" public on 24.11.2008 -"Substitute holiday" public on 22.3.2010 +"Substitute holiday" public on march 21 2005 +"Substitute holiday" public on january 2 2006 +"Substitute holiday" public on february 12 2007 +"Substitute holiday" public on april 30 2007 +"Substitute holiday" public on september 24 2007 +"Substitute holiday" public on december 24 2007 +"Substitute holiday" public on november 24 2008 +"Substitute holiday" public on march 22 2010 +"Substitute holiday" public on march 21 2016 +"Substitute holiday" public on january 2 2017 +"Substitute holiday" public on february 12 2018 +"Substitute holiday" public on april 30 2018 +"Substitute holiday" public on september 24 2018 +"Substitute holiday" public on december 24 2018 :: Religious :: Financial :: Cultural -"St. Valentine's Day" cultural on february 14 -"Girls' Festival" cultural on march 3 -"Buddha's Birthday" cultural on april 8 -"May Day" cultural on may 1 -"Boys' Festival" cultural on may 5 -"Mother's Day" cultural on second sunday in may -"Father's Day" cultural on third sunday in june -"Festival of the Weaver Star" cultural on july 7 -"Christmas" cultural on december 25 :: School diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/holidays/plan2/holiday_jp_ja new/kholidays-17.08.0/holidays/plan2/holiday_jp_ja --- old/kholidays-17.04.3/holidays/plan2/holiday_jp_ja 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/holidays/plan2/holiday_jp_ja 2017-08-04 20:50:16.000000000 +0200 @@ -2,48 +2,115 @@ :: Country: Japan :: :: Author: Toyohiro Asukai <[email protected]> +:: Jumpei Ogawa <[email protected]> :: :: Language: Japanese :: -:: Updated: 2004-11-16 +:: Updated: 2017-05-07 :: -:: Source: +:: Source: http://www8.cao.go.jp/chosei/shukujitsu/gaiyou.html +:: http://www.nao.ac.jp/faq/a0301.html :: +:: Note: On each Februaries, Vernal and Autumnal Equinox Days of next year are announced by government. +:: Currently Equinox Days on and after 2019 are expected dates and may be changed. :: Metadata country "JP" language "ja" :name "optional - defaults to country name" -:description "(please add description in source language) National holiday file for Japan" +description "日本の国民の休日のファイルです。" :: Public Holidays :"New Year's Day" "元旦" public on january 1 -:"Coming of Age" +:"Coming of Age Day" "成人の日" public on second monday in january :"National Foundation Day" "建国記念日" public on february 11 + :"Vernal Equinox Day" -"春分の日" public on 20.3.2005 -"春分の日" public on 21.3.2006 -"春分の日" public on 21.3.2007 -"春分の日" public on 21.3.2008 -"春分の日" public on 21.3.2009 -"春分の日" public on 21.3.2010 -:"Greenery Day" -"みどりの日" public on april 29 +:: Equinox Days on and after 2019 are expected dates. See notes above. +"春分の日" public on march 20 2000 +"春分の日" public on march 20 2001 +"春分の日" public on march 21 2002 +"春分の日" public on march 21 2003 +"春分の日" public on march 20 2004 +"春分の日" public on march 20 2005 +"春分の日" public on march 21 2006 +"春分の日" public on march 21 2007 +"春分の日" public on march 20 2008 +"春分の日" public on march 20 2009 +"春分の日" public on march 21 2010 +"春分の日" public on march 21 2011 +"春分の日" public on march 20 2012 +"春分の日" public on march 20 2013 +"春分の日" public on march 21 2014 +"春分の日" public on march 21 2015 +"春分の日" public on march 20 2016 +"春分の日" public on march 20 2017 +"春分の日" public on march 21 2018 +"春分の日" public on march 21 2019 +"春分の日" public on march 20 2020 +"春分の日" public on march 20 2021 +"春分の日" public on march 21 2022 +"春分の日" public on march 21 2023 +"春分の日" public on march 20 2024 +"春分の日" public on march 20 2025 +"春分の日" public on march 20 2026 +"春分の日" public on march 21 2027 +"春分の日" public on march 20 2028 +"春分の日" public on march 20 2029 +"春分の日" public on march 20 2030 + +:"Showa Day" +"昭和の日" public on april 29 :"Constitution Day" "憲法記念日" public on may 3 -:"Holiday" -"休日" public on may 4 +:"Greenery Day" +"みどりの日" public on may 4 :"Children's Day" "こどもの日" public on may 5 :"Oceans' Day" "海の日" public on third monday in july +:"Mountain Day" +"山の日" public on august 11 :"Respect for Senior Citizens Day" "敬老の日" public on third monday in september + :"Autumnal Equinox Day" -"秋分の日" public on september 23 +:: Equinox Days on and after 2019 are expected dates. See notes above. +"秋分の日" public on september 23 2000 +"秋分の日" public on september 23 2001 +"秋分の日" public on september 23 2002 +"秋分の日" public on september 23 2003 +"秋分の日" public on september 23 2004 +"秋分の日" public on september 23 2005 +"秋分の日" public on september 23 2006 +"秋分の日" public on september 23 2007 +"秋分の日" public on september 23 2008 +"秋分の日" public on september 23 2009 +"秋分の日" public on september 23 2010 +"秋分の日" public on september 23 2011 +"秋分の日" public on september 22 2012 +"秋分の日" public on september 23 2013 +"秋分の日" public on september 23 2014 +"秋分の日" public on september 23 2015 +"秋分の日" public on september 22 2016 +"秋分の日" public on september 23 2017 +"秋分の日" public on september 23 2018 +"秋分の日" public on september 23 2019 +"秋分の日" public on september 22 2020 +"秋分の日" public on september 23 2021 +"秋分の日" public on september 23 2022 +"秋分の日" public on september 23 2023 +"秋分の日" public on september 22 2024 +"秋分の日" public on september 23 2025 +"秋分の日" public on september 23 2026 +"秋分の日" public on september 23 2027 +"秋分の日" public on september 22 2028 +"秋分の日" public on september 23 2029 +"秋分の日" public on september 23 2030 + :"Sports Day" "体育の日" public on second monday in october :"Culture Day" @@ -56,29 +123,26 @@ :: If a "National Holiday" is on Sunday,the following day :: shall be a substitute holiday. :"Substitute holiday" -"振替休日" public on 21.3.2005 -"振替休日" public on 2.1.2006 -"振替休日" public on 12.2.2007 -"振替休日" public on 30.4.2007 -"振替休日" public on 24.9.2007 -"振替休日" public on 24.12.2007 -"振替休日" public on 24.11.2008 -"振替休日" public on 22.3.2010 +"振替休日" public on march 21 2005 +"振替休日" public on january 2 2006 +"振替休日" public on february 12 2007 +"振替休日" public on april 30 2007 +"振替休日" public on september 24 2007 +"振替休日" public on december 24 2007 +"振替休日" public on november 24 2008 +"振替休日" public on march 22 2010 +"振替休日" public on march 21 2016 +"振替休日" public on january 2 2017 +"振替休日" public on february 12 2018 +"振替休日" public on april 30 2018 +"振替休日" public on september 24 2018 +"振替休日" public on december 24 2018 :: Religious :: Financial :: Cultural -:"St. Valentine's Day" cultural on february 14 -:"Girls' Festival" cultural on march 3 -:"Buddha's Birthday" cultural on april 8 -:"May Day" cultural on may 1 -:"Boys' Festival" cultural on may 5 -:"Mother's Day" cultural on second sunday in may -:"Father's Day" cultural on third sunday in june -:"Festival of the Weaver Star" cultural on july 7 -:"Christmas" cultural on december 25 :: School diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/poqm/bg/libkholidays5_qt.po new/kholidays-17.08.0/poqm/bg/libkholidays5_qt.po --- old/kholidays-17.04.3/poqm/bg/libkholidays5_qt.po 2017-07-11 02:26:03.000000000 +0200 +++ new/kholidays-17.08.0/poqm/bg/libkholidays5_qt.po 2017-08-11 02:49:42.000000000 +0200 @@ -1,8 +1,5 @@ -# translation of libkholidays.po to Bulgarian -# Bulgarian translation of KDE. -# This file is licensed under the GPL. -# -# $Id: libkholidays5_qt.po 1462030 2016-06-15 15:49:39Z ltoscano $ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. # # Yasen Pramatarov <[email protected]>, 2010, 2011, 2015. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/poqm/he/libkholidays5_qt.po new/kholidays-17.08.0/poqm/he/libkholidays5_qt.po --- old/kholidays-17.04.3/poqm/he/libkholidays5_qt.po 2017-07-11 02:26:03.000000000 +0200 +++ new/kholidays-17.08.0/poqm/he/libkholidays5_qt.po 2017-08-11 02:49:42.000000000 +0200 @@ -4,9 +4,6 @@ # Elkana Bardugo <[email protected]>, 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: libkholidays5_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-13 09:34+0000\n" "PO-Revision-Date: 2017-05-16 06:42-0400\n" "Last-Translator: Copied by Zanata <[email protected]>\n" "Language-Team: Hebrew <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/poqm/tr/libkholidays5_qt.po new/kholidays-17.08.0/poqm/tr/libkholidays5_qt.po --- old/kholidays-17.04.3/poqm/tr/libkholidays5_qt.po 2017-07-11 02:26:04.000000000 +0200 +++ new/kholidays-17.08.0/poqm/tr/libkholidays5_qt.po 2017-08-11 02:49:43.000000000 +0200 @@ -425,12 +425,12 @@ #~ "will be used for non-work days, Holiday Events that are not marked in the " #~ "Holiday Region as Days Off will continue to be work days.</p>" #~ msgstr "" -#~ "<p>Resmi tatiller gibi günleri gösterir ya da hesaplarken, Tatil bölgesini " -#~ "sadece bilgi amaçlı ya da kullanmak için seçebilirsiniz. Eğer Tatil " -#~ "Bölgelerini Boş Günler olarak olarak kullanmayı seçerseniz, sadece Tatil " -#~ "Bölgesinin Boş Günlerinde olarak işaretlenmiş Tatil Olayları iş dışı günler " -#~ "olarak kullanılacaktır, Tatil Bölgesinin Boş Günleri olarak gösterilmemiş " -#~ "olanlar iş günü olarak görünmeye devam edecektir.</p>" +#~ "<p>Resmi tatiller gibi günleri gösterir ya da hesaplarken, Tatil " +#~ "bölgesini sadece bilgi amaçlı ya da kullanmak için seçebilirsiniz. Eğer " +#~ "Tatil Bölgelerini Boş Günler olarak olarak kullanmayı seçerseniz, sadece " +#~ "Tatil Bölgesinin Boş Günlerinde olarak işaretlenmiş Tatil Olayları iş " +#~ "dışı günler olarak kullanılacaktır, Tatil Bölgesinin Boş Günleri olarak " +#~ "gösterilmemiş olanlar iş günü olarak görünmeye devam edecektir.</p>" #~ msgctxt "Combobox label, Holiday Region not used" #~ msgid "Not Used" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/poqm/zh_CN/libkholidays5_qt.po new/kholidays-17.08.0/poqm/zh_CN/libkholidays5_qt.po --- old/kholidays-17.04.3/poqm/zh_CN/libkholidays5_qt.po 2017-07-11 02:26:04.000000000 +0200 +++ new/kholidays-17.08.0/poqm/zh_CN/libkholidays5_qt.po 2017-08-11 02:49:43.000000000 +0200 @@ -1,23 +1,20 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Xuetian Weng <[email protected]>, 2014. -# Weng Xuetian <[email protected]>, 2014, 2015, 2016. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2015-06-13 09:34+0000\n" -"PO-Revision-Date: 2016-03-11 20:47-0800\n" -"Last-Translator: Weng Xuetian <[email protected]>\n" -"Language-Team: Chinese <[email protected]>\n" +"POT-Creation-Date: 2016-11-19 20:11+0100\n" +"PO-Revision-Date: 2017-07-13 11:17-0400\n" +"Last-Translator: guoyunhebrave <[email protected]>\n" +"Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" -"X-Qt-Contexts: true\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-trunk/messages/frameworks/baloo_file5.pot\n" #: astroseasons.cpp:38 msgctxt "AstroSeasons|" @@ -405,64 +402,3 @@ msgctxt "HolidayRegion|zodiac symbol for Pices" msgid "fish" msgstr "双鱼" - -#~ msgid "<p>Select to use Holiday Region</p>" -#~ msgstr "<p>选择要使用的节日地域</p>" - -#~ msgid "" -#~ "<p><b>Region:</b> %1<br/><b>Language:</b> %2<br/><b>Description:</b> %3</" -#~ "p>" -#~ msgstr "<p><b>地域：</b>%1<br/><b>语言：</b>%2<br/><b>描述：</b>%3</p>" - -#~ msgid "" -#~ "<p>You can choose to display the Holiday Region for information only, or " -#~ "to use the Holiday Region when displaying or calculating days off such as " -#~ "Public Holidays. If you choose to use the Holiday Region for Days Off, " -#~ "then only those Holiday Events marked in the Holiday Region as Days Off " -#~ "will be used for non-work days, Holiday Events that are not marked in the " -#~ "Holiday Region as Days Off will continue to be work days.</p>" -#~ msgstr "" -#~ "<p>您可以选择把节日地域用于显示额外信息，或者将节日地域的设置用于计算休息" -#~ "日，例如公共节日。如果您选择了将节日地域用于休息日，那么只有那些在节日地域" -#~ "中标记为休息日的节日事件将被用作非工作日，没有被标记为休息日的节日事件将继" -#~ "续保持为工作日。</p>" - -#~ msgctxt "Combobox label, Holiday Region not used" -#~ msgid "Not Used" -#~ msgstr "未使用" - -#~ msgctxt "Combobox label, use Holiday Region for information only" -#~ msgid "Information" -#~ msgstr "信息" - -#~ msgctxt "Combobox label, use Holiday Region for days off" -#~ msgid "Days Off" -#~ msgstr "休息日" - -#~ msgctxt "Header for Select column" -#~ msgid "Select" -#~ msgstr "选择" - -#~ msgid "<p>This column selects to use the Holiday Region</p>" -#~ msgstr "<p>此列选择使用节日地域</p>" - -#~ msgctxt "Header for Holiday Region column" -#~ msgid "Region" -#~ msgstr "地域" - -#~ msgid "<p>This column displays the name of the Holiday Region</p>" -#~ msgstr "<p>此列显示节日地域的名称</p>" - -#~ msgctxt "Header for Language column" -#~ msgid "Language" -#~ msgstr "语言" - -#~ msgid "<p>This column displays the language of the Holiday Region</p>" -#~ msgstr "<p>此列显示节日地域的语言</p>" - -#~ msgctxt "Header for Description column" -#~ msgid "Description" -#~ msgstr "描述" - -#~ msgid "<p>This column displays the description of the Holiday Region</p>" -#~ msgstr "<p>此列显示节日地域的描述</p>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/astroseasons.cpp new/kholidays-17.08.0/src/astroseasons.cpp --- old/kholidays-17.04.3/src/astroseasons.cpp 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/astroseasons.cpp 2017-08-04 20:50:16.000000000 +0200 @@ -21,8 +21,8 @@ #include "astroseasons.h" -#include <QtCore/QDate> -#include <QtCore/QCoreApplication> +#include <QDate> +#include <QCoreApplication> using namespace KHolidays; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/declarative/holidayregionsmodel.h new/kholidays-17.08.0/src/declarative/holidayregionsmodel.h --- old/kholidays-17.04.3/src/declarative/holidayregionsmodel.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/declarative/holidayregionsmodel.h 2017-08-04 20:50:16.000000000 +0200 @@ -37,9 +37,9 @@ explicit HolidayRegionsDeclarativeModel(QObject *parent = nullptr); virtual ~HolidayRegionsDeclarativeModel(); - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role) const override; + QHash<int, QByteArray> roleNames() const override; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/declarative/kholidaysdeclarativeplugin.h new/kholidays-17.08.0/src/declarative/kholidaysdeclarativeplugin.h --- old/kholidays-17.04.3/src/declarative/kholidaysdeclarativeplugin.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/declarative/kholidaysdeclarativeplugin.h 2017-08-04 20:50:16.000000000 +0200 @@ -29,7 +29,7 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - void registerTypes(const char *uri) Q_DECL_OVERRIDE; + void registerTypes(const char *uri) override; }; #endif // KHOLIDAYSDECLARATIVEPLUGIN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/holiday.cpp new/kholidays-17.08.0/src/holiday.cpp --- old/kholidays-17.04.3/src/holiday.cpp 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/holiday.cpp 2017-08-04 20:50:16.000000000 +0200 @@ -25,9 +25,9 @@ #include "holiday.h" #include "holiday_p.h" -#include <QtCore/QDateTime> -#include <QtCore/QFile> -#include <QtCore/QSharedData> +#include <QDateTime> +#include <QFile> +#include <QSharedData> using namespace KHolidays; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/holiday.h new/kholidays-17.08.0/src/holiday.h --- old/kholidays-17.04.3/src/holiday.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/holiday.h 2017-08-04 20:50:16.000000000 +0200 @@ -27,8 +27,8 @@ #include "kholidays_export.h" -#include <QtCore/QList> -#include <QtCore/QSharedDataPointer> +#include <QList> +#include <QSharedDataPointer> class QDate; class QString; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/holiday_p.h new/kholidays-17.08.0/src/holiday_p.h --- old/kholidays-17.04.3/src/holiday_p.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/holiday_p.h 2017-08-04 20:50:16.000000000 +0200 @@ -27,10 +27,10 @@ #include "holiday.h" -#include <QtCore/QDateTime> -#include <QtCore/QFile> -#include <QtCore/QLocale> -#include <QtCore/QSharedData> +#include <QDateTime> +#include <QFile> +#include <QLocale> +#include <QSharedData> namespace KHolidays { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/holidayregion.cpp new/kholidays-17.08.0/src/holidayregion.cpp --- old/kholidays-17.04.3/src/holidayregion.cpp 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/holidayregion.cpp 2017-08-04 20:50:16.000000000 +0200 @@ -24,13 +24,13 @@ #include "holidayregion.h" -#include <QtCore/QDateTime> -#include <QtCore/QDirIterator> -#include <QtCore/QFile> -#include <QtCore/QFileInfo> -#include <QtCore/QSharedData> -#include <QtCore/QStandardPaths> -#include <QtCore/QCoreApplication> +#include <QDateTime> +#include <QDirIterator> +#include <QFile> +#include <QFileInfo> +#include <QSharedData> +#include <QStandardPaths> +#include <QCoreApplication> #include "holiday_p.h" #include "parsers/plan2/holidayparserdriverplan_p.h" @@ -130,7 +130,7 @@ regionCodesList.append(filename.mid(filename.lastIndexOf(QLatin1String("holiday_")) + 8)); } - qSort(regionCodesList); + std::sort(regionCodesList.begin(), regionCodesList.end()); return regionCodesList; } @@ -408,12 +408,12 @@ localeLanguageCountry = localeLanguage.split(QLatin1Char('_')).at(1); } - QStringList regionList = KHolidays::HolidayRegion::regionCodes(); QString countryAndLanguageMatch, countryOnlyMatch, subdivisionAndLanguageMatch, subdivisionOnlyMatch, languageCountryAndLanguageMatch, languageCountryOnlyMatch, languageSubdivisionAndLanguageMatch, languageSubdivisionOnlyMatch; + const QStringList regionList = KHolidays::HolidayRegion::regionCodes(); foreach (const QString ®ionCode, regionList) { QString regionCountry = KHolidays::HolidayRegion::countryCode(regionCode).toLower(); QString regionSubdivisionCountry; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/holidayregion.h new/kholidays-17.08.0/src/holidayregion.h --- old/kholidays-17.04.3/src/holidayregion.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/holidayregion.h 2017-08-04 20:50:16.000000000 +0200 @@ -27,9 +27,9 @@ #include "kholidays_export.h" -#include <QtCore/QList> -#include <QtCore/QSharedDataPointer> -#include <QtCore/QString> +#include <QList> +#include <QSharedDataPointer> +#include <QString> #include "holiday.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/lunarphase.cpp new/kholidays-17.08.0/src/lunarphase.cpp --- old/kholidays-17.04.3/src/lunarphase.cpp 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/lunarphase.cpp 2017-08-04 20:50:16.000000000 +0200 @@ -25,8 +25,8 @@ #include "lunarphase.h" #include <config-kholidays.h> -#include <QtCore/QDateTime> -#include <QtCore/QCoreApplication> +#include <QDateTime> +#include <QCoreApplication> using namespace KHolidays; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/parsers/holidayparserdriver.cpp new/kholidays-17.08.0/src/parsers/holidayparserdriver.cpp --- old/kholidays-17.04.3/src/parsers/holidayparserdriver.cpp 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/parsers/holidayparserdriver.cpp 2017-08-04 20:50:16.000000000 +0200 @@ -63,7 +63,7 @@ m_requestStart = startDate; m_requestEnd = endDate; parse(); - qSort(m_resultList); + std::sort(m_resultList.begin(), m_resultList.end()); return m_resultList; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/parsers/plan2/holidayparserdriverplan_p.h new/kholidays-17.08.0/src/parsers/plan2/holidayparserdriverplan_p.h --- old/kholidays-17.04.3/src/parsers/plan2/holidayparserdriverplan_p.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/parsers/plan2/holidayparserdriverplan_p.h 2017-08-04 20:50:16.000000000 +0200 @@ -79,25 +79,25 @@ * * @param errorMessage error message to log */ - void error(const QString &errorMessage) Q_DECL_OVERRIDE; + void error(const QString &errorMessage) override; protected: /** * Actually parse the file, new plan format implementation */ - void parse() Q_DECL_OVERRIDE; + void parse() override; /** * Parse the file for metadata only and populate the metadata variables */ - void parseMetadata() Q_DECL_OVERRIDE; + void parseMetadata() override; /** * Set the calendar system to use * * @param calendar The QCalendarSystem calendar system to use */ - void setParseCalendar(QCalendarSystem::CalendarSystem calendar) Q_DECL_OVERRIDE; + void setParseCalendar(QCalendarSystem::CalendarSystem calendar) override; // Bison C++ skeleton required friend for Bison parser class implementation friend class HolidayParserPlan; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/parsers/qcalendarsystem.cpp new/kholidays-17.08.0/src/parsers/qcalendarsystem.cpp --- old/kholidays-17.04.3/src/parsers/qcalendarsystem.cpp 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/parsers/qcalendarsystem.cpp 2017-08-04 20:50:16.000000000 +0200 @@ -21,8 +21,8 @@ #include "qcalendarsystem_p.h" -#include <QtCore/QDate> -#include <QtCore/QSharedData> +#include <QDate> +#include <QSharedData> #include "qdebug.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/parsers/qcalendarsystem_p.h new/kholidays-17.08.0/src/parsers/qcalendarsystem_p.h --- old/kholidays-17.04.3/src/parsers/qcalendarsystem_p.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/parsers/qcalendarsystem_p.h 2017-08-04 20:50:16.000000000 +0200 @@ -22,8 +22,8 @@ #ifndef QCALENDARSYSTEM_H #define QCALENDARSYSTEM_H -#include <QtCore/QSharedPointer> -#include <QtCore/QDate> +#include <QSharedPointer> +#include <QDate> class QCalendarSystemPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/zodiac.cpp new/kholidays-17.08.0/src/zodiac.cpp --- old/kholidays-17.04.3/src/zodiac.cpp 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/zodiac.cpp 2017-08-04 20:50:16.000000000 +0200 @@ -21,9 +21,9 @@ #include "zodiac.h" -#include <QtCore/QDateTime> -#include <QtCore/QSharedData> -#include <QtCore/QCoreApplication> +#include <QDateTime> +#include <QSharedData> +#include <QCoreApplication> using namespace KHolidays; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-17.04.3/src/zodiac.h new/kholidays-17.08.0/src/zodiac.h --- old/kholidays-17.04.3/src/zodiac.h 2017-06-21 21:09:20.000000000 +0200 +++ new/kholidays-17.08.0/src/zodiac.h 2017-08-04 20:50:16.000000000 +0200 @@ -53,7 +53,7 @@ #include "kholidays_export.h" -#include <QtCore/QSharedDataPointer> +#include <QSharedDataPointer> class QDate; class QString;
