!160 sync upstream commits
From: @chinyu0704 Reviewed-by: @SuperSix173 Signed-off-by: @SuperSix173
This commit is contained in:
commit
756e6ce5fc
@ -0,0 +1,34 @@
|
||||
From 711b46f8fc4e8a3d5caf7d4820562d6cdfe9d769 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 9 Aug 2022 07:02:19 -0700
|
||||
Subject: [PATCH] Chile's DST is delayed by a week in September 2022
|
||||
|
||||
Reference:https://github.com/eggert/tz/commit/711b46f8fc4e8a3d5caf7d4820562d6cdfe9d769
|
||||
Conflict:remove NEWS part; remove comments in southamerica
|
||||
|
||||
* southamerica (Chile): Chile's 2022 start this spring is delayed
|
||||
from 09-04 to 09-11. (Thanks to Juan Correa.) For now, assume
|
||||
this is a one-off due to the vote on the new constitution.
|
||||
---
|
||||
NEWS | 4 ++++
|
||||
southamerica | 12 +++++++++++-
|
||||
2 files changed, 15 insertions(+), 1 deletion(-)
|
||||
|
||||
|
||||
diff --git a/southamerica b/southamerica
|
||||
index 55336a2..9b3abf8 100644
|
||||
--- a/southamerica
|
||||
+++ b/southamerica
|
||||
@@ -1340,7 +1348,9 @@ Rule Chile 2012 2014 - Sep Sun>=2 4:00u 1:00 -
|
||||
Rule Chile 2016 2018 - May Sun>=9 3:00u 0 -
|
||||
Rule Chile 2016 2018 - Aug Sun>=9 4:00u 1:00 -
|
||||
Rule Chile 2019 max - Apr Sun>=2 3:00u 0 -
|
||||
-Rule Chile 2019 max - Sep Sun>=2 4:00u 1:00 -
|
||||
+Rule Chile 2019 2021 - Sep Sun>=2 4:00u 1:00 -
|
||||
+Rule Chile 2022 only - Sep Sun>=9 4:00u 1:00 -
|
||||
+Rule Chile 2023 max - Sep Sun>=2 4:00u 1:00 -
|
||||
# IATA SSIM anomalies: (1992-02) says 1992-03-14;
|
||||
# (1996-09) says 1998-03-08. Ignore these.
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
--
|
||||
2.23.0
|
||||
70
backport-Fiji-no-longer-observes-DST.patch
Normal file
70
backport-Fiji-no-longer-observes-DST.patch
Normal file
@ -0,0 +1,70 @@
|
||||
From f95ccd097766eda57575e0f93c3927e4e2f45def Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Thu, 27 Oct 2022 09:51:13 -0700
|
||||
Subject: [PATCH] Fiji no longer observes DST
|
||||
|
||||
Reference: https://github.com/eggert/tz/commit/918650731803579659fa6b5eedf3f80310afc59f
|
||||
Conflict: NEWS context
|
||||
|
||||
* NEWS: Mention this (thanks to Shalvin Narayan).
|
||||
* australasia (Fiji): Remove our incorrect guess for spring 2022
|
||||
on. For now, guess no DST indefinitely.
|
||||
---
|
||||
NEWS | 4 ++++
|
||||
australasia | 12 ++++++++----
|
||||
2 files changed, 12 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index 50a1302..2aaadec 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,12 +1,16 @@
|
||||
News for the tz database
|
||||
|
||||
Briefly:
|
||||
+ Fiji no longer observes DST.
|
||||
Palestine transitions are now Saturdays at 02:00.
|
||||
Simplify three Ukraine zones into one.
|
||||
Jordan and Syria switch from +02/+03 with DST to year-round +03.
|
||||
|
||||
Changes to future timestamps
|
||||
|
||||
+ Fiji will not observe DST in 2022/3. (Thanks to Shalvin Narayan.)
|
||||
+ For now, assume DST is suspended indefinitely.
|
||||
+
|
||||
Palestine now springs forward and falls back at 02:00 on the first
|
||||
Saturday on or after March 24 and October 24, respectively. This
|
||||
this means 2022 falls back 10-29 at 02:00, not 10-28 at 01:00.
|
||||
diff --git a/australasia b/australasia
|
||||
index 77c2c69..2a0c732 100644
|
||||
--- a/australasia
|
||||
+++ b/australasia
|
||||
@@ -399,8 +399,14 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
|
||||
# concerned shifting arrival and departure times, which may look like a simple
|
||||
# thing but requires some significant logistical adjustments domestically and
|
||||
# internationally."
|
||||
-# Assume for now that DST will resume with the recent pre-2020 rules for the
|
||||
-# 2022/2023 season.
|
||||
+
|
||||
+# From Shalvin Narayan (2022-10-27):
|
||||
+# Please note that there will not be any daylight savings time change
|
||||
+# in Fiji for 2022-2023....
|
||||
+# https://www.facebook.com/FijianGovernment/posts/pfbid0mmWVTYmTibn66ybpFda75pDcf34SSpoSaskJW5gXwaKo5Sgc7273Q4fXWc6kQV6Hl
|
||||
+#
|
||||
+# From Paul Eggert (2022-10-27):
|
||||
+# For now, assume DST is suspended indefinitely.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
|
||||
@@ -415,8 +421,6 @@ Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 -
|
||||
Rule Fiji 2015 2021 - Jan Sun>=12 3:00 0 -
|
||||
Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 -
|
||||
Rule Fiji 2020 only - Dec 20 2:00 1:00 -
|
||||
-Rule Fiji 2022 max - Nov Sun>=8 2:00 1:00 -
|
||||
-Rule Fiji 2023 max - Jan Sun>=12 3:00 0 -
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
|
||||
12:00 Fiji +12/+13
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -0,0 +1,68 @@
|
||||
From 4b0bd9e54a56b5bbbac55db184c925a6fab3edd6 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Mon, 28 Nov 2022 18:19:02 -0800
|
||||
Subject: [PATCH] Greenland change should affect only America/Nuuk
|
||||
|
||||
Reference: https://github.com/eggert/tz/commit/36acd567fbd8df3e085351bec36974fde035e0f0
|
||||
Conflict: remove NEWS
|
||||
|
||||
Although the situation is fluid, it seems I likely guessed wrong
|
||||
about Ittoqqortoormiit in my Greenland changes three days ago.
|
||||
(Thanks to Jonas Nyrup.)
|
||||
* NEWS: Mention this.
|
||||
* europe (America/Scoresbysund): Revert recent change.
|
||||
---
|
||||
europe | 24 +++++++++++++++++-------
|
||||
1 file changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/europe b/europe
|
||||
index 12b1d12..122a0b5 100644
|
||||
--- a/europe
|
||||
+++ b/europe
|
||||
@@ -1161,17 +1161,28 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn
|
||||
# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
|
||||
# It is their only National Park.
|
||||
|
||||
+# From Jonas Nyrup (2022-11-24):
|
||||
+# On last Saturday in October 2023 when DST ends America/Nuuk will switch
|
||||
+# from -03/-02 to -02/-01
|
||||
+# https://sermitsiaq.ag/forslagtidsforskel-danmark-mindskes-sommertid-beholdes
|
||||
+# ...
|
||||
+# https://sermitsiaq.ag/groenland-skifte-tidszone-trods-bekymringer
|
||||
+#
|
||||
# From Jürgen Appel (2022-11-25):
|
||||
# https://ina.gl/samlinger/oversigt-over-samlinger/samling/dagsordener/dagsorden.aspx?lang=da&day=24-11-2022
|
||||
# If I understand this correctly, from the next planned switch to
|
||||
# summer time, Greenland will permanently stay at that time, i.e. no
|
||||
# switch back to winter time in 2023 will occur.
|
||||
#
|
||||
-# From Paul Eggert (2022-11-25):
|
||||
-# For now, assume that this applies simultaneously to Ittoqqortoormiit
|
||||
-# (currently -01) as well as to Nuuk (currently -03), and that
|
||||
-# Danmarkshavn and Thule are unaffected since they are not using EU
|
||||
-# rules anyway and some of the remarks were about EU rules.
|
||||
+# From Paul Eggert (2022-11-28):
|
||||
+# The official document in Danish
|
||||
+# https://naalakkersuisut.gl/-/media/naalakkersuisut/filer/kundgoerelser/2022/11/2511/31_da_inatsisartutlov-om-tidens-bestemmelse.pdf?la=da&hash=A33597D8A38CC7038465241119EF34F3
|
||||
+# says standard time for Greenland is -02, that Naalakkersuisut can lay down
|
||||
+# rules for DST and can require some areas to use a different time zone,
|
||||
+# and that this all takes effect 2023-03-25 22:00. The abovementioned
|
||||
+# "bekymringer" URL says the intent is no transition March 25, that
|
||||
+# Greenland will not go back to winter time in fall 2023, and that
|
||||
+# only America/Nuuk is affected (though further changes may occur).
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
|
||||
@@ -1192,8 +1203,7 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
|
||||
Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit
|
||||
-2:00 - -02 1980 Apr 6 2:00
|
||||
-2:00 C-Eur -02/-01 1981 Mar 29
|
||||
- -1:00 EU -01/+00 2023 Mar 25 24:00
|
||||
- 0:00 - +00
|
||||
+ -1:00 EU -01/+00
|
||||
Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb
|
||||
-3:00 - -03 1980 Apr 6 2:00
|
||||
-3:00 EU -03/-02 2023 Mar 25 22:00
|
||||
--
|
||||
2.33.0
|
||||
|
||||
179
backport-Iran-will-stop-DST-in-2023.patch
Normal file
179
backport-Iran-will-stop-DST-in-2023.patch
Normal file
@ -0,0 +1,179 @@
|
||||
From 66b18d9835dda089d65349c86e7851c4f0746e09 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 10 May 2022 15:39:01 -0700
|
||||
Subject: [PATCH] Iran will stop DST in 2023
|
||||
|
||||
(Thanks to Ali Mirjamali.)
|
||||
* NEWS: Mention this.
|
||||
* asia (Iran): Remove post-2022 transitions.
|
||||
---
|
||||
asia | 139 ++++-------------------------------------------------------
|
||||
1 file changed, 8 insertions(+), 131 deletions(-)
|
||||
|
||||
diff --git a/asia b/asia
|
||||
index ca69d36..dd2632a 100644
|
||||
--- a/asia
|
||||
+++ b/asia
|
||||
@@ -1438,63 +1438,6 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
|
||||
#
|
||||
# From Paul Eggert (2018-11-30):
|
||||
# Go with Shanks & Pottenger before Sept. 1991, and with Pournader thereafter.
|
||||
-# I used the following code in GNU Emacs 26.1 to generate the "Rule Iran"
|
||||
-# lines from 2008 through 2087. Emacs 26.1 uses Ed Reingold's
|
||||
-# cal-persia implementation of Birashk's approximation, which in the
|
||||
-# 2008-2087 range disagrees with the astronomical Persian calendar
|
||||
-# for Persian years 1404 (Gregorian 2025) and 1437 (Gregorian 2058), so
|
||||
-# the following code special-cases those years. See Table 15.1, page 264, of:
|
||||
-# Edward M. Reingold and Nachum Dershowitz, Calendrical Calculations:
|
||||
-# The Ultimate Edition, Cambridge University Press (2018).
|
||||
-# https://www.cambridge.org/fr/academic/subjects/computer-science/computing-general-interest/calendrical-calculations-ultimate-edition-4th-edition
|
||||
-# Page 258, footnote 2, of this book says there is some dispute over what will
|
||||
-# happen in 2091 (and some other years after that), so this code
|
||||
-# stops in 2087, as 2088 and 2089 agree with the "max" rule below.
|
||||
-# (cl-loop
|
||||
-# initially (require 'cal-persia)
|
||||
-# with first-persian-year = 1387
|
||||
-# with last-persian-year = 1466
|
||||
-# ;; Exceptional years in the above range,
|
||||
-# ;; from Reingold & Dershowitz Table 15.1, page 264:
|
||||
-# with exceptional-persian-years = '(1404 1437)
|
||||
-# with range-start = nil
|
||||
-# for persian-year from first-persian-year to last-persian-year
|
||||
-# do
|
||||
-# (let*
|
||||
-# ((exceptional-year-offset
|
||||
-# (if (member persian-year exceptional-persian-years) 1 0))
|
||||
-# (beg-dst-absolute
|
||||
-# (+ (calendar-persian-to-absolute (list 1 1 persian-year))
|
||||
-# exceptional-year-offset))
|
||||
-# (end-dst-absolute
|
||||
-# (+ (calendar-persian-to-absolute (list 6 30 persian-year))
|
||||
-# exceptional-year-offset))
|
||||
-# (next-year-beg-dst-absolute
|
||||
-# (+ (calendar-persian-to-absolute (list 1 1 (1+ persian-year)))
|
||||
-# (if (member (1+ persian-year) exceptional-persian-years) 1 0)))
|
||||
-# (beg-dst (calendar-gregorian-from-absolute beg-dst-absolute))
|
||||
-# (end-dst (calendar-gregorian-from-absolute end-dst-absolute))
|
||||
-# (next-year-beg-dst (calendar-gregorian-from-absolute
|
||||
-# next-year-beg-dst-absolute))
|
||||
-# (year (calendar-extract-year beg-dst))
|
||||
-# (range-end (if range-start year "only")))
|
||||
-# (setq range-start (or range-start year))
|
||||
-# (when (or (/= (calendar-extract-day beg-dst)
|
||||
-# (calendar-extract-day next-year-beg-dst))
|
||||
-# (= persian-year last-persian-year))
|
||||
-# (insert
|
||||
-# (format
|
||||
-# "Rule\tIran\t%d\t%s\t-\t%s\t%2d\t24:00\t1:00\t-\n"
|
||||
-# range-start range-end
|
||||
-# (calendar-month-name (calendar-extract-month beg-dst) t)
|
||||
-# (calendar-extract-day beg-dst)))
|
||||
-# (insert
|
||||
-# (format
|
||||
-# "Rule\tIran\t%d\t%s\t-\t%s\t%2d\t24:00\t0\t-\n"
|
||||
-# range-start range-end
|
||||
-# (calendar-month-name (calendar-extract-month end-dst) t)
|
||||
-# (calendar-extract-day end-dst)))
|
||||
-# (setq range-start nil))))
|
||||
#
|
||||
# From Oscar van Vlijmen (2005-03-30), writing about future
|
||||
# discrepancies between cal-persia and the Iranian calendar:
|
||||
@@ -1528,6 +1471,12 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov
|
||||
# be changed back to its previous state on the 24 hours of the
|
||||
# thirtieth day of Shahrivar.
|
||||
#
|
||||
+# From Ali Mirjamali (2022-05-10):
|
||||
+# Official IR News Agency announcement: irna.ir/xjJ3TT
|
||||
+# Iran Parliament (Majles) official announcement : shorturl.at/fhtIR
|
||||
+# Highlights: DST will be cancelled for the next Iranian year 1402
|
||||
+# (i.e 2023-March-21) and forthcoming years.
|
||||
+#
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Iran 1978 1980 - Mar 20 24:00 1:00 -
|
||||
Rule Iran 1978 only - Oct 20 24:00 0 -
|
||||
@@ -1562,80 +1511,8 @@ Rule Iran 2017 2019 - Mar 21 24:00 1:00 -
|
||||
Rule Iran 2017 2019 - Sep 21 24:00 0 -
|
||||
Rule Iran 2020 only - Mar 20 24:00 1:00 -
|
||||
Rule Iran 2020 only - Sep 20 24:00 0 -
|
||||
-Rule Iran 2021 2023 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2021 2023 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2024 only - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2024 only - Sep 20 24:00 0 -
|
||||
-Rule Iran 2025 2027 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2025 2027 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2028 2029 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2028 2029 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2030 2031 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2030 2031 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2032 2033 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2032 2033 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2034 2035 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2034 2035 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2036 2037 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2036 2037 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2038 2039 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2038 2039 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2040 2041 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2040 2041 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2042 2043 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2042 2043 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2044 2045 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2044 2045 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2046 2047 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2046 2047 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2048 2049 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2048 2049 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2050 2051 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2050 2051 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2052 2053 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2052 2053 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2054 2055 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2054 2055 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2056 2057 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2056 2057 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2058 2059 - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2058 2059 - Sep 21 24:00 0 -
|
||||
-Rule Iran 2060 2062 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2060 2062 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2063 only - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2063 only - Sep 21 24:00 0 -
|
||||
-Rule Iran 2064 2066 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2064 2066 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2067 only - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2067 only - Sep 21 24:00 0 -
|
||||
-Rule Iran 2068 2070 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2068 2070 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2071 only - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2071 only - Sep 21 24:00 0 -
|
||||
-Rule Iran 2072 2074 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2072 2074 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2075 only - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2075 only - Sep 21 24:00 0 -
|
||||
-Rule Iran 2076 2078 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2076 2078 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2079 only - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2079 only - Sep 21 24:00 0 -
|
||||
-Rule Iran 2080 2082 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2080 2082 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2083 only - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2083 only - Sep 21 24:00 0 -
|
||||
-Rule Iran 2084 2086 - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2084 2086 - Sep 20 24:00 0 -
|
||||
-Rule Iran 2087 only - Mar 21 24:00 1:00 -
|
||||
-Rule Iran 2087 only - Sep 21 24:00 0 -
|
||||
-#
|
||||
-# The following rules are approximations starting in the year 2088.
|
||||
-# These are the best post-2088 approximations available, given the
|
||||
-# restrictions of a single rule using ordinary Gregorian dates.
|
||||
-# At some point this table will need to be extended, though quite
|
||||
-# possibly Iran will change the rules first.
|
||||
-Rule Iran 2088 max - Mar 20 24:00 1:00 -
|
||||
-Rule Iran 2088 max - Sep 20 24:00 0 -
|
||||
+Rule Iran 2021 2022 - Mar 21 24:00 1:00 -
|
||||
+Rule Iran 2021 2022 - Sep 21 24:00 0 -
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Asia/Tehran 3:25:44 - LMT 1916
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -0,0 +1,91 @@
|
||||
From 0b7bd0c706347be1856fd7b1f1455d91cc6fae03 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Wed, 5 Oct 2022 17:55:04 -0700
|
||||
Subject: [PATCH] Jordan to switch from +02/+03 with DST to plain +03
|
||||
|
||||
Reference:https://github.com/eggert/tz/commit/3aa74b7f79a3df2f92b563a515a7e24fa175a2eb
|
||||
Conflict:NEWS context
|
||||
|
||||
* NEWS: Mention this.
|
||||
* asia (Jordan, Asia/Amman): Go to year-round +03,
|
||||
effective when the fallback would have occurred.
|
||||
(Thanks to Issam Al-Zuwairi.)
|
||||
---
|
||||
NEWS | 8 ++++----
|
||||
asia | 18 ++++++++++++++----
|
||||
2 files changed, 18 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index cb0f534..50a1302 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -3,7 +3,7 @@ News for the tz database
|
||||
Briefly:
|
||||
Palestine transitions are now Saturdays at 02:00.
|
||||
Simplify three Ukraine zones into one.
|
||||
- Syria is switching from +02/+03 with DST to year-round +03.
|
||||
+ Jordan and Syria switch from +02/+03 with DST to year-round +03.
|
||||
|
||||
Changes to future timestamps
|
||||
|
||||
@@ -12,9 +12,9 @@ News for the tz database
|
||||
this means 2022 falls back 10-29 at 02:00, not 10-28 at 01:00.
|
||||
(Thanks to Heba Hamad.)
|
||||
|
||||
- Syria is abandoning the DST regime and is changing to permanent
|
||||
- +03, so it will not fall back from +03 to +02 on 2022-10-28.
|
||||
- (Thanks to Steffen Thorsen.)
|
||||
+ Jordan and Syria are abandoning the DST regime and are changing to
|
||||
+ permanent +03, so they will not fall back from +03 to +02 on
|
||||
+ 2022-10-28. (Thanks to Steffen Thorsen and Issam Al-Zuwairi.)
|
||||
|
||||
Release 2022a - 2022-03-15 23:02:01 -0700
|
||||
|
||||
diff --git a/asia b/asia
|
||||
index 7c29e49..950bd3f 100644
|
||||
--- a/asia
|
||||
+++ b/asia
|
||||
@@ -2118,6 +2118,15 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
|
||||
# From the Arabic version, it seems to say it would be at midnight
|
||||
# (assume 24:00) on the last Thursday in February, starting from 2022.
|
||||
|
||||
+# From Issam Al-Zuwairi (2022-10-05):
|
||||
+# The Council of Ministers in Jordan decided Wednesday 5th October 2022,
|
||||
+# that daylight saving time (DST) will be throughout the year....
|
||||
+# https://en.royanews.tv/news/37769/2022-10-05
|
||||
+#
|
||||
+# From Paul Eggert (2022-10-05):
|
||||
+# Like Syria, model this as a transition from EEST +03 (DST) to plain +03
|
||||
+# (non-DST) at the point where DST would otherwise have ended.
|
||||
+
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Jordan 1973 only - Jun 6 0:00 1:00 S
|
||||
Rule Jordan 1973 1975 - Oct 1 0:00 0 -
|
||||
@@ -2149,11 +2158,12 @@ Rule Jordan 2005 only - Sep lastFri 0:00s 0 -
|
||||
Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 -
|
||||
Rule Jordan 2013 only - Dec 20 0:00 0 -
|
||||
Rule Jordan 2014 2021 - Mar lastThu 24:00 1:00 S
|
||||
-Rule Jordan 2014 max - Oct lastFri 0:00s 0 -
|
||||
-Rule Jordan 2022 max - Feb lastThu 24:00 1:00 S
|
||||
+Rule Jordan 2014 2022 - Oct lastFri 0:00s 0 -
|
||||
+Rule Jordan 2022 only - Feb lastThu 24:00 1:00 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Asia/Amman 2:23:44 - LMT 1931
|
||||
- 2:00 Jordan EE%sT
|
||||
+ 2:00 Jordan EE%sT 2022 Oct 28 0:00s
|
||||
+ 3:00 - +03
|
||||
|
||||
|
||||
# Kazakhstan
|
||||
@@ -3717,7 +3727,7 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 -
|
||||
# Tuesday 4 October ..."
|
||||
#
|
||||
# From Paul Eggert (2022-10-05):
|
||||
-# Model this as a transition from EEST +03 (DST) to plain +03
|
||||
+# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03
|
||||
# (non-DST) at the point where DST would otherwise have ended.
|
||||
|
||||
Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -0,0 +1,58 @@
|
||||
From 0aa7ed3b4cf7a0ab511e2a7119ec9a9207708162 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Fri, 25 Nov 2022 09:44:14 -0800
|
||||
Subject: [PATCH] Most of Greenland stops clock-changing after March
|
||||
|
||||
Reference: https://github.com/eggert/tz/commit/2fb29226487e83979f2b674688f4c1127314986e
|
||||
Conflict: remove NEWS
|
||||
|
||||
* NEWS: Mention this.
|
||||
* europe (America/Scoresbysund, America/Nuuk):
|
||||
Add an hour to UTC offset starting 2023-03-25 22:00 Nuuk time.
|
||||
No DST after that.
|
||||
---
|
||||
europe | 18 ++++++++++++++++--
|
||||
1 file changed, 16 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/europe b/europe
|
||||
index 208585d..12b1d12 100644
|
||||
--- a/europe
|
||||
+++ b/europe
|
||||
@@ -1160,7 +1160,19 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn
|
||||
# "National Park" by Executive Order:
|
||||
# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
|
||||
# It is their only National Park.
|
||||
+
|
||||
+# From Jürgen Appel (2022-11-25):
|
||||
+# https://ina.gl/samlinger/oversigt-over-samlinger/samling/dagsordener/dagsorden.aspx?lang=da&day=24-11-2022
|
||||
+# If I understand this correctly, from the next planned switch to
|
||||
+# summer time, Greenland will permanently stay at that time, i.e. no
|
||||
+# switch back to winter time in 2023 will occur.
|
||||
#
|
||||
+# From Paul Eggert (2022-11-25):
|
||||
+# For now, assume that this applies simultaneously to Ittoqqortoormiit
|
||||
+# (currently -01) as well as to Nuuk (currently -03), and that
|
||||
+# Danmarkshavn and Thule are unaffected since they are not using EU
|
||||
+# rules anyway and some of the remarks were about EU rules.
|
||||
+
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
|
||||
Rule Thule 1991 1992 - Sep lastSun 2:00 0 S
|
||||
@@ -1180,10 +1192,12 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
|
||||
Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit
|
||||
-2:00 - -02 1980 Apr 6 2:00
|
||||
-2:00 C-Eur -02/-01 1981 Mar 29
|
||||
- -1:00 EU -01/+00
|
||||
+ -1:00 EU -01/+00 2023 Mar 25 24:00
|
||||
+ 0:00 - +00
|
||||
Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb
|
||||
-3:00 - -03 1980 Apr 6 2:00
|
||||
- -3:00 EU -03/-02
|
||||
+ -3:00 EU -03/-02 2023 Mar 25 22:00
|
||||
+ -2:00 - -02
|
||||
Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik
|
||||
-4:00 Thule A%sT
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
107
backport-Most-of-Mexico-will-no-longer-observe-DST.patch
Normal file
107
backport-Most-of-Mexico-will-no-longer-observe-DST.patch
Normal file
@ -0,0 +1,107 @@
|
||||
From b834dd15af4ea71a2ed2b379778775c8b5722899 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Fri, 28 Oct 2022 17:57:48 -0700
|
||||
Subject: [PATCH] Most of Mexico will no longer observe DST
|
||||
|
||||
Reference: https://github.com/eggert/tz/commit/2050724fa1144bacb0d35c7cd9b862da858406c4
|
||||
Conflict: NEWS context; northamerica context
|
||||
|
||||
Also, Chihuahua moves to year-round -06.
|
||||
* NEWS: Mention this.
|
||||
* northamerica (Mexico): No DST after 2022.
|
||||
(America/Ojinaga, America/Chihuahua): Switch from -07 to -06
|
||||
on 2022-10-30 02:00.
|
||||
---
|
||||
NEWS | 9 +++++++++
|
||||
northamerica | 20 ++++++++++++++++----
|
||||
2 files changed, 25 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index 2aaadec..dc5fe5c 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,6 +1,8 @@
|
||||
News for the tz database
|
||||
|
||||
Briefly:
|
||||
+ Mexico will no longer observe DST except near the US border.
|
||||
+ Chihuahua moves to year-round -06 on 2022-10-30.
|
||||
Fiji no longer observes DST.
|
||||
Palestine transitions are now Saturdays at 02:00.
|
||||
Simplify three Ukraine zones into one.
|
||||
@@ -8,6 +10,13 @@ News for the tz database
|
||||
|
||||
Changes to future timestamps
|
||||
|
||||
+ Mexico will no longer observe DST after 2022, except for areas
|
||||
+ near the US border that continue to observe US DST rules.
|
||||
+ On 2022-10-30 at 02:00 the Mexican state of Chihuahua moves
|
||||
+ from -07 (-06 with DST) to year-round -06, thus not changing
|
||||
+ its clocks that day. The new law states that Chihuahua
|
||||
+ near the US border no longer observes US DST.
|
||||
+
|
||||
Fiji will not observe DST in 2022/3. (Thanks to Shalvin Narayan.)
|
||||
For now, assume DST is suspended indefinitely.
|
||||
|
||||
diff --git a/northamerica b/northamerica
|
||||
index fb5c94b..0ceeeea 100644
|
||||
--- a/northamerica
|
||||
+++ b/northamerica
|
||||
@@ -2616,6 +2616,12 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
||||
# 5- The islands, reefs and keys shall take their timezone from the
|
||||
# longitude they are located at.
|
||||
|
||||
+# From Paul Eggert (2022-10-28):
|
||||
+# The new Mexican law was published today:
|
||||
+# https://www.dof.gob.mx/nota_detalle.php?codigo=5670045&fecha=28/10/2022
|
||||
+# This abolishes DST except where US DST rules are observed,
|
||||
+# and in addition changes all of Chihuahua to -06 with no DST.
|
||||
+
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
|
||||
Rule Mexico 1939 only - Jun 25 0:00 0 S
|
||||
@@ -2629,8 +2635,8 @@ Rule Mexico 1996 2000 - Apr Sun>=1 2:00 1:00 D
|
||||
Rule Mexico 1996 2000 - Oct lastSun 2:00 0 S
|
||||
Rule Mexico 2001 only - May Sun>=1 2:00 1:00 D
|
||||
Rule Mexico 2001 only - Sep lastSun 2:00 0 S
|
||||
-Rule Mexico 2002 max - Apr Sun>=1 2:00 1:00 D
|
||||
-Rule Mexico 2002 max - Oct lastSun 2:00 0 S
|
||||
+Rule Mexico 2002 2022 - Apr Sun>=1 2:00 1:00 D
|
||||
+Rule Mexico 2002 2022 - Oct lastSun 2:00 0 S
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
# Quintana Roo; represented by Cancún
|
||||
Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56
|
||||
@@ -2687,7 +2693,8 @@ Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
|
||||
-6:00 Mexico C%sT 1998
|
||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
||||
-7:00 Mexico M%sT 2010
|
||||
- -7:00 US M%sT
|
||||
+ -7:00 US M%sT 2022 Oct 30 2:00
|
||||
+ -6:00 - CST
|
||||
# Chihuahua (away from US border)
|
||||
Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
@@ -2698,7 +2705,8 @@ Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40
|
||||
-6:00 - CST 1996
|
||||
-6:00 Mexico C%sT 1998
|
||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
||||
- -7:00 Mexico M%sT
|
||||
+ -7:00 Mexico M%sT 2022 Oct 30 2:00
|
||||
+ -6:00 - CST
|
||||
# Sonora
|
||||
Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
@@ -2802,6 +2810,10 @@ Zone America/Tijuana -7:48:04 - LMT 1922 Jan 1 0:11:56
|
||||
# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
|
||||
# It has been moved to the 'backward' file.
|
||||
#
|
||||
+# From Paul Eggert (2022-10-28):
|
||||
+# Today's new law states that the entire state of Baja California
|
||||
+# follows US DST rules, which agrees with simplifications noted above.
|
||||
+#
|
||||
#
|
||||
# Revillagigedo Is
|
||||
# no information
|
||||
--
|
||||
2.33.0
|
||||
|
||||
67
backport-Much-of-Greenland-still-uses-DST-from-2024-on.patch
Normal file
67
backport-Much-of-Greenland-still-uses-DST-from-2024-on.patch
Normal file
@ -0,0 +1,67 @@
|
||||
From 6438e996dc99cd5988b1ddd6dc3f95dfd1919caf Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Fri, 2 Dec 2022 13:26:46 -0800
|
||||
Subject: [PATCH] Much of Greenland still uses DST from 2024 on
|
||||
|
||||
Reference: https://github.com/eggert/tz/commit/bb7bfd2dd475402b79a87263ee89aa78c4af7c60
|
||||
Conflict: remove NEWS;
|
||||
|
||||
(Thanks to Thomas M. Steenholdt.)
|
||||
* NEWS: Mention this.
|
||||
* europe (America/Nuuk): Instead of switching from -03/-02 to
|
||||
permanent -02 in March 2023, switch from -03/-02 to -02/-01
|
||||
in October 2023.
|
||||
---
|
||||
europe | 29 ++++++++++++++---------------
|
||||
1 file changed, 14 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/europe b/europe
|
||||
index 122a0b5..7f00931 100644
|
||||
--- a/europe
|
||||
+++ b/europe
|
||||
@@ -1170,19 +1170,18 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn
|
||||
#
|
||||
# From Jürgen Appel (2022-11-25):
|
||||
# https://ina.gl/samlinger/oversigt-over-samlinger/samling/dagsordener/dagsorden.aspx?lang=da&day=24-11-2022
|
||||
-# If I understand this correctly, from the next planned switch to
|
||||
-# summer time, Greenland will permanently stay at that time, i.e. no
|
||||
-# switch back to winter time in 2023 will occur.
|
||||
-#
|
||||
-# From Paul Eggert (2022-11-28):
|
||||
-# The official document in Danish
|
||||
-# https://naalakkersuisut.gl/-/media/naalakkersuisut/filer/kundgoerelser/2022/11/2511/31_da_inatsisartutlov-om-tidens-bestemmelse.pdf?la=da&hash=A33597D8A38CC7038465241119EF34F3
|
||||
-# says standard time for Greenland is -02, that Naalakkersuisut can lay down
|
||||
-# rules for DST and can require some areas to use a different time zone,
|
||||
-# and that this all takes effect 2023-03-25 22:00. The abovementioned
|
||||
-# "bekymringer" URL says the intent is no transition March 25, that
|
||||
-# Greenland will not go back to winter time in fall 2023, and that
|
||||
-# only America/Nuuk is affected (though further changes may occur).
|
||||
+#
|
||||
+# From Thomas M. Steenholdt (2022-12-02):
|
||||
+# - The bill to move America/Nuuk from UTC-03 to UTC-02 passed.
|
||||
+# - The bill to stop observing DST did not (Greenland will stop observing DST
|
||||
+# when EU does).
|
||||
+# Details on the implementation are here (section 6):
|
||||
+# https://ina.gl/dvd/EM%202022/pdf/media/2553529/pkt17_em2022_tidens_bestemmelse_bem_da.pdf
|
||||
+# This is how the change will be implemented:
|
||||
+# 1. The shift *to* DST in 2023 happens as normal.
|
||||
+# 2. The shift *from* DST in 2023 happens as normal, but coincides with the
|
||||
+# shift to UTC-02 normaltime (people will not change their clocks here).
|
||||
+# 3. After this, DST is still observed, but as -02/-01 instead of -03/-02.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D
|
||||
@@ -1206,8 +1205,8 @@ Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit
|
||||
-1:00 EU -01/+00
|
||||
Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb
|
||||
-3:00 - -03 1980 Apr 6 2:00
|
||||
- -3:00 EU -03/-02 2023 Mar 25 22:00
|
||||
- -2:00 - -02
|
||||
+ -3:00 EU -03/-02 2023 Oct 29 1:00u
|
||||
+ -2:00 EU -02/-01
|
||||
Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik
|
||||
-4:00 Thule A%sT
|
||||
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -0,0 +1,75 @@
|
||||
From dd5a45a91d9da0c178de9541334ab6cf05deb2c0 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 30 Aug 2022 12:45:52 -0500
|
||||
Subject: [PATCH] Palestine transitions are now Saturdays at 02:00
|
||||
|
||||
Reference: https://github.com/eggert/tz/commit/c42d108da5a95cd0432bfeeff35498d695d09da8
|
||||
Conflict: News context
|
||||
|
||||
(Thanks to Heba Hamad.)
|
||||
* NEWS: Mention this.
|
||||
* asia (Palestine): Mar and Oct Sat>=24 2:00 going forward.
|
||||
---
|
||||
NEWS | 11 +++++++++++
|
||||
asia | 17 +++++++++++++++--
|
||||
2 files changed, 26 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index af39e69..df6b384 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -1,5 +1,16 @@
|
||||
News for the tz database
|
||||
|
||||
+ Briefly:
|
||||
+ Palestine transitions are now Saturdays at 02:00.
|
||||
+ Simplify three Ukraine zones into one.
|
||||
+
|
||||
+ Changes to future timestamps
|
||||
+
|
||||
+ Palestine now springs forward and falls back at 02:00 on the first
|
||||
+ Saturday on or after March 24 and October 24, respectively. This
|
||||
+ this means 2022 falls back 10-29 at 02:00, not 10-28 at 01:00.
|
||||
+ (Thanks to Heba Hamad.)
|
||||
+
|
||||
Release 2022a - 2022-03-15 23:02:01 -0700
|
||||
|
||||
Briefly:
|
||||
diff --git a/asia b/asia
|
||||
index 9698cf9..28e130e 100644
|
||||
--- a/asia
|
||||
+++ b/asia
|
||||
@@ -3292,6 +3292,17 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
||||
# From Heba Hamad (2022-03-10):
|
||||
# summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM.
|
||||
|
||||
+# From Heba Hamad (2022-08-30):
|
||||
+# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by
|
||||
+# 60 minutes backwards. Also the state of Palestine adopted the summer
|
||||
+# and winter time for the years: 2023,2024,2025,2026 ...
|
||||
+# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
|
||||
+#
|
||||
+# From Paul Eggert (2022-08-30):
|
||||
+# Guess they spring forward on the first Saturday on or after March 24,
|
||||
+# and fall back on the first Saturday on or after October 24, as this is
|
||||
+# consistent with the given transitions and with previous date practice.
|
||||
+
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
|
||||
Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
|
||||
@@ -3328,8 +3339,10 @@ Rule Palestine 2019 only - Mar 29 0:00 1:00 S
|
||||
Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
|
||||
Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S
|
||||
Rule Palestine 2020 only - Oct 24 1:00 0 -
|
||||
-Rule Palestine 2021 max - Oct Fri>=23 1:00 0 -
|
||||
-Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S
|
||||
+Rule Palestine 2021 only - Oct 29 1:00 0 -
|
||||
+Rule Palestine 2022 only - Mar 27 0:00 1:00 S
|
||||
+Rule Palestine 2022 max - Oct Sat>=24 2:00 0 -
|
||||
+Rule Palestine 2023 max - Mar Sat>=24 2:00 1:00 S
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -0,0 +1,80 @@
|
||||
From dbdd9e57123bce9ee770e7f4e90e12ab60ecb8f9 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Wed, 5 Oct 2022 17:17:05 -0700
|
||||
Subject: [PATCH] Syria to switch from +02/+03 with DST to plain +03
|
||||
|
||||
Reference:https://github.com/eggert/tz/commit/59aa97e8e9e3744a06cb004946a104824a5234c2
|
||||
Conflict:NEWS context
|
||||
|
||||
* NEWS: Mention this.
|
||||
* asia (Syria, Asia/Damascus): Go to year-round +03,
|
||||
effective when the fallback would have occurred.
|
||||
(Thanks to Steffen Thorsen.)
|
||||
---
|
||||
NEWS | 5 +++++
|
||||
asia | 18 +++++++++++++-----
|
||||
2 files changed, 18 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index df6b384..cb0f534 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -3,6 +3,7 @@ News for the tz database
|
||||
Briefly:
|
||||
Palestine transitions are now Saturdays at 02:00.
|
||||
Simplify three Ukraine zones into one.
|
||||
+ Syria is switching from +02/+03 with DST to year-round +03.
|
||||
|
||||
Changes to future timestamps
|
||||
|
||||
@@ -11,6 +12,10 @@ News for the tz database
|
||||
this means 2022 falls back 10-29 at 02:00, not 10-28 at 01:00.
|
||||
(Thanks to Heba Hamad.)
|
||||
|
||||
+ Syria is abandoning the DST regime and is changing to permanent
|
||||
+ +03, so it will not fall back from +03 to +02 on 2022-10-28.
|
||||
+ (Thanks to Steffen Thorsen.)
|
||||
+
|
||||
Release 2022a - 2022-03-15 23:02:01 -0700
|
||||
|
||||
Briefly:
|
||||
diff --git a/asia b/asia
|
||||
index b57e8a6..7c29e49 100644
|
||||
--- a/asia
|
||||
+++ b/asia
|
||||
@@ -3710,19 +3710,27 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 -
|
||||
# Our brief summary:
|
||||
# https://www.timeanddate.com/news/time/syria-dst-2012.html
|
||||
|
||||
-# From Arthur David Olson (2012-03-27):
|
||||
-# Assume last Friday in March going forward XXX.
|
||||
+# From Steffen Thorsen (2022-10-05):
|
||||
+# Syria is adopting year-round DST, starting this autumn....
|
||||
+# From https://www.enabbaladi.net/archives/607812
|
||||
+# "This [the decision] came after the weekly government meeting today,
|
||||
+# Tuesday 4 October ..."
|
||||
+#
|
||||
+# From Paul Eggert (2022-10-05):
|
||||
+# Model this as a transition from EEST +03 (DST) to plain +03
|
||||
+# (non-DST) at the point where DST would otherwise have ended.
|
||||
|
||||
Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S
|
||||
Rule Syria 2008 only - Nov 1 0:00 0 -
|
||||
Rule Syria 2009 only - Mar lastFri 0:00 1:00 S
|
||||
Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S
|
||||
-Rule Syria 2012 max - Mar lastFri 0:00 1:00 S
|
||||
-Rule Syria 2009 max - Oct lastFri 0:00 0 -
|
||||
+Rule Syria 2012 2022 - Mar lastFri 0:00 1:00 S
|
||||
+Rule Syria 2009 2022 - Oct lastFri 0:00 0 -
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
|
||||
- 2:00 Syria EE%sT
|
||||
+ 2:00 Syria EE%sT 2022 Oct 28 0:00
|
||||
+ 3:00 - +03
|
||||
|
||||
# Tajikistan
|
||||
# From Shanks & Pottenger.
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -0,0 +1,107 @@
|
||||
From 6b3805909e871cae582ad96503b4b1bf20860fde Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 29 Nov 2022 08:48:19 -0800
|
||||
Subject: [PATCH] The northern edge of Chihuahua changes to US rules
|
||||
|
||||
Reference: https://github.com/eggert/tz/commit/b92f566d69a5fdf5b2b394d5343149344325baf7
|
||||
Conflict: context; remove NEWS
|
||||
|
||||
(Thanks to Heitor David Pinto.)
|
||||
* NEWS: Mention this.
|
||||
* northamerica, zone.tab, zone1970.tab (America/Ciudad_Juarez):
|
||||
New Zone, which switches to El Paso time tomorrow.
|
||||
* northamerica (America/Ojinaga): Observe US DST rules from now.
|
||||
---
|
||||
northamerica | 31 +++++++++++++++++++++++++++----
|
||||
zone.tab | 3 ++-
|
||||
zone1970.tab | 3 ++-
|
||||
3 files changed, 31 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/northamerica b/northamerica
|
||||
index 34ebca9..fbf753c 100644
|
||||
--- a/northamerica
|
||||
+++ b/northamerica
|
||||
@@ -2622,6 +2622,14 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
||||
# This abolishes DST except where US DST rules are observed,
|
||||
# and in addition changes all of Chihuahua to -06 with no DST.
|
||||
|
||||
+# From Heitor David Pinto (2022-11-28):
|
||||
+# Now the northern municipalities want to have the same time zone as the
|
||||
+# respective neighboring cities in the US, for example Juárez in UTC-7 with
|
||||
+# DST, matching El Paso, and Ojinaga in UTC-6 with DST, matching Presidio....
|
||||
+# the president authorized the publication of the decree for November 29,
|
||||
+# so the time change would occur on November 30 at 0:00.
|
||||
+# http://puentelibre.mx/noticia/ciudad_juarez_cambio_horario_noviembre_2022/
|
||||
+
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule Mexico 1931 only - May 1 23:00 1:00 D
|
||||
Rule Mexico 1931 only - Oct 1 0:00 0 S
|
||||
@@ -2679,10 +2687,24 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
||||
-6:00 Mexico C%sT 2001 Sep 30 2:00
|
||||
-6:00 - CST 2002 Feb 20
|
||||
-6:00 Mexico C%sT
|
||||
-# Chihuahua (near US border)
|
||||
+# Chihuahua (near US border - western side)
|
||||
# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
|
||||
-# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
|
||||
-# (See the 2016-03-12 El Universal source mentioned above.)
|
||||
+# and Práxedis G Guerrero.
|
||||
+# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
|
||||
+Zone America/Ciudad_Juarez -7:05:56 - LMT 1922 Jan 1 7:00u
|
||||
+ -7:00 - MST 1927 Jun 10 23:00
|
||||
+ -6:00 - CST 1930 Nov 15
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
+ -6:00 - CST 1996
|
||||
+ -6:00 Mexico C%sT 1998
|
||||
+ -6:00 - CST 1998 Apr Sun>=1 3:00
|
||||
+ -7:00 Mexico M%sT 2010
|
||||
+ -7:00 US M%sT 2022 Oct 30 2:00
|
||||
+ -6:00 - CST 2022 Nov 30 0:00
|
||||
+ -7:00 US M%sT
|
||||
+# Chihuahua (near US border - eastern side)
|
||||
+# The municipalities of Coyame del Sotol, Ojinaga, and Manuel Benavides.
|
||||
+# http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf
|
||||
Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
@@ -2692,7 +2714,8 @@ Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
|
||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
||||
-7:00 Mexico M%sT 2010
|
||||
-7:00 US M%sT 2022 Oct 30 2:00
|
||||
- -6:00 - CST
|
||||
+ -6:00 - CST 2022 Nov 30 0:00
|
||||
+ -6:00 US C%sT
|
||||
# Chihuahua (away from US border)
|
||||
Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
diff --git a/zone.tab b/zone.tab
|
||||
index 943440a..f8ddb42 100644
|
||||
--- a/zone.tab
|
||||
+++ b/zone.tab
|
||||
@@ -287,7 +287,8 @@ MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo Leon, T
|
||||
MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo Leon, Tamaulipas (US border)
|
||||
MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa
|
||||
MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (most areas)
|
||||
-MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (US border)
|
||||
+MX +3144-10629 America/Ciudad_Juarez Chihuahua (US border - west)
|
||||
+MX +2934-10425 America/Ojinaga Chihuahua (US border - east)
|
||||
MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora
|
||||
MX +3232-11701 America/Tijuana Pacific Time US - Baja California
|
||||
MX +2048-10515 America/Bahia_Banderas Central Time - Bahia de Banderas
|
||||
diff --git a/zone1970.tab b/zone1970.tab
|
||||
index 185fe35..bd84862 100644
|
||||
--- a/zone1970.tab
|
||||
+++ b/zone1970.tab
|
||||
@@ -235,7 +235,8 @@ MX +2540-10019 America/Monterrey Central Time - Durango; Coahuila, Nuevo León,
|
||||
MX +2550-09730 America/Matamoros Central Time US - Coahuila, Nuevo León, Tamaulipas (US border)
|
||||
MX +2313-10625 America/Mazatlan Mountain Time - Baja California Sur, Nayarit, Sinaloa
|
||||
MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua (most areas)
|
||||
-MX +2934-10425 America/Ojinaga Mountain Time US - Chihuahua (US border)
|
||||
+MX +3144-10629 America/Ciudad_Juarez Chihuahua (US border - west)
|
||||
+MX +2934-10425 America/Ojinaga Chihuahua (US border - east)
|
||||
MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora
|
||||
MX +3232-11701 America/Tijuana Pacific Time US - Baja California
|
||||
MX +2048-10515 America/Bahia_Banderas Central Time - Bahía de Banderas
|
||||
--
|
||||
2.33.0
|
||||
|
||||
114
backport-Treat-1931-changes-in-Mexico-as-DST.patch
Normal file
114
backport-Treat-1931-changes-in-Mexico-as-DST.patch
Normal file
@ -0,0 +1,114 @@
|
||||
From 2f171a25cc837cca7be0bad9c6d3ce73d52784a9 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Wed, 28 Sep 2022 20:08:31 -0700
|
||||
Subject: [PATCH] Treat 1931 changes in Mexico as DST
|
||||
|
||||
Reference: https://github.com/eggert/tz/commit/ff2e2a09a7609efb4826b1083e880cfc1913fb92
|
||||
Conflict: remove NEWS
|
||||
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Mexico’s Chamber of Deputies was supposed to vote today on
|
||||
legislation abolishing DST in most of Mexico. Although the vote
|
||||
was delayed due to Internet problems, news coverage of the
|
||||
non-event led me to review our sources for DST in Mexico, and I
|
||||
found that tzdb considered the transitions in 1931 to be two
|
||||
changes to standard time, whereas it is considered to be DST in
|
||||
today’s news coverage, as well as in our main source, the history
|
||||
of Mexican local time published by the Investigation and Analysis
|
||||
Service of the Mexican Library of Congress. Fix this by
|
||||
considering the 1931 changes to be DST, not standard time.
|
||||
* NEWS: Mention this.
|
||||
* northamerica (Mexico): Add DST rules for 1931.
|
||||
(America/Mexico_City, America/Ojinaga, America/Chihuahua)
|
||||
(America/Hermosillo, America/Mazatlan, America/Bahia_Banderas):
|
||||
Use them.
|
||||
|
||||
---
|
||||
northamerica | 26 ++++++++------------------
|
||||
1 file changed, 8 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/northamerica b/northamerica
|
||||
index 0ceeeea..34ebca9 100644
|
||||
--- a/northamerica
|
||||
+++ b/northamerica
|
||||
@@ -2623,6 +2623,8 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20
|
||||
# and in addition changes all of Chihuahua to -06 with no DST.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
+Rule Mexico 1931 only - May 1 23:00 1:00 D
|
||||
+Rule Mexico 1931 only - Oct 1 0:00 0 S
|
||||
Rule Mexico 1939 only - Feb 5 0:00 1:00 D
|
||||
Rule Mexico 1939 only - Jun 25 0:00 0 S
|
||||
Rule Mexico 1940 only - Dec 9 0:00 1:00 D
|
||||
@@ -2673,9 +2675,7 @@ Zone America/Monterrey -6:41:16 - LMT 1921 Dec 31 23:18:44
|
||||
Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 Mexico C%sT 2001 Sep 30 2:00
|
||||
-6:00 - CST 2002 Feb 20
|
||||
-6:00 Mexico C%sT
|
||||
@@ -2686,9 +2686,7 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 0:23:24
|
||||
Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1996
|
||||
-6:00 Mexico C%sT 1998
|
||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
||||
@@ -2699,9 +2697,7 @@ Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 0:02:20
|
||||
Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1996
|
||||
-6:00 Mexico C%sT 1998
|
||||
-6:00 - CST 1998 Apr Sun>=1 3:00
|
||||
@@ -2711,9 +2707,7 @@ Zone America/Chihuahua -7:04:20 - LMT 1921 Dec 31 23:55:40
|
||||
Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1942 Apr 24
|
||||
-7:00 - MST 1949 Jan 14
|
||||
-8:00 - PST 1970
|
||||
@@ -2751,9 +2745,7 @@ Zone America/Hermosillo -7:23:52 - LMT 1921 Dec 31 23:36:08
|
||||
Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1942 Apr 24
|
||||
-7:00 - MST 1949 Jan 14
|
||||
-8:00 - PST 1970
|
||||
@@ -2763,9 +2755,7 @@ Zone America/Mazatlan -7:05:40 - LMT 1921 Dec 31 23:54:20
|
||||
Zone America/Bahia_Banderas -7:01:00 - LMT 1921 Dec 31 23:59:00
|
||||
-7:00 - MST 1927 Jun 10 23:00
|
||||
-6:00 - CST 1930 Nov 15
|
||||
- -7:00 - MST 1931 May 1 23:00
|
||||
- -6:00 - CST 1931 Oct
|
||||
- -7:00 - MST 1932 Apr 1
|
||||
+ -7:00 Mexico M%sT 1932 Apr 1
|
||||
-6:00 - CST 1942 Apr 24
|
||||
-7:00 - MST 1949 Jan 14
|
||||
-8:00 - PST 1970
|
||||
--
|
||||
2.33.0
|
||||
|
||||
75
backport-Tweak-expression-of-Palestine-transition.patch
Normal file
75
backport-Tweak-expression-of-Palestine-transition.patch
Normal file
@ -0,0 +1,75 @@
|
||||
From 1a0e30a84b2f76663123a4555c2785b450ce06f1 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Wed, 31 Aug 2022 16:58:10 -0500
|
||||
Subject: [PATCH] Tweak expression of Palestine transition
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Reference:https://github.com/eggert/tz/commit/1a0e30a84b2f76663123a4555c2785b450ce06f1
|
||||
Conflict: NA
|
||||
|
||||
* asia (Palestine): Say "Sat<=30" instead of "Sat>=24".
|
||||
These have equivalent effect, so this does not change the
|
||||
generated data. “Sat<=30” is a bit closer to the intended
|
||||
“Saturday before the last Sunday” given by Heba Hamad.
|
||||
---
|
||||
asia | 24 ++++++++++--------------
|
||||
1 file changed, 10 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/asia b/asia
|
||||
index 1a3d8c1..9fbeb71 100644
|
||||
--- a/asia
|
||||
+++ b/asia
|
||||
@@ -3375,10 +3375,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
||||
# The winter time in 2015 started on October 23 at 01:00.
|
||||
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
|
||||
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
|
||||
-#
|
||||
-# From Paul Eggert (2019-04-10):
|
||||
-# For now, guess spring-ahead transitions are at 00:00 on the Saturday
|
||||
-# preceding March's last Sunday (i.e., Sat>=24).
|
||||
|
||||
# From P Chan (2021-10-18):
|
||||
# http://wafa.ps/Pages/Details/34701
|
||||
@@ -3400,11 +3396,11 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
|
||||
# 60 minutes backwards. Also the state of Palestine adopted the summer
|
||||
# and winter time for the years: 2023,2024,2025,2026 ...
|
||||
# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf
|
||||
+# (2022-08-31): ... the Saturday before the last Sunday in March and October
|
||||
+# at 2:00 AM ,for the years from 2023 to 2026.
|
||||
#
|
||||
-# From Paul Eggert (2022-08-30):
|
||||
-# Guess they spring forward on the first Saturday on or after March 24,
|
||||
-# and fall back on the first Saturday on or after October 24, as this is
|
||||
-# consistent with the given transitions and with previous date practice.
|
||||
+# From Paul Eggert (2022-08-31):
|
||||
+# For now, assume that this rule will also be used after 2026.
|
||||
|
||||
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
|
||||
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
|
||||
@@ -3436,16 +3432,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 -
|
||||
Rule Palestine 2014 only - Oct 24 0:00 0 -
|
||||
Rule Palestine 2015 only - Mar 28 0:00 1:00 S
|
||||
Rule Palestine 2015 only - Oct 23 1:00 0 -
|
||||
-Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S
|
||||
-Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 -
|
||||
+Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S
|
||||
+Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 -
|
||||
Rule Palestine 2019 only - Mar 29 0:00 1:00 S
|
||||
-Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
|
||||
-Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S
|
||||
+Rule Palestine 2019 only - Oct Sat<=30 0:00 0 -
|
||||
+Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S
|
||||
Rule Palestine 2020 only - Oct 24 1:00 0 -
|
||||
Rule Palestine 2021 only - Oct 29 1:00 0 -
|
||||
Rule Palestine 2022 only - Mar 27 0:00 1:00 S
|
||||
-Rule Palestine 2022 max - Oct Sat>=24 2:00 0 -
|
||||
-Rule Palestine 2023 max - Mar Sat>=24 2:00 1:00 S
|
||||
+Rule Palestine 2022 max - Oct Sat<=30 2:00 0 -
|
||||
+Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S
|
||||
|
||||
# Zone NAME STDOFF RULES FORMAT [UNTIL]
|
||||
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
|
||||
--
|
||||
2.23.0
|
||||
85
tzdata.spec
85
tzdata.spec
@ -1,12 +1,26 @@
|
||||
Name: tzdata
|
||||
Version: 2022a
|
||||
Release: 1
|
||||
Release: 11
|
||||
Summary: Timezone data
|
||||
License: Public Domain
|
||||
URL: https://www.iana.org/time-zones
|
||||
Source0: https://data.iana.org/time-zones/releases/tzdata%{version}.tar.gz
|
||||
Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz
|
||||
|
||||
Patch6000: backport-Iran-will-stop-DST-in-2023.patch
|
||||
Patch6001: backport-Chile-s-DST-is-delayed-by-a-week-in-September-2022.patch
|
||||
Patch6002: backport-Palestine-transitions-are-now-Saturdays-at-02-00.patch
|
||||
Patch6003: backport-Tweak-expression-of-Palestine-transition.patch
|
||||
Patch6004: backport-Syria-to-switch-from-02-03-with-DST-to-plain-03.patch
|
||||
Patch6005: backport-Jordan-to-switch-from-02-03-with-DST-to-plain-03.patch
|
||||
Patch6006: backport-Fiji-no-longer-observes-DST.patch
|
||||
Patch6007: backport-Most-of-Mexico-will-no-longer-observe-DST.patch
|
||||
Patch6008: backport-Most-of-Greenland-stops-clock-changing-after-March.patch
|
||||
Patch6009: backport-Treat-1931-changes-in-Mexico-as-DST.patch
|
||||
Patch6010: backport-Greenland-change-should-affect-only-America-Nuuk.patch
|
||||
Patch6011: backport-The-northern-edge-of-Chihuahua-changes-to-US-rules.patch
|
||||
Patch6012: backport-Much-of-Greenland-still-uses-DST-from-2024-on.patch
|
||||
|
||||
Patch9000: bugfix-0001-add-Beijing-timezone.patch
|
||||
Patch9001: remove-country-selection-from-tzselect-steps.patch
|
||||
Patch9002: remove-ROC-timezone.patch
|
||||
@ -35,10 +49,6 @@ This package contains timezone information for use by Java runtimes.
|
||||
%prep
|
||||
%autosetup -c -a 1 -p1
|
||||
|
||||
make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
|
||||
tar zxf tzdata%{version}-rearguard.tar.gz
|
||||
rm tzdata.zi
|
||||
|
||||
mkdir javazic
|
||||
tar zxf %{SOURCE3} -C javazic
|
||||
cd javazic
|
||||
@ -54,7 +64,12 @@ tar xf %{SOURCE4}
|
||||
echo "%{name}%{version}" >> VERSION
|
||||
|
||||
%build
|
||||
make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
|
||||
tar zxf tzdata%{version}-rearguard.tar.gz
|
||||
rm tzdata.zi main.zi
|
||||
|
||||
make VERSION=%{version} DATAFORM=rearguard tzdata.zi
|
||||
make VERSION=%{version} DATAFORM=rearguard main.zi
|
||||
|
||||
FILES="africa antarctica asia australasia europe northamerica southamerica
|
||||
etcetera backward factory"
|
||||
@ -107,6 +122,66 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
|
||||
%{_datadir}/javazi-1.8
|
||||
|
||||
%changelog
|
||||
* Mon Dec 5 2022 qinyu<qinyu32@huawei.com> - 2022a-11
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC: Much of Greenland still uses DST from 2024 on
|
||||
|
||||
* Wed Nov 30 2022 qinyu<qinyu32@huawei.com> - 2022a-10
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC: Greenland change should affect only America/Nuuk; The northern edge of Chihuahua changes to US rules
|
||||
|
||||
* Mon Nov 28 2022 qinyu<qinyu32@huawei.com> - 2022a-9
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC: Most of Greenland stops clock-changing after March
|
||||
|
||||
* Tue Nov 1 2022 qinyu<qinyu32@huawei.com> - 2022a-8
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC: Fiji & most of Mexico will no longer observe DST
|
||||
|
||||
* Wed Oct 12 2022 qinyu<qinyu32@huawei.com> - 2022a-7
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC: Syria and Jordan switch from 02/03 with DST to plain 03
|
||||
|
||||
* Mon Oct 10 2022 huangduirong<huangduirong@huawei.com> - 2022a-6
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:move the tzdata rearguard.tar.gz to build
|
||||
|
||||
* Fri Sep 2 2022 qinyu<qinyu32@huawei.com> - 2022a-5
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC: Palestine DST transitions time change
|
||||
|
||||
* Fri Aug 19 2022 qinyu<qinyu32@huawei.com> - 2022a-4
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:Chile's DST is delayed by a week in September 2022
|
||||
|
||||
* Fri Jul 8 2022 liuchao<liuchao173@huawei.com> - 2022a-3
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:remake rearguard version of main.zi to fix check_zishrink_posix fail
|
||||
|
||||
* Thu May 12 2022 liuchao<liuchao173@huawei.com> - 2022a-2
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:Iran will stop DST in 2023
|
||||
|
||||
* Mon Apr 18 2022 liuchao<liuchao173@huawei.com> - 2022a-1
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user