* time/africa, time/asia, time/europe, time/northamerica,

	time/yearistype: New data from ADO 95h.

6 files changed, 74 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e510a7e1b..43281f0f20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Sep 21 00:03:53 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* time/africa, time/asia, time/europe, time/northamerica,
+	time/yearistype: New data from ADO 95h.
+
 	* Makerules (build-shlib): Use $(@F:lib%.so=%) in place of
 	$(notdir $*), so it wins for the explicit libc.so rule as well as the
 	pattern rule. 
diff --git a/time/africa b/time/africa
index a9786670b5..11c2008aab 100644
--- a/time/africa
+++ b/time/africa
@@ -1,4 +1,4 @@
-# @(#)africa	7.6
+# @(#)africa	7.7
 
 # 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
@@ -15,6 +15,10 @@
 # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
 # I found in the UCLA library.
 #
+# A reliable and entertaining source about time zones is
+# Derek Howse, Greenwich time and the discovery of the longitude,
+# Oxford University Press (1980).
+#
 # I added so many Zone names that the old, mostly flat name space was unwieldy.
 # So I renamed the Zones to have the form AREA/LOCATION, where
 # AREA is the name of a continent or ocean, and
@@ -95,10 +99,10 @@ Rule	Algeria	1978	only	-	Mar	24	 1:00	1:00	" DST"
 Rule	Algeria	1978	only	-	Sep	22	 3:00	0	-
 Rule	Algeria	1980	only	-	Apr	25	 0:00	1:00	" DST"
 Rule	Algeria	1980	only	-	Oct	31	 2:00	0	-
-# Shanks gives 0:09 for Paris Mean Time; go with Whitman's more precise 0:09:05.
+# Shanks gives 0:09 for Paris Mean Time; go with Howse's more precise 0:09:21.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15 0:01
-			0:09:05	-	PMT	1911 Mar 11    # Paris Mean Time
+			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
 			0:00	Algeria	WET%s	1940 Feb 25 2:00
 			1:00	Algeria	MET%s	1946 Oct  7
 			0:00	-	WET	1956 Jan 29
@@ -303,9 +307,10 @@ Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
 # From Paul Eggert <eggert@twinsun.com> (November 18, 1993):
 # In 1972 Liberia was the last country to switch
 # from a GMT offset that was not a multiple of 15 minutes.
-# Time magazine reported that it was in honor of their leader's birthday.
-# For Liberia before 1972, Shanks reports -0:44, and Whitman reports -0:44:30;
-# go with Whitman.
+# Howse reports that it was in honor of their president's birthday.
+# Shanks reports the date as May 1, whereas Howse reports Jan; go with Shanks.
+# For Liberia before 1972, Shanks reports -0:44, whereas Howse and Whitman
+# each report -0:44:30; go with the more precise figure.
 #
 # From Shanks (1991), as corrected by Whitman:
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -571,10 +576,11 @@ Rule	Tunisia	1988	max	-	Sep	lastSun	 0:00s	0	-
 Rule	Tunisia	1989	only	-	Mar	26	 0:00s	1:00	" DST"
 Rule	Tunisia	1990	only	-	May	 1	 0:00s	1:00	" DST"
 Rule	Tunisia	1991	max	-	Mar	lastSun	 0:00s	1:00	" DST"
-# Shanks gives 0:09 for Paris Mean Time; go with Whitman's more precise 0:09:05.
+# Shanks gives 0:09 for Paris Mean Time; go with Howse's more precise 0:09:21.
+# Shanks says the 1911 switch occurred on Mar 9; go with Howse's Mar 11.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tunis	0:40:44 -	LMT	1881 May 12
-			0:09:05	-	PMT	1911 Mar  9    # Paris Mean Time
+			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
 			1:00	Tunisia	MET%s
 
 # Uganda
diff --git a/time/asia b/time/asia
index 6e7c63652b..78e7f26ea2 100644
--- a/time/asia
+++ b/time/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.13
+# @(#)asia	7.14
 
 # 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
@@ -428,7 +428,7 @@ Rule	Zion	1988	only	-	Sep	 3	0:00	0	S
 #Rule	Zion	1991	only	-	Mar	10	0:00	1:00	D
 #Rule	Zion	1991	only	-	Sep	 1	0:00	0	S
 
-# From Ephraim Silverberg (September 5, 1993):
+# From Ephraim Silverberg (September 20, 1995):
 #
 # According to the Office of the Secretary General of the Ministry of
 # Interior, there is NO set rule for Daylight-Savings/Standard time changes.
@@ -437,8 +437,11 @@ Rule	Zion	1988	only	-	Sep	 3	0:00	0	S
 # on the party the Minister of Interior, the size of the coalition
 # government, the phase of the moon and the direction of the wind.  Hence,
 # changes may need to be made on a semi-annual basis.  One thing is entrenched
-# in law, however: that there must be at least 150 days on daylight savings
-# time annually.
+# in law, however: that there must be at least 150 days of daylight savings
+# time annually.  Ever since 1993, the change to daylight savings time has
+# been from midnight Thursday night to 1 a.m. Friday morning and the change
+# back to standard time on Saturday night from midnight daylight savings time
+# to 11 p.m. standard time.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	1989	only	-	Apr	30	0:00	1:00	D
@@ -452,23 +455,35 @@ Rule	Zion	1992	only	-	Sep	 6	0:00	0:00	S
 Rule	Zion	1993	only	-	Apr	 2	0:00	1:00	D
 Rule	Zion	1993	only	-	Sep	 5	0:00	0:00	S
 
-# The dates for 1994-1995 were obtained from Office of the Spokeswoman for
-# the Ministry of Interior, Jerusalem.  There are no dates yet for 1996 and
-# beyond so your guess is as good as theirs (those who are interested can
-# call 972-2-701411 and ask for the spokeswoman).
+# The dates for 1994-1995 were obtained from Office of the Spokeswoman for the
+# Ministry of Interior, Jerusalem, Israel.  The spokeswoman can be reached by
+# calling the switchboard at 972-2-701411 and asking for the spokeswoman.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule    Zion    1994    only    -       Apr      1      0:00    1:00    D
 Rule    Zion    1994    only    -       Aug     28      0:00    0:00    S
 Rule    Zion    1995    only    -       Mar     31      0:00    1:00    D
-# On 1995-03-13 Ephraim Silverberg corrected the next line from Aug 27 to Sep 3.
 Rule    Zion    1995    only    -       Sep      3      0:00    0:00    S
 
-# From Ephraim Silverberg (1995-03-13):
-# The Spokeswoman's office confirmed that there are not yet any dates
-# for the timezone conversion for the years 1996 and beyond yet
-# and this is one of the things the newly-appointed Minister of Interior
-# will have to decide sometime this year.
+# The dates for 1996-1998 were also obtained from Office of the Spokeswoman
+# for the Ministry of Interior, Jerusalem, Israel.  The official announcement
+# can be viewed (in Hebrew) at the following URL:
+#
+#   ftp://ftp.huji.ac.il/pub/misc/timezones/announcements/1996-1998.ps.gz
+#
+# Emptor Caveat: The fall of 1996 is an election year (the change to/from
+# daylight savings time affects the earliest possible time for morning prayers
+# making it is a sensitive issue among the religious sector of the electorate)
+# so political considerations may cause the outgoing government to make the
+# change back to standard time earlier in the fall of 1996 and the incoming
+# government may nullify the 1997/1998 times altogether depending on the
+# coalition formed after the elections.  Life isn't boring here in Israel.
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Zion	1996	1998	-	Mar	Fri>=14	0:00	1:00	D
+Rule	Zion	1996	only	-	Sep	22	0:00	0:00	S
+Rule	Zion	1997	only	-	Nov	 2	0:00	0:00	S
+Rule	Zion	1998	only	-	Oct	25	0:00	0:00	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
diff --git a/time/europe b/time/europe
index a01124b6a4..6c3ce4834a 100644
--- a/time/europe
+++ b/time/europe
@@ -1135,10 +1135,13 @@ Rule	France	1975	only	-	Mar	20	 2:00s	1:00	" DST"
 Rule	France	1975	only	-	Sep	22	 2:00s	0	-
 Rule	France	1976	only	-	Mar	28	 2:00s	1:00	" DST"
 Rule	France	1976	only	-	Sep	lastSun	 2:00s	0	-
-# Shanks gives 0:09 for Paris Mean Time; go with Whitman's more precise 0:09:05.
+# Shanks gives 0:09 for Paris Mean Time, and Whitman gives 0:09:05,
+# but Howse quotes the actual French legislation as saying 0:09:21.
+# Go with Howse.  Howse writes that the time in France was officially based
+# on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Paris	0:09:05 -	LMT	1891 Mar 15 0:01
-			0:09:05	-	PMT	1911 Mar 11    # Paris Mean Time
+Zone	Europe/Paris	0:09:21 -	LMT	1891 Mar 15 0:01
+			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
 			0:00	France	WET%s	1940 Jun 14
 			1:00	M-Eur	MET%s	1944 Aug 25
 			0:00	France	WET%s	1945 Sep 16 3:00
@@ -1466,15 +1469,17 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1924 May  2
 #			This may change to `EC' soon.
 
 # Monaco
-# Shanks gives 0:09 for Paris Mean Time; go with Whitman's more precise 0:09:05.
+# Shanks gives 0:09 for Paris Mean Time; go with Howse's more precise 0:09:21.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
-			0:09:05	-	PMT	1911 Mar 11    # Paris Mean Time
+			0:09:21	-	PMT	1911 Mar 11    # Paris Mean Time
 			0:00	France	WET%s	1945 Sep 16 3:00
 			1:00	France	MET%s	1977
 			1:00	EC	MET%s
 
 # Netherlands
+# Howse writes that the Netherlands' railways used GMT between 1892 and 1940,
+# but for other purposes the Netherlands used Amsterdam mean time.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Neth	1892	only	-	May	 1	0:00	0	AMT
 # Shanks gives 1916 May 1 0:00 and 1916 Oct 1 0:00; go with Whitman.
@@ -1663,9 +1668,6 @@ Zone Atlantic/Madeira	-1:07:36 -	LMT	1884		# Funchal
 			 0:00	Port	WET%s	1983 Sep 25 1:00s
 			 0:00	EC	WET%s
 
-# Slovakia
-Link Europe/Prague Europe/Bratislava
-
 # Romania
 # Catholic Romania switched from the Julian to the Gregorian calendar on
 # on 1919 Mar 18.  Greek Orthodox Romania switched on 1920 Mar 18.
@@ -1786,15 +1788,8 @@ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
 			12:00	-	ASK	1992 Jan 19 2:00s
 			13:00	Russia	AS%s
 
-# Yugoslavia (what's left of it -- mostly Serbia)
-# They switched from the Julian to the Gregorian calendar on 1918 Mar 18.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Belgrade	1:22:00	-	LMT	1884
-			1:00	-	MET	1941 Apr 18 23:00
-			1:00	M-Eur	MET%s	1945 May  8  2:00s
-			1:00	1:00  "MET DST"	1945 Sep 16  2:00s
-			1:00	-	MET	1983
-			1:00	EC	MET%s
+# Slovakia
+Link Europe/Prague Europe/Bratislava
 
 # Slovenia
 # They switched from the Julian to the Gregorian calendar on 1918 Mar 18.
@@ -1837,6 +1832,7 @@ Rule	Spain	1943	1946	-	Apr	Sat>=13	22:00s	2:00	" DDST"
 Rule	Spain	1943	only	-	Oct	 3	22:00s	1:00	" DST"
 Rule	Spain	1944	only	-	Oct	10	22:00s	1:00	" DST"
 Rule	Spain	1945	only	-	Sep	30	 1:00	1:00	" DST"
+Rule	Spain	1946	only	-	Sep	30	 0:00	0	-
 Rule	Spain	1949	only	-	Apr	30	23:00	1:00	" DST"
 Rule	Spain	1949	only	-	Sep	30	 1:00	0	-
 Rule	Spain	1974	1975	-	Apr	Sat>=13	23:00	1:00	" DST"
@@ -1980,6 +1976,16 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			2:00	M-Eur	EET%s	1994 Mar 27 2:00s
 			3:00	Russia	MS%s
 
+# Yugoslavia
+# They switched from the Julian to the Gregorian calendar on 1918 Mar 18.
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone	Europe/Belgrade	1:22:00	-	LMT	1884
+			1:00	-	MET	1941 Apr 18 23:00
+			1:00	M-Eur	MET%s	1945 May  8  2:00s
+			1:00	1:00  "MET DST"	1945 Sep 16  2:00s
+			1:00	-	MET	1983
+			1:00	EC	MET%s
+
 ###############################################################################
 
 # One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from
diff --git a/time/northamerica b/time/northamerica
index 479f3fcb80..036fdc6dfc 100644
--- a/time/northamerica
+++ b/time/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	7.15
+# @(#)northamerica	7.16
 # also includes Central America and the Caribbean
 
 # This data is by no means authoritative; if you think you know better,
@@ -193,7 +193,7 @@ Zone Pacific/Honolulu	-10:30	US	H%sT	1933 Apr 30 2:00
 			-10:00	-	HST
 
 # Navassa
-# no information; probably like US/Eastern
+# no information; probably like America/New_York
 
 
 # Old names, for S5 users
diff --git a/time/yearistype b/time/yearistype
index c7a886c25b..809f5492a1 100755
--- a/time/yearistype
+++ b/time/yearistype
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-: '@(#)yearistype.sh	7.3'
+: '@(#)yearistype.sh	7.4'
 
 case $#-$2 in
 	2-even)		case $1 in
@@ -8,7 +8,7 @@ case $#-$2 in
 				*)				exit 1 ;;
 			esac ;;
 	2-nonpres)	case $1 in
-				*[02468][048]|*[13567][26])	exit 1 ;;
+				*[02468][048]|*[13579][26])	exit 1 ;;
 				*)				exit 0 ;;
 			esac ;;
 	2-odd)		case $1 in
@@ -16,7 +16,7 @@ case $#-$2 in
 				*)				exit 1 ;;
 			esac ;;
 	2-uspres)	case $1 in
-				*[02468][048]|*[13567][26])	exit 0 ;;
+				*[02468][048]|*[13579][26])	exit 0 ;;
 				*)				exit 1 ;;
 			esac ;;
 	2-*)		echo "$0: wild type - $2" >&2