d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tzdata200m from vendor branch.

Browse Source
This commit is contained in:
Garrett Wollman 2005-08-29 17:04:47 +00:00
parent 667b0824d7
commit bf3b3d9250
2 changed files with 50 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
share/zoneinfo/asia
View File

@ -1,4 +1,4 @@
# @(#)asia 7.84
# @(#)asia 7.85
# This data is by no means authoritative; if you think you know better,
# go ahead and edit the file (and please send any changes to
@ -43,8 +43,8 @@
# 8:00 CST China
# 9:00 CJT Central Japanese Time (1896/1937)*
# 9:00 EIT east Indonesia
# 9:00 JST Japan
# 9:00 KST Korea
# 9:00 JST JDT Japan
# 9:00 KST KDT Korea
# 9:30 CST (Australian) Central Standard Time
#
# See the `europe' file for Russia and Turkey in Asia.
@ -846,14 +846,28 @@ Zone Asia/Jerusalem 2:20:56 - LMT 1880
# Today's _Asahi Evening News_ (page 4) reports that Japan had
# daylight saving between 1948 and 1951, but ``the system was discontinued
# because the public believed it would lead to longer working hours.''
# From Mayumi Negishi in the 2005-08-10 Japan Times
# <http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm>:
# Occupation authorities imposed daylight-saving time on Japan on
# [1948-05-01].... But lack of prior debate and the execution of
# daylight-saving time just three days after the bill was passed generated
# deep hatred of the concept.... The Diet unceremoniously passed a bill to
# dump the unpopular system in October 1951, less than a month after the San
# Francisco Peace Treaty was signed. (A government poll in 1951 showed 53%
# of the Japanese wanted to scrap daylight-saving time, as opposed to 30% who
# wanted to keep it.)
# Shanks writes that daylight saving in Japan during those years was as follows:
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
#Rule Japan 1948 only - May Sun>=1 2:00 1:00 D
#Rule Japan 1948 1951 - Sep Sat>=8 2:00 0 S
#Rule Japan 1949 only - Apr Sun>=1 2:00 1:00 D
#Rule Japan 1950 1951 - May Sun>=1 2:00 1:00 D
# but the only locations using it were US military bases.
# We go with Shanks and omit daylight saving in those years for Asia/Tokyo.
Rule Japan 1948 only - May Sun>=1 2:00 1:00 D
Rule Japan 1948 1951 - Sep Sat>=8 2:00 0 S
Rule Japan 1949 only - Apr Sun>=1 2:00 1:00 D
Rule Japan 1950 1951 - May Sun>=1 2:00 1:00 D
# but the only locations using it (for birth certificates, presumably, since
# Shanks's audience is astrologers) were US military bases. For now, assume
# that for most purposes daylight-saving time was observed; otherwise, what
# would have been the point of the 1951 poll?
# From Hideyuki Suzuki (1998-11-09):
# 'Tokyo' usually stands for the former location of Tokyo Astronomical
@ -883,7 +897,7 @@ Zone Asia/Jerusalem 2:20:56 - LMT 1880
Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u
9:00 - JST 1896
9:00 - CJT 1938
9:00 - JST
9:00 Japan J%sT
# Since 1938, all Japanese possessions have been like Asia/Tokyo.
# Jordan

54
share/zoneinfo/northamerica
View File

@ -1,4 +1,4 @@
# @(#)northamerica 7.78
# @(#)northamerica 7.79
# also includes Central America and the Caribbean
# This data is by no means authoritative; if you think you know better,
@ -110,6 +110,12 @@
#
# He had scored a 20-second scoop on other broadcasters.
# From Arthur David Olson (2005-08-22):
# Paul has been careful to use the "US" rules only in those locations
# that are part of the United States; this reflects the real scope of
# U.S. government action. So even though the "US" rules have changed
# in the latest release, other countries won't be affected.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule US 1918 1919 - Mar lastSun 2:00 1:00 D
Rule US 1918 1919 - Oct lastSun 2:00 0 S
@ -225,8 +231,8 @@ Rule US 2007 max - Nov Sun>=1 2:00 0 S
# US eastern time, represented by New York
# Connecticut, Delaware, District of Columbia, most of Florida,
# Georgia, southeast Indiana (Clark, Dearborn, Floyd, Harrison, and
# Ohio counties), eastern Kentucky, Maine, Maryland, Massachusetts,
# Georgia, southeast Indiana (Dearborn and Ohio counties), eastern Kentucky
# (except America/Kentucky/Louisville below), Maine, Maryland, Massachusetts,
# New Hampshire, New Jersey, New York, North Carolina, Ohio,
# Pennsylvania, Rhode Island, South Carolina, eastern Tennessee,
# Vermont, Virginia, West Virginia
@ -481,27 +487,30 @@ Zone America/Boise -7:44:49 - LMT 1883 Nov 18 12:15:11
# For a map of Indiana's time zone regions, see:
# <a href="http://www.mccsc.edu/time.html">
# What time is it in Indiana?
# </a> (1999-04-06)
# </a> (2005-05-03)
#
# From Paul Eggert (2005-08-22):
# Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
# with the following exceptions:
#
# - Gibson, Jasper, Lake, LaPorte, Newton, Porter, Posey, Spencer,
# Vandenburgh, and Warrick counties have been like America/Chicago.
#
# - Dearborn and Ohio counties have been like America/New_York.
#
# - Clark, Floyd, and Harrison counties have been like
# America/Kentucky/Louisville.
#
# - Crawford, Starke, and Switzerland counties have their own time zone
# histories as noted below.
#
# From Paul Eggert (1995-12-19):
# Indiana generally observes either EST all year, or CST/CDT,
# but areas near Cincinnati and Louisville use those cities' timekeeping
# and in 1969 and 1970 the whole state observed daylight time;
# and there are other exceptions as noted below.
# Shanks partitions Indiana into 345 regions, each with its own time history,
# and writes ``Even newspaper reports present contradictory information.''
# Fortunately, most of the complexity occurred before our cutoff date of 1970.
#
# Since 1970, EST-only Indiana has been like America/Indianapolis,
# with exceptions noted below for Crawford, Starke, and Switzerland counties.
# The parts of Indiana not listed below have been like America/Chicago,
# America/Louisville, or America/New_York.
#
# Other than Indianapolis, the Indiana place names are so nondescript
# that they would be ambiguous if we left them at the `America' level.
# So we reluctantly put them all in a subdirectory `America/Indiana'.
#
# Most of EST-only Indiana last observed DST in 1970.
# From Paul Eggert (2005-08-16):
# http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006,
@ -575,7 +584,7 @@ Zone America/Indiana/Vevay -5:40:16 - LMT 1883 Nov 18 12:19:44
-5:00 US E%sT
# Part of Kentucky left its clocks alone in 1974.
# This also includes a part of Indiana immediately adjacent to Louisville.
# This also includes Clark, Floyd, and Harrison counties in Indiana.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Louisville 1921 only - May 1 2:00 1:00 D
Rule Louisville 1921 only - Sep 1 2:00 0 S
@ -716,17 +725,6 @@ Zone America/Menominee -5:50:27 - LMT 1885 Sep 18 12:00
# _Los Angeles Times_ (1998-11-10), A1, A10; it cites
# Jimmy Skaggs, _The Great Guano Rush_ (1994).
# Old names, for S5 users
# Link LINK-FROM LINK-TO
Link America/New_York EST5EDT
Link America/Chicago CST6CDT
Link America/Denver MST7MDT
Link America/Los_Angeles PST8PDT
Link America/Indianapolis EST
Link America/Phoenix MST
Link Pacific/Honolulu HST
################################################################################