diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2009-07-21 02:13:57 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2009-07-21 02:13:57 +0000 |
| commit | 4f9074da93347bbe3167e16ebd27d5bd0e592729 (patch) | |
| tree | 7ce03ce4dcb1f4f80fa271c98ba7df8f03890682 | |
| parent | 54e87cd8a2a6bdc86c27282a78c87a339b35e4db (diff) | |
Vendor import of tzcode2009kvendor/tzcode/tzcode2009k
zic.c:
Do not end a binary file with a POSIX-style time zone string
for locations that end up in permanent DST (thanks to Andreas
Schwab).
tz-art.htm
Add notes on "A Matter of Life and Death"
(thanks to Dave Cantor).
tz-link.htm
Remove seemingly obsolete public.planetmirror.com/pub/timezone
link (thanks to Nathan Stratton Treadway).
Obtained from: ftp://elsie.nci.nih.gov/pub/
Notes
Notes:
svn path=/vendor/tzcode/dist/; revision=195794
svn path=/vendor/tzcode/tzcode2009k/; revision=195795; tag=vendor/tzcode/tzcode2009k
| -rw-r--r-- | unused/tz-art.htm | 13 | ||||
| -rw-r--r-- | unused/tz-link.htm | 7 | ||||
| -rw-r--r-- | zic/zic.c | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/unused/tz-art.htm b/unused/tz-art.htm index f035833ca614..cba330e0b76c 100644 --- a/unused/tz-art.htm +++ b/unused/tz-art.htm @@ -9,7 +9,7 @@ PUBLIC "-//W3C//DTD HTML 4.01//EN" <body> <h1>Time and the Arts</h1> <address> -@(#)tz-art.htm 8.12 +@(#)tz-art.htm 8.13 </address> <p> This file is in the public domain, so clarified as of @@ -353,6 +353,17 @@ A private jet's mid-flight change of time zones distorts Alison Dubois' premonition in the "We Had a Dream" episode of "Medium" (originally aired 2007-02-28). </li> +<li> +In the 1946 "A Matter of Life and Death," +there is a reference to British Double Summer Time. +The time does not play a large part in the plot; +it's just a passing reference to the time when one of the +characters was supposed to have died (but didn't). +The IMDb page is at +<a href="http://us.imdb.com/title/tt0038733/"> +http://us.imdb.com/title/tt0038733/ +</a>. (Dave Cantor) +</li> </ul> <hr> <ul> diff --git a/unused/tz-link.htm b/unused/tz-link.htm index a584b1f8c200..fe58bf785302 100644 --- a/unused/tz-link.htm +++ b/unused/tz-link.htm @@ -18,7 +18,7 @@ <body> <h1>Sources for Time Zone and Daylight Saving Time Data</h1> <address> -@(#)tz-link.htm 8.21 +@(#)tz-link.htm 8.22 </address> <p> This file is in the public domain, so clarified as of @@ -114,10 +114,7 @@ retrieve the <a href="ftp://elsie.nci.nih.gov/pub/tzarchive.gz">full archive of old messages</a> (in gzip compressed format), or retrieve <a href="ftp://munnari.oz.au/pub/oldtz">archived older versions of code -and data</a>; there is also a smaller <a -href="http://public.planetmirror.com/pub/timezone"><abbr -title="Hypertext Transfer Protocol">HTTP</abbr> -mirror</a>.</p> +and data</a>.</p> <p> The Web has several other sources for time zone and daylight saving time data. Here are some recent links that may be of interest. diff --git a/zic/zic.c b/zic/zic.c index 01d9f135bd7a..484638a2cb5d 100644 --- a/zic/zic.c +++ b/zic/zic.c @@ -3,7 +3,7 @@ ** 2006-07-17 by Arthur David Olson. */ -static char elsieid[] = "@(#)zic.c 8.19"; +static char elsieid[] = "@(#)zic.c 8.20"; #include "private.h" #include "locale.h" @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; } - if (stdrp == NULL && zp->z_nrules != 0) + if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0)) return; abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar; doabbr(result, zp->z_format, abbrvar, FALSE, TRUE); |