[tz] Troll throws zic for a loop

[Paul Eggert]

Bengt-Inge Larsson wrote:
> I would like to suggest not commenting out Antarctica/Troll, but for the
> time being have it as UTC+0 only, or UTC+0 during European winter time and UTC+2 during European summer time.

Thanks, good idea.  I pushed the attached patch to the experimental 
repository to do the latter.

-------------- next part --------------
From 62850814014514ff6305e2afe991cc05b715f9a7 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert at cs.ucla.edu>
Date: Fri, 21 Mar 2014 08:52:27 -0700
Subject: [PATCH] Approximate Troll's rules with just UTC and CEST.

* antarctica (Antarctica/Troll), NEWS: Uncomment, but with an
approximation that uses only UTC and CEST.  (Thanks to Bengt-Inge
Larsson.)
* zone.tab (Antarctica/Troll): New entry.
---
 NEWS       | 10 +++++-----
 antarctica | 30 +++++++++++++++++-------------
 zone.tab   |  1 +
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/NEWS b/NEWS
index 4b53037..819e8c9 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,11 @@ Unreleased, experimental changes
     Crimea switches to Moscow time on 2014-03-30 at 02:00 local time.
     (Thanks to Alexander Krivenyshev.)  Move its zone.tab entry from UA to RU.
 
+    New entry for Troll station, Antarctica.  (Thanks to Paul-Inge Flakstad and
+    Bengt-Inge Larsson.)  This is currently an approximation; a better version
+    will require the zic and localtime fixes mentioned below, and the plan is
+    to wait for a while until at least the zic fixes propagate.
+
   Changes affecting code
 
     'zic' and 'localtime' no longer reject locations needing four transitions
@@ -21,11 +26,6 @@ Unreleased, experimental changes
 
   Changes affecting commentary and documentation
 
-    Add a commented-out entry for Troll station, Antarctica.
-    (Thanks to Paul-Inge Flakstad.)  It requires the 'zic' and 'localtime'
-    fixes mentioned above, so the plan is to wait for a while until these
-    fixes propagate.
-
     Fix Tuesday/Thursday typo in description of time in Israel.
     (Thanks to Bert Katz via Pavel Kharitonov and Mike Frysinger.)
 
diff --git a/antarctica b/antarctica
index 06da875..8f8e408 100644
--- a/antarctica
+++ b/antarctica
@@ -238,29 +238,33 @@ Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
 # Peter I Island (never inhabited)
 #
 # year-round base
-# Troll, Jutulsessen, -720041+0023206, since 2005-02-11
+# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12
 #
 # From Paul-Inge Flakstad (2014-03-10):
 # I recently had a long dialog about this with the developer of timegenie.com.
 # In the absence of specific dates, he decided to choose some likely ones:
-#   GMT +1 — From March 1 to the last Sunday in March
-#   GMT +2 — From the last Sunday in March until the last Sunday in October
-#   GMT +1 — From the last Sunday in October until November 7
-#   GMT +0 — From November 7 until March 1
+#   GMT +1 - From March 1 to the last Sunday in March
+#   GMT +2 - From the last Sunday in March until the last Sunday in October
+#   GMT +1 - From the last Sunday in October until November 7
+#   GMT +0 - From November 7 until March 1
 # The dates for switching to and from UTC+0 will probably not be absolutely
 # correct, but they should be quite close to the actual dates.
 #
-# From Paul Eggert (2014-03-20):
-# This entry requires tzcode 2014b or later, so comment it out for now.
-# Uncomment it when 2014b is supported in more places.
-## Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+# From Paul Eggert (2014-03-21):
+# The CET-switching Troll rules require zic from tzcode 2014b or later, so as
+# suggested by Bengt-Inge Larsson comment them out for now, and approximate
+# with only UTC and CEST.  Uncomment them when 2014b is more prevalent.
+#
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 #Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	CET
-#Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
+Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	CEST
 #Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	CET
 #Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	UTC
-## Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-#Zone Antarctica/Troll	0	-	zzz	2005 Feb 11
-#     			0:00	Troll	%s
+# Remove the following line when uncommenting the above '#Rule' lines.
+Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	UTC
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+Zone Antarctica/Troll	0	-	zzz	2005 Feb 12
+     			0:00	Troll	%s
 
 # Poland - year-round base
 # Arctowski, King George Island, -620945-0582745, since 1977
diff --git a/zone.tab b/zone.tab
index 6f988da..923d6ac 100644
--- a/zone.tab
+++ b/zone.tab
@@ -51,6 +51,7 @@ AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
 AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
 AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
 AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
 AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
 AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
-- 
1.8.3.2