Hello community,
here is the log from the commit of package kholidays for openSUSE:Factory checked in at 2017-03-15 01:06:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kholidays (Old)
and /work/SRC/openSUSE:Factory/.kholidays.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kholidays"
Wed Mar 15 01:06:57 2017 rev:20 rq:479134 version:16.12.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/kholidays/kholidays.changes 2017-02-13 07:17:54.554968722 +0100
+++ /work/SRC/openSUSE:Factory/.kholidays.new/kholidays.changes 2017-03-15 02:00:20.239974170 +0100
@@ -1,0 +2,23 @@
+Mon Mar 13 19:34:25 UTC 2017 - lbeltrame@kde.org
+
+- Add upstream patch revert-dep-freeze.patch: revert accidental
+ version / dependency bump
+
+-------------------------------------------------------------------
+Thu Mar 9 12:38:07 CET 2017 - lbeltrame@kde.org
+
+- Update to 16.12.3
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-16.12.3.php
+- Changes since 16.12.2:
+ * holiday_ua_uk - updated patch from guerrillamailblock (kde#359708)
+ * CMakeLists.txt - tiny cleaning
+ * holiday_hk_en-gb, holiday_hk_zh-cn - update Hong Kong holidays patch from Michael Tsang (kde#375530)
+ * Add a new holiday for Serbia
+ * Add nullptr
+ * Add missing Q_DECL_OVERRIDE
+ * Add ECMCoverageOption
+
+
+-------------------------------------------------------------------
Old:
----
kholidays-16.12.2.tar.xz
New:
----
kholidays-16.12.3.tar.xz
revert-dep-freeze.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kholidays.spec ++++++
--- /var/tmp/diff_new_pack.95W1ID/_old 2017-03-15 02:00:20.971870697 +0100
+++ /var/tmp/diff_new_pack.95W1ID/_new 2017-03-15 02:00:20.975870132 +0100
@@ -17,16 +17,18 @@
Name: kholidays
-Version: 16.12.2
+Version: 16.12.3
Release: 0
%define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.12.2 in KUA)
+# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: Holiday API for KDE PIM
License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
Source: %{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM revert-dep-freeze -- revert accidental version / dependency bump
+Patch0: revert-dep-freeze.patch
BuildRequires: extra-cmake-modules >= 5.19.0
BuildRequires: kf5-filesystem
BuildRequires: pkgconfig
@@ -56,6 +58,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%cmake_kf5 -d build
++++++ kholidays-16.12.2.tar.xz -> kholidays-16.12.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.2/CMakeLists.txt new/kholidays-16.12.3/CMakeLists.txt
--- old/kholidays-16.12.2/CMakeLists.txt 2017-01-17 21:56:37.000000000 +0100
+++ new/kholidays-16.12.3/CMakeLists.txt 2017-02-26 19:53:27.000000000 +0100
@@ -1,28 +1,28 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
+set(PIM_VERSION "5.4.40")
-project(KHolidays)
+project(KHolidays VERSION ${PIM_VERSION})
# ECM setup
-set(KF5_VERSION "5.28.0")
+set(KF5_VERSION "5.31.0")
find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(GenerateExportHeader)
include(ECMGenerateHeaders)
include(ECMGeneratePriFile)
-include(ECMPackageConfigHelpers)
+include(CMakePackageConfigHelpers)
include(ECMSetupVersion)
include(ECMPoQmTools)
include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
-
-set(PIM_VERSION "5.4.2")
+include(ECMCoverageOption)
set(KHOLIDAYS_LIB_VERSION ${PIM_VERSION})
-ecm_setup_version(${KHOLIDAYS_LIB_VERSION} VARIABLE_PREFIX KHOLIDAYS
+ecm_setup_version(PROJECT VARIABLE_PREFIX KHOLIDAYS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfigVersion.cmake"
SOVERSION 5
@@ -50,7 +50,7 @@
########### CMake Config Files ###########
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Holidays")
-ecm_configure_package_config_file(
+configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5HolidaysConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.2/holidays/plan2/holiday_hk_en-gb new/kholidays-16.12.3/holidays/plan2/holiday_hk_en-gb
--- old/kholidays-16.12.2/holidays/plan2/holiday_hk_en-gb 2017-01-17 21:56:37.000000000 +0100
+++ new/kholidays-16.12.3/holidays/plan2/holiday_hk_en-gb 2017-02-26 19:53:27.000000000 +0100
@@ -7,12 +7,12 @@
:: Michael Tsang
:: John Layt
::
-:: Updated: 2013-04-17
+:: Updated: 2017-01-25
::
:: Source: http://www.gov.hk/en/about/abouthk/holiday/
-:: http://www.labour.gov.hk/eng/faq/cap57f_whole.htm
-:: http://www.legislation.gov.hk/blis_ind.nsf/CurAllEngDoc/EC16AF2AF1A319BD8825...
+:: http://www.legislation.gov.hk/blis_pdf.nsf/6799165D2FEE3FA94825755E0033E532/...
::
+:: Effective date: 1997-07-01
:: Metadata
country "HK"
@@ -23,185 +23,284 @@
:: Public/Statutory Holidays
: The first day of january (or if that day is a Sunday, then the following day)
"New Year's Day" public on january 1
-"New Year's Day Holiday" public on ( ( [january 1] == [sunday after ([january 1])]) ?
+"Supplementary holiday for New Year's Day" public on ( ( [january 1] == [sunday after ([january 1])]) ?
[monday after ([january 1])] :
noop )
-: Lunar New Year, Days 1-3 of Month 1
-: (and if any day is a Sunday, then the day preceding Lunar New Year's Day)
-"Lunar New Year's Eve Holiday" public on 4 february 2000
-"Lunar New Year" public on 5 february 2000 length 3 days
-"Lunar New Year's Eve Holiday" public on 23 january 2001
-"Lunar New Year" public on 24 january 2001 length 3 days
-"Lunar New Year" public on 12 february 2002 length 3 days
-"Lunar New Year's Eve Holiday" public on 31 january 2003
-"Lunar New Year" public on 1 february 2003 length 3 days
-"Lunar New Year" public on 22 january 2004 length 3 days
-"Lunar New Year" public on 9 february 2005 length 3 days
-"Lunar New Year's Eve Holiday" public on 28 january 2006
-"Lunar New Year" public on 29 january 2006 length 3 days
-"Lunar New Year's Eve Holiday" public on 17 february 2007
-"Lunar New Year" public on 18 february 2007 length 3 days
-"Lunar New Year" public on 7 february 2008 length 3 days
-"Lunar New Year" public on 26 january 2009 length 3 days
-"Lunar New Year's Eve Holiday" public on 13 february 2010
-"Lunar New Year" public on 14 february 2010 length 3 days
-"Lunar New Year" public on 3 february 2011 length 3 days
-"Lunar New Year" public on 23 january 2012 length 3 days
-"Lunar New Year" public on 10 february 2013 length 3 days
-"Lunar New Year's Eve Holiday" public on 30 january 2014
-"Lunar New Year" public on 31 january 2014 length 3 days
-"Lunar New Year" public on 19 february 2015 length 3 days
-"Lunar New Year" public on 8 february 2016 length 3 days
-"Lunar New Year's Eve Holiday" public on 27 january 2017
-"Lunar New Year" public on 28 january 2017 length 3 days
-"Lunar New Year's Eve Holiday" public on 15 february 2018
-"Lunar New Year" public on 16 february 2018 length 3 days
-"Lunar New Year" public on 5 february 2019 length 3 days
-"Lunar New Year's Eve Holiday" public on 24 january 2020
-"Lunar New Year" public on 25 january 2020 length 3 days
-: Ching Ming Festival. See https://bugs.kde.org/show_bug.cgi?id=317834#c4
-"Ching Ming Festival" public on 5 april 2010
-"Ching Ming Festival" public on 5 april 2011
-"Ching Ming Festival" public on 4 april 2012
-"Ching Ming Festival" public on 4 april 2013
-"Ching Ming Festival" public on 5 april 2014
-"Ching Ming Festival" public on 5 april 2015
-"Ching Ming Festival" public on 4 april 2016
-"Ching Ming Festival" public on 4 april 2017
-"Ching Ming Festival" public on 5 april 2018
-"Ching Ming Festival" public on 5 april 2019
-"Ching Ming Festival" public on 4 april 2020
+: Good Friday
+"Good Friday" public on easter minus 2
+
+: The day following Good Friday
+"Day after Good Friday" public on easter minus 1
+
+: Easter Monday
+"Easter Monday" public on easter plus 1
+
: Labour Day (or if that day is a Sunday, then the following day)
-"Labour Day" public on may 1
-"Labour Day Holiday" public on ( ( [may 1] == [sunday after ([may 1])]) ?
+"Labour Day" public on ( (year >= 1999) ? [may 1] : noop )
+"Supplementary holiday for Labour Day" public on ( (year >= 1999 && [may 1] == [sunday after ([may 1])]) ?
[monday after ([may 1])] :
noop )
-: Tuen Ng Festival Day 5 of Month 5 (or if that day is a Sunday, then the following day)
-"Tuen Ng Festival" public on 6 june 2000
-"Tuen Ng Festival" public on 25 june 2001
-"Tuen Ng Festival" public on 15 june 2002
-"Tuen Ng Festival" public on 4 june 2003
-"Tuen Ng Festival" public on 22 june 2004
-"Tuen Ng Festival" public on 11 june 2005
-"Tuen Ng Festival" public on 31 may 2006
-"Tuen Ng Festival" public on 19 june 2007
-"Tuen Ng Festival" public on 8 June 2008
-"Tuen Ng Festival Holiday" public on 9 June 2008
-"Tuen Ng Festival" public on 27 may 2009
-"Tuen Ng Festival" public on 16 june 2010
-"Tuen Ng Festival" public on 6 june 2011
-"Tuen Ng Festival" public on 23 june 2012
-"Tuen Ng Festival" public on 12 june 2013
-"Tuen Ng Festival" public on 2 june 2014
-"Tuen Ng Festival" public on 20 june 2015
-"Tuen Ng Festival" public on 9 june 2016
-"Tuen Ng Festival" public on 30 may 2017
-"Tuen Ng Festival" public on 18 june 2018
-"Tuen Ng Festival" public on 7 june 2019
-"Tuen Ng Festival" public on 25 june 2020
+
: Hong Kong SAR Establishment Day (or if that day is a Sunday, then the following day)
"Hong Kong SAR Establishment Day" public on july 1
-"Hong Kong SAR Establishment Day Holiday" public on ( ( [july 1] == [sunday after ([july 1])]) ?
+"Supplementary holiday for Hong Kong SAR Establishment Day" public on ( ( [july 1] == [sunday after ([july 1])]) ?
[monday after ([july 1])] :
noop )
-: The day following the Chinese Mid-Autumn Festival, Day 16 of Month 8 (or if that day is a Sunday, then the preceding day)
-"Mid-Autumn Festival Holiday" public on 13 september 2000
-"Mid-Autumn Festival Holiday" public on 2 october 2001
-"Mid-Autumn Festival Holiday" public on 22 september 2002
-"Mid-Autumn Festival Holiday" public on 12 september 2003
-"Mid-Autumn Festival Holiday" public on 29 september 2004
-"Mid-Autumn Festival Holiday" public on 19 september 2005
-"Mid-Autumn Festival Holiday" public on 7 october 2006
-"Mid-Autumn Festival Holiday" public on 26 september 2007
-"Mid-Autumn Festival Holiday" public on 15 september 2008
-"Mid-Autumn Festival Holiday" public on 3 october 2009
-"Mid-Autumn Festival Holiday" public on 23 september 2010
-"Mid-Autumn Festival Holiday" public on 13 september 2011
-"Mid-Autumn Festival Holiday" public on 1 october 2012
-"Mid-Autumn Festival Holiday" public on 20 september 2013
-"Mid-Autumn Festival Holiday" public on 9 september 2014
-"Mid-Autumn Festival Holiday" public on 28 september 2015
-"Mid-Autumn Festival Holiday" public on 16 september 2016
-"Mid-Autumn Festival Holiday" public on 5 october 2017
-"Mid-Autumn Festival Holiday" public on 25 september 2018
-"Mid-Autumn Festival Holiday" public on 14 september 2019
-"Mid-Autumn Festival Holiday" public on 2 october 2020
-: Chung Yeung Festival, Day 9 of Month 9 (or if that day is a Sunday, then the following day)
+
+: National Day (or if that day is a Sunday, then the following day)
+"National Day" public on october 1
+"Supplementary holiday for National Day" public on ( ( [october 1] == [sunday after ([october 1])]) ?
+ [monday after ([october 1])] :
+ noop )
+
+: Christmas and day after Christmas (or if any day is a Sunday, then the second weekday after Christmas Day)
+"Christmas Day" public on december 25
+"Supplementary holiday for Christmas Day" public on ( ( [december 25] == [sunday after ([december 25])]) ?
+ [tuesday after ([december 25])] :
+ noop )
+"Day after Christmas Day" public on december 26
+"Supplementary holiday for Day after Christmas Day" public on ( ( [december 26] == [sunday after ([december 26])]) ?
+ [monday after ([december 26])] :
+ noop )
+
+:: Holidays based on lunar calendar
+
+"Day after Mid-Autumn Festival" public on 17 september 1997
+"Chung Yeung Festival" public on 10 october 1997
+
+"Lunar New Year" public on 28 january 1998 length 3 days
+"Supplementary holiday for Ching Ming Festival" public on 6 april 1998
+"Tuen Ng Festival" public on 30 may 1998
+"Day after Mid-Autumn Festival" public on 6 october 1998
+"Chung Yeung Festival" public on 28 october 1998
+
+"Lunar New Year" public on 16 february 1999 length 3 days
+"Supplementary holiday for Ching Ming Festival" public on 6 april 1999
+"Buddha's Birthday" public on 22 may 1999
+"Tuen Ng Festival" public on 18 june 1999
+"Day after Mid-Autumn Festival" public on 25 september 1999
+"Supplementary holiday for Chung Yeung Festival" public on 18 october 1999
+
+"Lunar New Year" public on 4 february 2000 length 4 days
+"Ching Ming Festival" public on 4 april 2000
+"Buddha's Birthday" public on 11 may 2000
+"Tuen Ng Festival" public on 6 june 2000
+"Day after Mid-Autumn Festival" public on 13 september 2000
"Chung Yeung Festival" public on 6 october 2000
+
+"Lunar New Year" public on 24 january 2001 length 3 days
+"Ching Ming Festival" public on 5 april 2001
+"Buddha's Birthday" public on 30 may 2001
+"Tuen Ng Festival" public on 25 june 2001
+"Day after Mid-Autumn Festival" public on 2 october 2001
"Chung Yeung Festival" public on 25 october 2001
+
+"Lunar New Year" public on 12 february 2002 length 3 days
+"Ching Ming Festival" public on 5 april 2002
+"Supplementary holiday for Buddha's Birthday" public on 20 may 2002
+"Tuen Ng Festival" public on 15 june 2002
+"Mid-Autumn Festival" public on 21 september 2002
"Chung Yeung Festival" public on 14 october 2002
+
+"Lunar New Year" public on 31 january 2003 length 4 days
+"Ching Ming Festival" public on 5 april 2003
+"Buddha's Birthday" public on 8 may 2003
+"Tuen Ng Festival" public on 4 june 2003
+"Day after Mid-Autumn Festival" public on 12 september 2003
"Chung Yeung Festival" public on 4 october 2003
+
+"Lunar New Year" public on 22 january 2004 length 3 days
+"Supplementary holiday for Ching Ming Festival" public on 5 april 2004
+"Buddha's Birthday" public on 26 may 2004
+"Tuen Ng Festival" public on 22 june 2004
+"Day after Mid-Autumn Festival" public on 29 september 2004
"Chung Yeung Festival" public on 22 october 2004
+
+"Lunar New Year" public on 9 february 2005 length 3 days
+"Ching Ming Festival" public on 5 april 2005
+"Supplementary holiday for Buddha's Birthday" public on 16 may 2005
+"Tuen Ng Festival" public on 11 june 2005
+"Day after Mid-Autumn Festival" public on 19 september 2005
"Chung Yeung Festival" public on 11 october 2005
+
+"Lunar New Year" public on 28 january 2006 length 4 days
+"Ching Ming Festival" public on 5 april 2006
+"Buddha's Birthday" public on 5 may 2006
+"Tuen Ng Festival" public on 31 may 2006
+"Day after Mid-Autumn Festival" public on 7 october 2006
"Chung Yeung Festival" public on 30 october 2006
+
+"Lunar New Year" public on 17 february 2007 length 4 days
+"Ching Ming Festival" public on 5 april 2007
+"Buddha's Birthday" public on 24 may 2007
+"Tuen Ng Festival" public on 19 june 2007
+"Day after Mid-Autumn Festival" public on 26 september 2007
"Chung Yeung Festival" public on 19 october 2007
+
+"Lunar New Year" public on 7 february 2008 length 3 days
+"Ching Ming Festival" public on 4 april 2008
+"Buddha's Birthday" public on 12 may 2008
+"Supplementary holiday for Tuen Ng Festival" public on 9 june 2008
+"Day after Mid-Autumn Festival" public on 15 september 2008
"Chung Yeung Festival" public on 7 october 2008
+
+"Lunar New Year" public on 26 january 2009 length 3 days
+"Ching Ming Festival" public on 4 april 2009
+"Buddha's Birthday" public on 2 may 2009
+"Tuen Ng Festival" public on 28 may 2009
+"Mid-Autumn Festival" public on 3 october 2009
"Chung Yeung Festival" public on 26 october 2009
+
+"Lunar New Year" public on 13 february 2010 length 4 days
+"Supplementary holiday for Ching Ming Festival" public on 6 april 2010
+"Buddha's Birthday" public on 21 may 2010
+"Tuen Ng Festival" public on 16 june 2010
+"Day after Mid-Autumn Festival" public on 23 september 2010
+"Chung Yeung Festival" public on 16 october 2010
+
+"Lunar New Year" public on 3 february 2011 length 3 days
+"Ching Ming Festival" public on 5 april 2011
+"Buddha's Birthday" public on 10 may 2011
+"Tuen Ng Festival" public on 6 june 2011
+"Day after Mid-Autumn Festival" public on 13 september 2011
"Chung Yeung Festival" public on 5 october 2011
+
+"Lunar New Year" public on 23 january 2012 length 3 days
+"Ching Ming Festival" public on 4 april 2012
+"Buddha's Birthday" public on 28 april 2012
+"Tuen Ng Festival" public on 23 june 2012
+"Supplementary holiday for Day after Mid-Autumn Festival" public on 2 october 2012
"Chung Yeung Festival" public on 23 october 2012
-"Chung Yeung Festival" public on 13 october 2013
-"Chung Yeung Festival" public on 1 november 2014
-"Chung Yeung Festival" public on 21 october 2015
-"Chung Yeung Festival" public on 9 october 2016
-"Chung Yeung Festival Holiday" public on 10 october 2016
-"Chung Yeung Festival" public on 28 october 2017
-"Chung Yeung Festival" public on 17 october 2018
-"Chung Yeung Festival" public on 7 october 2019
-"Chung Yeung Festival" public on 25 october 2020
-"Chung Yeung Festival Holiday" public on 26 october 2020
-: National Day (or if that day is a Sunday, then the following day)
-"National Day" public on october 1 shift to monday if sunday
-: Christmas Day (or if that day is a Sunday, then the second weekday after Christmas Day)
-"Christmas Day" public religious on december 25
-"Christmas Day Holiday" public on ( ( [december 25] == [sunday after ([december 25])]) ?
- [tuesday after ([december 25])] :
- noop )
+"Lunar New Year" public on 10 february 2013 length 4 days
+"Ching Ming Festival" public on 4 april 2013
+"Buddha's Birthday" public on 17 may 2013
+"Tuen Ng Festival" public on 12 june 2013
+"Day after Mid-Autumn Festival" public on 20 september 2013
+"Supplementary holiday for Chung Yeung Festival" public on 14 october 2013
+"Lunar New Year" public on 31 january 2014 length 4 days
+"Ching Ming Festival" public on 5 april 2014
+"Buddha's Birthday" public on 6 may 2014
+"Tuen Ng Festival" public on 2 june 2014
+"Day after Mid-Autumn Festival" public on 9 september 2014
+"Chung Yeung Festival" public on 2 october 2014
-:: Religious
-: Good Friday
-"Good Friday" religious on easter minus 2
-: The day following Good Friday
-"Day after Good Friday" religious on easter minus 1
-: Easter Monday
-"Easter Monday" religious on easter plus 1
-: The Birthday of the Buddha, Day 8 of Month 4 (or if that day is a Sunday, then the following day)
-"Buddha's Birthday" religious on 11 may 2000
-"Buddha's Birthday" religious on 30 may 2001
-"Buddha's Birthday" religious on 19 may 2002
-"Buddha's Birthday Holiday" religious on 19 may 2003
-"Buddha's Birthday" religious on 8 may 2003
-"Buddha's Birthday" religious on 26 may 2004
-"Buddha's Birthday" religious on 15 may 2005
-"Buddha's Birthday Holiday" religious on 16 may 2005
-"Buddha's Birthday" religious on 5 may 2006
-"Buddha's Birthday" religious on 24 may 2007
-"Buddha's Birthday" religious on 12 may 2008
-"Buddha's Birthday" religious on 2 may 2009
-"Buddha's Birthday" religious on 21 may 2010
-"Buddha's Birthday" religious on 10 may 2011
-"Buddha's Birthday" religious on 28 may 2012
-"Buddha's Birthday" religious on 17 may 2013
-"Buddha's Birthday" religious on 6 may 2014
-"Buddha's Birthday" religious on 25 may 2015
-"Buddha's Birthday" religious on 14 may 2016
-"Buddha's Birthday" religious on 3 may 2017
-"Buddha's Birthday" religious on 22 may 2018
-"Buddha's Birthday" religious on 12 may 2019
-"Buddha's Birthday Holiday" religious on 13 may 2019
-"Buddha's Birthday" religious on 30 may 2020
-
-:: Financial
-
-:: Cultural
-: The first weekday after Christmas Day
-"Day after Christmas Day" cultural on december 26 shift to monday if sunday
+"Lunar New Year" public on 19 february 2015 length 3 days
+"Supplementary holiday for Ching Ming Festival" public on 7 april 2015
+"Buddha's Birthday" public on 25 may 2015
+"Tuen Ng Festival" public on 20 june 2015
+"Day after Mid-Autumn Festival" public on 28 september 2015
+"Chung Yeung Festival" public on 21 october 2015
-:: School
+"Lunar New Year" public on 8 february 2016 length 3 days
+"Ching Ming Festival" public on 4 april 2016
+"Buddha's Birthday" public on 14 may 2016
+"Tuen Ng Festival" public on 9 june 2016
+"Day after Mid-Autumn Festival" public on 16 september 2016
+"Supplementary holiday for Chung Yeung Festival" public on 10 october 2016
+
+"Lunar New Year" public on 28 january 2017 length 4 days
+"Ching Ming Festival" public on 4 april 2017
+"Buddha's Birthday" public on 3 may 2017
+"Tuen Ng Festival" public on 30 may 2017
+"Day after Mid-Autumn Festival" public on 5 october 2017
+"Chung Yeung Festival" public on 28 october 2017
+
+"Lunar New Year" public on 16 february 2018 length 4 days
+"Ching Ming Festival" public on 5 april 2018
+"Buddha's Birthday" public on 22 may 2018
+"Tuen Ng Festival" public on 18 june 2018
+"Day after Mid-Autumn Festival" public on 25 september 2018
+"Chung Yeung Festival" public on 17 october 2018
-:: Daylight Saving
+"Lunar New Year" public on 5 february 2019 length 3 days
+"Ching Ming Festival" public on 5 april 2019
+"Supplementary holiday for Buddha's Birthday" public on 13 may 2019
+"Tuen Ng Festival" public on 7 may 2019
+"Day after Mid-Autumn Festival" public on 14 september 2019
+"Chung Yeung Festival" public on 7 october 2019
-:: Seasons
+"Lunar New Year" public on 25 january 2020 length 4 days
+"Ching Ming Festival" public on 4 april 2020
+"Buddha's Birthday" public on 30 april 2020
+"Tuen Ng Festival" public on 25 june 2020
+"Day after Mid-Autumn Festival" public on 2 october 2020
+"Supplementary holiday for Chung Yeung Festival" public on 26 october 2020
-:: Name Days
+"Lunar New Year" public on 12 february 2021 length 4 days
+"Supplementary holiday for Ching Ming Festival" public on 6 april 2021
+"Buddha's Birthday" public on 19 may 2021
+"Tuen Ng Festival" public on 14 june 2021
+"Day after Mid-Autumn Festival" public on 22 september 2021
+"Chung Yeung Festival" public on 14 october 2021
+
+"Lunar New Year" public on 1 february 2022 length 3 days
+"Ching Ming Festival" public on 5 april 2022
+"Supplementary holiday for Buddha's Birthday" public on 9 may 2022
+"Tuen Ng Festival" public on 3 june 2022
+"Supplementary holiday for Day after Mid-Autumn Festival" public on 12 september 2022
+"Chung Yeung Festival" public on 4 october 2022
+
+"Lunar New Year" public on 22 january 2023 length 4 days
+"Ching Ming Festival" public on 5 april 2023
+"Buddha's Birthday" public on 26 may 2023
+"Tuen Ng Festival" public on 22 june 2023
+"Day after Mid-Autumn Festival" public on 30 september 2023
+"Chung Yeung Festival" public on 23 october 2023
+
+"Lunar New Year" public on 10 february 2024 length 4 days
+"Ching Ming Festival" public on 4 april 2024
+"Buddha's Birthday" public on 15 may 2024
+"Tuen Ng Festival" public on 10 june 2024
+"Day after Mid-Autumn Festival" public on 18 september 2024
+"Chung Yeung Festival" public on 11 october 2024
+
+"Lunar New Year" public on 29 january 2025 length 3 days
+"Ching Ming Festival" public on 4 april 2025
+"Buddha's Birthday" public on 5 may 2025
+"Tuen Ng Festival" public on 31 may 2025
+"Day after Mid-Autumn Festival" public on 7 october 2025
+"Chung Yeung Festival" public on 29 october 2025
+
+"Lunar New Year" public on 17 february 2026 length 3 days
+"Supplementay holiday for Ching Ming Festival" public on 7 april 2026
+"Supplementay holiday for Buddha's Birthday" public on 25 may 2026
+"Tuen Ng Festival" public on 19 june 2026
+"Day after Mid-Autumn Festival" public on 26 september 2026
+"Supplementay holiday for Chung Yeung Festival" public on 19 october 2026
+
+"Lunar New Year" public on 6 february 2027 length 4 days
+"Ching Ming Festival" public on 5 april 2027
+"Buddha's Birthday" public on 13 may 2027
+"Tuen Ng Festival" public on 9 june 2027
+"Day after Mid-Autumn Festival" public on 16 september 2027
+"Chung Yeung Festival" public on 8 october 2027
+
+"Lunar New Year" public on 26 january 2028 length 3 days
+"Ching Ming Festival" public on 4 april 2028
+"Buddha's Birthday" public on 2 may 2028
+"Supplementay holiday for Tuen Ng Festival" public on 29 may 2028
+"Day after Mid-Autumn Festival" public on 5 october 2028
+"Chung Yeung Festival" public on 26 october 2028
+
+"Lunar New Year" public on 13 february 2029 length 3 days
+"Ching Ming Festival" public on 4 april 2029
+"Supplementay holiday for Buddha's Birthday" public on 21 may 2029
+"Tuen Ng Festival" public on 16 june 2029
+"Supplementay holiday for Day after Mid-Autumn Festival" public on 24 september 2029
+"Chung Yeung Festival" public on 16 october 2029
+
+"Lunar New Year" public on 1 february 2030 length 4 days
+"Ching Ming Festival" public on 5 april 2030
+"Buddha's Birthday" public on 9 may 2030
+"Tuen Ng Festival" public on 5 june 2030
+"Day after Mid-Autumn Festival" public on 13 september 2030
+"Chung Yeung Festival" public on 5 october 2030
+
+:: Special and abolished holidays
+
+"Sino-Japanese War Victory Day" public on ((year >= 1997 && year <= 1998) ? [3rd monday in august] : noop)
+"Day after National Day" public on ((year >= 1997 && year <= 1998) ? [2 october] : noop) shift to monday if sunday
+"Millennium's Eve" public on 31 december 1999
+"The 70th anniversary day of the victory of the Chinese people's war of resistance against Japanese aggression" public on 3 september 2015
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.2/holidays/plan2/holiday_hk_zh-cn new/kholidays-16.12.3/holidays/plan2/holiday_hk_zh-cn
--- old/kholidays-16.12.2/holidays/plan2/holiday_hk_zh-cn 2017-01-17 21:56:37.000000000 +0100
+++ new/kholidays-16.12.3/holidays/plan2/holiday_hk_zh-cn 2017-02-26 19:53:27.000000000 +0100
@@ -1,207 +1,306 @@
::
-:: Country: Hong Kong, China
+:: 國家:中國香港
::
-:: Language: Traditional Chinese
+:: 語言:中文
::
-:: Author: Glen Ng
+:: 作者: Glen Ng
:: Michael Tsang
:: John Layt
::
-:: Updated: 2013-04-17
+:: 更新日期:2017-01-25
::
-:: Source: http://www.gov.hk/en/about/abouthk/holiday/
-:: http://www.labour.gov.hk/eng/faq/cap57f_whole.htm
-:: http://www.legislation.gov.hk/blis_ind.nsf/CurAllEngDoc/EC16AF2AF1A319BD8825...
+:: 來源:http://www.gov.hk/tc/about/abouthk/holiday/
+:: http://www.legislation.gov.hk/blis_pdf.nsf/6799165D2FEE3FA94825755E0033E532/...
::
+:: 生效日期:1997-07-01
-:: Metadata
+:: 元資料
country "HK"
language "zh_HK"
-:name "optional - defaults to country name"
-description "Public Holidays for Hong Kong"
+:name "可選 - 預設為國家名"
+description "香港公眾假期"
-:: Public/Statutory Holidays
-: The first day of january (or if that day is a Sunday, then the following day)
-"1月1日" public on january 1
-"1月1日" public on ( ( [january 1] == [sunday after ([january 1])]) ?
+:: 公眾/法定假期
+: 1月1日(如該日為星期日,則為翌日)
+"新年" public on january 1
+"新年補假" public on ( ( [january 1] == [sunday after ([january 1])]) ?
[monday after ([january 1])] :
noop )
-: Lunar New Year, Days 1-3 of Month 1
-: (and if any day is a Sunday, then the day preceding Lunar New Year's Day)
-"農曆年初" public on 4 february 2000
-"農曆年初" public on 5 february 2000 length 3 days
-"農曆年初" public on 23 january 2001
-"農曆年初" public on 24 january 2001 length 3 days
-"農曆年初" public on 12 february 2002 length 3 days
-"農曆年初" public on 31 january 2003
-"農曆年初" public on 1 february 2003 length 3 days
-"農曆年初" public on 22 january 2004 length 3 days
-"農曆年初" public on 9 february 2005 length 3 days
-"農曆年初" public on 28 january 2006
-"農曆年初" public on 29 january 2006 length 3 days
-"農曆年初" public on 17 february 2007
-"農曆年初" public on 18 february 2007 length 3 days
-"農曆年初" public on 7 february 2008 length 3 days
-"農曆年初" public on 26 january 2009 length 3 days
-"農曆年初" public on 13 february 2010
-"農曆年初" public on 14 february 2010 length 3 days
-"農曆年初" public on 3 february 2011 length 3 days
-"農曆年初" public on 23 january 2012 length 3 days
-"農曆年初" public on 10 february 2013 length 3 days
-"農曆年初" public on 30 january 2014
-"農曆年初" public on 31 january 2014 length 3 days
-"農曆年初" public on 19 february 2015 length 3 days
-"農曆年初" public on 8 february 2016 length 3 days
-"農曆年初" public on 27 january 2017
-"農曆年初" public on 28 january 2017 length 3 days
-"農曆年初" public on 15 february 2018
-"農曆年初" public on 16 february 2018 length 3 days
-"農曆年初" public on 5 february 2019 length 3 days
-"農曆年初" public on 24 january 2020
-"農曆年初" public on 25 january 2020 length 3 days
-: Ching Ming Festival. See https://bugs.kde.org/show_bug.cgi?id=317834#c4
-"清明節" public on 5 april 2010
-"清明節" public on 5 april 2011
-"清明節" public on 4 april 2012
-"清明節" public on 4 april 2013
-"清明節" public on 5 april 2014
-"清明節" public on 5 april 2015
-"清明節" public on 4 april 2016
-"清明節" public on 4 april 2017
-"清明節" public on 5 april 2018
-"清明節" public on 5 april 2019
-"清明節" public on 4 april 2020
-: Labour Day (or if that day is a Sunday, then the following day)
-"勞動節" public on may 1
-"勞動節" public on ( ( [may 1] == [sunday after ([may 1])]) ?
+: 耶穌受難節
+"耶穌受難節" public on easter minus 2
+
+: 耶穌受難節翌日
+"耶穌受難節翌日" public on easter minus 1
+
+: 復活節星期一
+"復活節星期一" public on easter plus 1
+
+: 勞動節(如該日為星期日,則為翌日)
+"勞動節" public on ( (year >= 1999) ? [may 1] : noop )
+"勞動節補假" public on ( (year >= 1999 && [may 1] == [sunday after ([may 1])]) ?
[monday after ([may 1])] :
noop )
-: Tuen Ng Festival Day 5 of Month 5 (or if that day is a Sunday, then the following day)
-"端午節" public on 6 june 2000
-"端午節" public on 25 june 2001
-"端午節" public on 15 june 2002
-"端午節" public on 4 june 2003
-"端午節" public on 22 june 2004
-"端午節" public on 11 june 2005
-"端午節" public on 31 may 2006
-"端午節" public on 19 june 2007
-"端午節" public on 8 June 2008
-"端午節" public on 9 June 2008
-"端午節" public on 27 may 2009
-"端午節" public on 16 june 2010
-"端午節" public on 6 june 2011
-"端午節" public on 23 june 2012
-"端午節" public on 12 june 2013
-"端午節" public on 2 june 2014
-"端午節" public on 20 june 2015
-"端午節" public on 9 june 2016
-"端午節" public on 30 may 2017
-"端午節" public on 18 june 2018
-"端午節" public on 7 june 2019
-"端午節" public on 25 june 2020
-: Hong Kong SAR Establishment Day (or if that day is a Sunday, then the following day)
-"香港特別行政區成立紀念日" public on july 1
-"香港特別行政區成立紀念日" public on ( ( [july 1] == [sunday after ([july 1])]) ?
+
+: 香港特別行政區成立紀念日(如該日為星期日,則為翌日)
+"香港特別行政區成立紀念日" public on july 1
+"香港特別行政區成立紀念日補假" public on ( ( [july 1] == [sunday after ([july 1])]) ?
[monday after ([july 1])] :
noop )
-: The day following the Chinese Mid-Autumn Festival, Day 16 of Month 8 (or if that day is a Sunday, then the preceding day)
-"中秋節翌日" public on 13 september 2000
-"中秋節翌日" public on 2 october 2001
-"中秋節翌日" public on 22 september 2002
-"中秋節翌日" public on 12 september 2003
-"中秋節翌日" public on 29 september 2004
-"中秋節翌日" public on 19 september 2005
-"中秋節翌日" public on 7 october 2006
-"中秋節翌日" public on 26 september 2007
-"中秋節翌日" public on 15 september 2008
-"中秋節翌日" public on 3 october 2009
-"中秋節翌日" public on 23 september 2010
-"中秋節翌日" public on 13 september 2011
-"中秋節翌日" public on 1 october 2012
-"中秋節翌日" public on 20 september 2013
-"中秋節翌日" public on 9 september 2014
-"中秋節翌日" public on 28 september 2015
-"中秋節翌日" public on 16 september 2016
-"中秋節翌日" public on 5 october 2017
-"中秋節翌日" public on 25 september 2018
-"中秋節翌日" public on 14 september 2019
-"中秋節翌日" public on 2 october 2020
-: Chung Yeung Festival, Day 9 of Month 9 (or if that day is a Sunday, then the following day)
-"重陽節" public on 6 october 2000
-"重陽節" public on 25 october 2001
-"重陽節" public on 14 october 2002
-"重陽節" public on 4 october 2003
-"重陽節" public on 22 october 2004
-"重陽節" public on 11 october 2005
-"重陽節" public on 30 october 2006
-"重陽節" public on 19 october 2007
-"重陽節" public on 7 october 2008
-"重陽節" public on 26 october 2009
-"重陽節" public on 5 october 2011
-"重陽節" public on 23 october 2012
-"重陽節" public on 13 october 2013
-"重陽節" public on 1 november 2014
-"重陽節" public on 21 october 2015
-"重陽節" public on 9 october 2016
-"重陽節" public on 10 october 2016
-"重陽節" public on 28 october 2017
-"重陽節" public on 17 october 2018
-"重陽節" public on 7 october 2019
-"重陽節" public on 25 october 2020
-"重陽節" public on 26 october 2020
-: National Day (or if that day is a Sunday, then the following day)
-"國慶日" public on october 1 shift to monday if sunday
-: Christmas Day (or if that day is a Sunday, then the second weekday after Christmas Day)
-"聖誕節後第一個周日" public religious on december 25
-"聖誕節後第一個周日" public on ( ( [december 25] == [sunday after ([december 25])]) ?
- [tuesday after ([december 25])] :
+
+: 國慶節(如該日為星期日,則為翌日)
+"國慶節" public on october 1
+"國慶節補假" public on ( ( [october 1] == [sunday after ([october 1])]) ?
+ [monday after ([october 1])] :
noop )
+: 聖誕節及其翌日(如任何一日為星期日,則為之後的下一日)
+"聖誕節" public on december 25
+"聖誕節補假" public on ( ( [december 25] == [sunday after ([december 25])]) ?
+ [tuesday after ([december 25])] :
+ noop )
+"聖誕節翌日" public on december 26
+"聖誕節翌日補假" public on ( ( [december 26] == [sunday after ([december 26])]) ?
+ [monday after ([december 26])] :
+ noop )
+:: 以農曆為基礎的假期
-:: Religious
-: Good Friday
-"耶穌受難節" religious on easter minus 2
-: The day following Good Friday
-"耶穌受難節翌日" religious on easter minus 1
-: Easter Monday
-"復活節星期一" religious on easter plus 1
-: The Birthday of the Buddha, Day 8 of Month 4 (or if that day is a Sunday, then the following day)
-"佛誕" religious on 11 may 2000
-"佛誕" religious on 30 may 2001
-"佛誕" religious on 19 may 2002
-"佛誕" religious on 19 may 2003
-"佛誕" religious on 8 may 2003
-"佛誕" religious on 26 may 2004
-"佛誕" religious on 15 may 2005
-"佛誕" religious on 16 may 2005
-"佛誕" religious on 5 may 2006
-"佛誕" religious on 24 may 2007
-"佛誕" religious on 12 may 2008
-"佛誕" religious on 2 may 2009
-"佛誕" religious on 21 may 2010
-"佛誕" religious on 10 may 2011
-"佛誕" religious on 28 may 2012
-"佛誕" religious on 17 may 2013
-"佛誕" religious on 6 may 2014
-"佛誕" religious on 25 may 2015
-"佛誕" religious on 14 may 2016
-"佛誕" religious on 3 may 2017
-"佛誕" religious on 22 may 2018
-"佛誕" religious on 12 may 2019
-"佛誕" religious on 13 may 2019
-"佛誕" religious on 30 may 2020
-
-:: Financial
-
-:: Cultural
-: The first weekday after Christmas Day
-"聖誕節" cultural on december 26 shift to monday if sunday
-
-:: School
-
-:: Daylight Saving
-
-:: Seasons
+"中秋節翌日" public on 17 september 1997
+"重陽節" public on 10 october 1997
-:: Name Days
+"農曆新年" public on 28 january 1998 length 3 days
+"清明節補假" public on 6 april 1998
+"端午節" public on 30 may 1998
+"中秋節翌日" public on 6 october 1998
+"重陽節" public on 28 october 1998
+
+"農曆新年" public on 16 february 1999 length 3 days
+"清明節補假" public on 6 april 1999
+"佛誕" public on 22 may 1999
+"端午節" public on 18 june 1999
+"中秋節翌日" public on 25 september 1999
+"重陽節補假" public on 18 october 1999
+
+"農曆新年" public on 4 february 2000 length 4 days
+"清明節" public on 4 april 2000
+"佛誕" public on 11 may 2000
+"端午節" public on 6 june 2000
+"中秋節翌日" public on 13 september 2000
+"重陽節" public on 6 october 2000
+
+"農曆新年" public on 24 january 2001 length 3 days
+"清明節" public on 5 april 2001
+"佛誕" public on 30 may 2001
+"端午節" public on 25 june 2001
+"中秋節翌日" public on 2 october 2001
+"重陽節" public on 25 october 2001
+
+"農曆新年" public on 12 february 2002 length 3 days
+"清明節" public on 5 april 2002
+"佛誕補假" public on 20 may 2002
+"端午節" public on 15 june 2002
+"中秋節" public on 21 september 2002
+"重陽節" public on 14 october 2002
+
+"農曆新年" public on 31 january 2003 length 4 days
+"清明節" public on 5 april 2003
+"佛誕" public on 8 may 2003
+"端午節" public on 4 june 2003
+"中秋節翌日" public on 12 september 2003
+"重陽節" public on 4 october 2003
+
+"農曆新年" public on 22 january 2004 length 3 days
+"清明節補假" public on 5 april 2004
+"佛誕" public on 26 may 2004
+"端午節" public on 22 june 2004
+"中秋節翌日" public on 29 september 2004
+"重陽節" public on 22 october 2004
+
+"農曆新年" public on 9 february 2005 length 3 days
+"清明節" public on 5 april 2005
+"佛誕補假" public on 16 may 2005
+"端午節" public on 11 june 2005
+"中秋節翌日" public on 19 september 2005
+"重陽節" public on 11 october 2005
+
+"農曆新年" public on 28 january 2006 length 4 days
+"清明節" public on 5 april 2006
+"佛誕" public on 5 may 2006
+"端午節" public on 31 may 2006
+"中秋節翌日" public on 7 october 2006
+"重陽節" public on 30 october 2006
+
+"農曆新年" public on 17 february 2007 length 4 days
+"清明節" public on 5 april 2007
+"佛誕" public on 24 may 2007
+"端午節" public on 19 june 2007
+"中秋節翌日" public on 26 september 2007
+"重陽節" public on 19 october 2007
+
+"農曆新年" public on 7 february 2008 length 3 days
+"清明節" public on 4 april 2008
+"佛誕" public on 12 may 2008
+"端午節補假" public on 9 june 2008
+"中秋節翌日" public on 15 september 2008
+"重陽節" public on 7 october 2008
+
+"農曆新年" public on 26 january 2009 length 3 days
+"清明節" public on 4 april 2009
+"佛誕" public on 2 may 2009
+"端午節" public on 28 may 2009
+"中秋節" public on 3 october 2009
+"重陽節" public on 26 october 2009
+
+"農曆新年" public on 13 february 2010 length 4 days
+"清明節補假" public on 6 april 2010
+"佛誕" public on 21 may 2010
+"端午節" public on 16 june 2010
+"中秋節翌日" public on 23 september 2010
+"重陽節" public on 16 october 2010
+
+"農曆新年" public on 3 february 2011 length 3 days
+"清明節" public on 5 april 2011
+"佛誕" public on 10 may 2011
+"端午節" public on 6 june 2011
+"中秋節翌日" public on 13 september 2011
+"重陽節" public on 5 october 2011
+
+"農曆新年" public on 23 january 2012 length 3 days
+"清明節" public on 4 april 2012
+"佛誕" public on 28 april 2012
+"端午節" public on 23 june 2012
+"中秋節翌日補假" public on 2 october 2012
+"重陽節" public on 23 october 2012
+
+"農曆新年" public on 10 february 2013 length 4 days
+"清明節" public on 4 april 2013
+"佛誕" public on 17 may 2013
+"端午節" public on 12 june 2013
+"中秋節翌日" public on 20 september 2013
+"重陽節補假" public on 14 october 2013
+
+"農曆新年" public on 31 january 2014 length 4 days
+"清明節" public on 5 april 2014
+"佛誕" public on 6 may 2014
+"端午節" public on 2 june 2014
+"中秋節翌日" public on 9 september 2014
+"重陽節" public on 2 october 2014
+
+"農曆新年" public on 19 february 2015 length 3 days
+"清明節補假" public on 7 april 2015
+"佛誕" public on 25 may 2015
+"端午節" public on 20 june 2015
+"中秋節翌日" public on 28 september 2015
+"重陽節" public on 21 october 2015
+
+"農曆新年" public on 8 february 2016 length 3 days
+"清明節" public on 4 april 2016
+"佛誕" public on 14 may 2016
+"端午節" public on 9 june 2016
+"中秋節翌日" public on 16 september 2016
+"重陽節補假" public on 10 october 2016
+
+"農曆新年" public on 28 january 2017 length 4 days
+"清明節" public on 4 april 2017
+"佛誕" public on 3 may 2017
+"端午節" public on 30 may 2017
+"中秋節翌日" public on 5 october 2017
+"重陽節" public on 28 october 2017
+
+"農曆新年" public on 16 february 2018 length 4 days
+"清明節" public on 5 april 2018
+"佛誕" public on 22 may 2018
+"端午節" public on 18 june 2018
+"中秋節翌日" public on 25 september 2018
+"重陽節" public on 17 october 2018
+
+"農曆新年" public on 5 february 2019 length 3 days
+"清明節" public on 5 april 2019
+"佛誕補假" public on 13 may 2019
+"端午節" public on 7 may 2019
+"中秋節翌日" public on 14 september 2019
+"重陽節" public on 7 october 2019
+
+"農曆新年" public on 25 january 2020 length 4 days
+"清明節" public on 4 april 2020
+"佛誕" public on 30 april 2020
+"端午節" public on 25 june 2020
+"中秋節翌日" public on 2 october 2020
+"重陽節補假" public on 26 october 2020
+
+"農曆新年" public on 12 february 2021 length 4 days
+"清明節補假" public on 6 april 2021
+"佛誕" public on 19 may 2021
+"端午節" public on 14 june 2021
+"中秋節翌日" public on 22 september 2021
+"重陽節" public on 14 october 2021
+
+"農曆新年" public on 1 february 2022 length 3 days
+"清明節" public on 5 april 2022
+"佛誕補假" public on 9 may 2022
+"端午節" public on 3 june 2022
+"中秋節翌日補假" public on 12 september 2022
+"重陽節" public on 4 october 2022
+
+"農曆新年" public on 22 january 2023 length 4 days
+"清明節" public on 5 april 2023
+"佛誕" public on 26 may 2023
+"端午節" public on 22 june 2023
+"中秋節翌日" public on 30 september 2023
+"重陽節" public on 23 october 2023
+
+"農曆新年" public on 10 february 2024 length 4 days
+"清明節" public on 4 april 2024
+"佛誕" public on 15 may 2024
+"端午節" public on 10 june 2024
+"中秋節翌日" public on 18 september 2024
+"重陽節" public on 11 october 2024
+
+"農曆新年" public on 29 january 2025 length 3 days
+"清明節" public on 4 april 2025
+"佛誕" public on 5 may 2025
+"端午節" public on 31 may 2025
+"中秋節翌日" public on 7 october 2025
+"重陽節" public on 29 october 2025
+
+"農曆新年" public on 17 february 2026 length 3 days
+"清明節補假" public on 7 april 2026
+"佛誕補假" public on 25 may 2026
+"端午節" public on 19 june 2026
+"中秋節翌日" public on 26 september 2026
+"重陽節補假" public on 19 october 2026
+
+"農曆新年" public on 6 february 2027 length 4 days
+"清明節" public on 5 april 2027
+"佛誕" public on 13 may 2027
+"端午節" public on 9 june 2027
+"中秋節翌日" public on 16 september 2027
+"重陽節" public on 8 october 2027
+
+"農曆新年" public on 26 january 2028 length 3 days
+"清明節" public on 4 april 2028
+"佛誕" public on 2 may 2028
+"端午節補假" public on 29 may 2028
+"中秋節翌日" public on 5 october 2028
+"重陽節" public on 26 october 2028
+
+"農曆新年" public on 13 february 2029 length 3 days
+"清明節" public on 4 april 2029
+"佛誕補假" public on 21 may 2029
+"端午節" public on 16 june 2029
+"中秋節翌日補假" public on 24 september 2029
+"重陽節" public on 16 october 2029
+
+"農曆新年" public on 1 february 2030 length 4 days
+"清明節" public on 5 april 2030
+"佛誕" public on 9 may 2030
+"端午節" public on 5 june 2030
+"中秋節翌日" public on 13 september 2030
+"重陽節" public on 5 october 2030
+
+:: 特別及已廢除假期
+
+"抗戰勝利紀念日" public on ((year >= 1997 && year <= 1998) ? [3rd monday in august] : noop)
+"國慶節翌日" public on ((year >= 1997 && year <= 1998) ? [2 october] : noop) shift to monday if sunday
+"千禧除夕" public on 31 december 1999
+"中國人民抗日戰爭勝利70周年紀念日" public on 3 september 2015
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.2/holidays/plan2/holiday_rs_sr new/kholidays-16.12.3/holidays/plan2/holiday_rs_sr
--- old/kholidays-16.12.2/holidays/plan2/holiday_rs_sr 2017-01-17 21:56:37.000000000 +0100
+++ new/kholidays-16.12.3/holidays/plan2/holiday_rs_sr 2017-02-26 19:53:27.000000000 +0100
@@ -36,6 +36,7 @@
[ monday after ([may 2]) ] : noop )
"Дан победе" public on may 9
"Видовдан" public on june 28
+"Дан примирја у Првом светском рату" public on ( (year >= 2012) ? [november 11] : noop )
:: Religious Holidays
"Православни Велики петак" public religious on pascha minus 2 days
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.2/holidays/plan2/holiday_rs_sr@ijekavian new/kholidays-16.12.3/holidays/plan2/holiday_rs_sr@ijekavian
--- old/kholidays-16.12.2/holidays/plan2/holiday_rs_sr@ijekavian 2017-01-17 21:56:37.000000000 +0100
+++ new/kholidays-16.12.3/holidays/plan2/holiday_rs_sr@ijekavian 2017-02-26 19:53:27.000000000 +0100
@@ -36,6 +36,7 @@
[ monday after ([may 2]) ] : noop )
"Дан побједе" public on may 9
"Видовдан" public on june 28
+"Дан примирја у Првом свјетском рату" public on ( (year >= 2012) ? [november 11] : noop )
:: Religious Holidays
"Православни Велики петак" public religious on pascha minus 2 days
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.2/holidays/plan2/holiday_rs_sr@ijekavianlatin new/kholidays-16.12.3/holidays/plan2/holiday_rs_sr@ijekavianlatin
--- old/kholidays-16.12.2/holidays/plan2/holiday_rs_sr@ijekavianlatin 2017-01-17 21:56:37.000000000 +0100
+++ new/kholidays-16.12.3/holidays/plan2/holiday_rs_sr@ijekavianlatin 2017-02-26 19:53:27.000000000 +0100
@@ -36,6 +36,7 @@
[ monday after ([may 2]) ] : noop )
"Dan pobjede" public on may 9
"Vidovdan" public on june 28
+"Dan primirja u Prvom svjetskom ratu" public on ( (year >= 2012) ? [november 11] : noop )
:: Religious Holidays
"Pravoslavni Veliki petak" public religious on pascha minus 2 days
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.2/holidays/plan2/holiday_rs_sr@latin new/kholidays-16.12.3/holidays/plan2/holiday_rs_sr@latin
--- old/kholidays-16.12.2/holidays/plan2/holiday_rs_sr@latin 2017-01-17 21:56:37.000000000 +0100
+++ new/kholidays-16.12.3/holidays/plan2/holiday_rs_sr@latin 2017-02-26 19:53:27.000000000 +0100
@@ -36,6 +36,7 @@
[ monday after ([may 2]) ] : noop )
"Dan pobede" public on may 9
"Vidovdan" public on june 28
+"Dan primirja u Prvom svetskom ratu" public on ( (year >= 2012) ? [november 11] : noop )
:: Religious Holidays
"Pravoslavni Veliki petak" public religious on pascha minus 2 days
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kholidays-16.12.2/holidays/plan2/holiday_ua_uk new/kholidays-16.12.3/holidays/plan2/holiday_ua_uk
--- old/kholidays-16.12.2/holidays/plan2/holiday_ua_uk 2017-01-17 21:56:37.000000000 +0100
+++ new/kholidays-16.12.3/holidays/plan2/holiday_ua_uk 2017-02-26 19:53:27.000000000 +0100
@@ -7,7 +7,7 @@
:: Oleg Ivashchenko
From 506bd08a6faf61c776beecb05f1acbe04223827a Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner
Date: Fri, 10 Mar 2017 13:33:10 +0100 Subject: Revert depfreeze breaking merges (KF5_VERSION, cmake, PIM_VERSION)
--- CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05164db..e0b67b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,28 +1,28 @@ -cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.4.40") +cmake_minimum_required(VERSION 2.8.12) -project(KHolidays VERSION ${PIM_VERSION}) +project(KHolidays) # ECM setup -set(KF5_VERSION "5.31.0") +set(KF5_VERSION "5.28.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) include(ECMSetupVersion) include(ECMPoQmTools) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(ECMCoverageOption) + +set(PIM_VERSION "5.4.3") set(KHOLIDAYS_LIB_VERSION ${PIM_VERSION}) -ecm_setup_version(PROJECT VARIABLE_PREFIX KHOLIDAYS +ecm_setup_version(${KHOLIDAYS_LIB_VERSION} VARIABLE_PREFIX KHOLIDAYS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfigVersion.cmake" SOVERSION 5 @@ -50,7 +50,7 @@ endif() ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Holidays") -configure_package_config_file( +ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5HolidaysConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} -- cgit v0.11.2