>From 2951fa3bbc8d68e894e96a2399322254e20714a2 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 8 Jan 2018 09:03:13 -0800
Subject: [PROPOSED 1/2] =?UTF-8?q?S=C3=A3o=20Tom=C3=A9=20and=20Pr=C3=ADnci?=
 =?UTF-8?q?pe=20has=20switched=20to=20+01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(Thanks to Steffen Thorsen.)
* NEWS: Mention this.
* backzone: Move Africa/Sao_Tome from here ...
* africa: ... to here, add 2018 transition to +01, and
correct the pre-1912 offset for Lisbon Mean Time.
* zone1970.tab (ST): Break out into different entry.
---
 NEWS         | 5 +++++
 africa       | 6 +++++-
 backzone     | 5 -----
 zone1970.tab | 3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index f3c51f6..812c6f5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ News for the tz database
 
 Unreleased, experimental changes
 
+  Changes to past and future time stamps
+
+    S��o Tom�� and Pr��ncipe switched from +00 to +01 on 2018-01-01 at
+    00:00.  (Thanks to Steffen Thorsen.)
+
   Changes to future time stamps
 
     Starting in 2018 southern Brazil will begin DST on November's
diff --git a/africa b/africa
index be44580..9c8c7c6 100644
--- a/africa
+++ b/africa
@@ -158,7 +158,6 @@ Link Africa/Abidjan Africa/Freetown	# Sierra Leone
 Link Africa/Abidjan Africa/Lome		# Togo
 Link Africa/Abidjan Africa/Nouakchott	# Mauritania
 Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
-Link Africa/Abidjan Africa/Sao_Tome	# S��o Tom�� and Pr��ncipe
 Link Africa/Abidjan Atlantic/St_Helena	# St Helena
 
 # Djibouti
@@ -1037,6 +1036,11 @@ Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
 #	Inaccessible, Nightingale: uninhabited
 
 # S��o Tom�� and Pr��ncipe
+Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
+			-0:36:45 -	LMT	1912 # Lisbon Mean Time
+			 0:00	-	GMT	2018 Jan 1 00:00
+			 1:00	-	WAT
+
 # Senegal
 # See Africa/Abidjan.
 
diff --git a/backzone b/backzone
index 9d8a88d..3006b27 100644
--- a/backzone
+++ b/backzone
@@ -237,11 +237,6 @@ Zone Africa/Porto-Novo	0:10:28	-	LMT	1912 Jan  1
 			0:00	-	GMT	1934 Feb 26
 			1:00	-	WAT
 
-# S��o Tom�� and Pr��ncipe
-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912 # Lisbon Mean Time
-			 0:00	-	GMT
-
 # Mali (northern)
 Zone	Africa/Timbuktu	-0:12:04 -	LMT	1912
 			 0:00	-	GMT
diff --git a/zone1970.tab b/zone1970.tab
index 455e797..4ee8ce5 100644
--- a/zone1970.tab
+++ b/zone1970.tab
@@ -132,7 +132,7 @@ CA	+6043-13503	America/Whitehorse	Pacific - Yukon (south)
 CA	+6404-13925	America/Dawson	Pacific - Yukon (north)
 CC	-1210+09655	Indian/Cocos
 CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
-CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
+CI,BF,GM,GN,ML,MR,SH,SL,SN,TG	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
 CL	-3327-07040	America/Santiago	Chile (most areas)
 CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
@@ -321,6 +321,7 @@ SE	+5920+01803	Europe/Stockholm
 SG	+0117+10351	Asia/Singapore
 SR	+0550-05510	America/Paramaribo
 SS	+0451+03137	Africa/Juba
+ST	+0020+00644	Africa/Sao_Tome
 SV	+1342-08912	America/El_Salvador
 SY	+3330+03618	Asia/Damascus
 TC	+2128-07108	America/Grand_Turk
-- 
2.14.3

