From 03650589d9f7be31f3725f199e863a71d5ee8d6a Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 6 Sep 2009 15:25:23 +0000
Subject: [PATCH] Update the tznames reference files, and add IDT (Israel
Daylight Time) to the Default timezone abbreviation set.
Back-port the the current file set to all branches that contain tznames.
This includes adding SGT to the Default set in pre-8.4 releases.
Joachim Wieland
---
src/timezone/tznames/Africa.txt | 8 +++++++-
src/timezone/tznames/Asia.txt | 8 ++++++--
src/timezone/tznames/Australia.txt | 4 +++-
src/timezone/tznames/Default | 3 ++-
src/timezone/tznames/Europe.txt | 3 ++-
src/timezone/tznames/README | 8 ++++++--
6 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/timezone/tznames/Africa.txt b/src/timezone/tznames/Africa.txt
index c0fc16de541..b0360115eaa 100644
--- a/src/timezone/tznames/Africa.txt
+++ b/src/timezone/tznames/Africa.txt
@@ -4,7 +4,7 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
-# $PostgreSQL: pgsql/src/timezone/tznames/Africa.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Africa.txt,v 1.3 2009/09/06 15:25:23 tgl Exp $
#
CAT 7200 # Central Africa Time
@@ -161,6 +161,12 @@ WAT 3600 # West Africa Time
# (Africa/Niamey)
# (Africa/Porto-Novo)
# (Africa/Windhoek)
+WEST 3600 D # Western Europe Summer Time
+ # (Africa/Casablanca)
+ # (Atlantic/Canary)
+ # (Atlantic/Faeroe)
+ # (Atlantic/Madeira)
+ # (Europe/Lisbon)
WET 0 # Western Europe Time
# (Africa/Casablanca)
# (Africa/El_Aaiun)
diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index dbb3b9aeca7..0deaa0bf5f0 100644
--- a/src/timezone/tznames/Asia.txt
+++ b/src/timezone/tznames/Asia.txt
@@ -4,7 +4,7 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
-# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.3 2006/12/15 16:54:43 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.4 2009/09/06 15:25:23 tgl Exp $
#
# CONFLICT! ADT is not unique
@@ -138,10 +138,15 @@ ICT 25200 # Indochina Time
# (Asia/Phnom_Penh)
# (Asia/Saigon)
# (Asia/Vientiane)
+IDT 10800 D # Israel Daylight Time
+IRDT 16200 D # Iran Daylight Time
+ # (Asia/Tehran)
IRKST 32400 D # Irkutsk Summer Time
# (Asia/Irkutsk)
IRKT 28800 # Irkutsk Time
# (Asia/Irkutsk)
+IRST 12600 # Iran Standard Time
+ # (Asia/Tehran)
IRT 12600 # Iran Time (not in zic)
# CONFLICT! IST is not unique
# Other timezones:
@@ -154,7 +159,6 @@ IST 19800 # Indian Standard Time
# - IST: Irish Summer Time (Europe)
# - IST: Indian Standard Time (Asia)
IST 7200 # Israel Standard Time
- # (this time zone is not contained in the ZIC database)
JAYT 32400 # Jayapura Time (Indonesia) (not in zic)
JST 32400 # Japan Standard Time
# (Asia/Tokyo)
diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt
index e790a1dd11f..2eb430992f3 100644
--- a/src/timezone/tznames/Australia.txt
+++ b/src/timezone/tznames/Australia.txt
@@ -4,7 +4,7 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
-# $PostgreSQL: pgsql/src/timezone/tznames/Australia.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Australia.txt,v 1.3 2009/09/06 15:25:23 tgl Exp $
#
ACSST 37800 D # Central Australia (not in zic)
@@ -25,6 +25,8 @@ CAST 34200 # Central Australia Standard Time (not in zic)
CST 34200 # Central Standard Time (Australia)
# (Australia/Adelaide)
# (Australia/Broken_Hill)
+CWST 31500 # Central Western Standard Time (Australia)
+ # (Australia/Eucla)
# CONFLICT! EAST is not unique
# Other timezones:
# - EAST: Easter Island Time (Chile) (Pacific)
diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index 5e38ee6e36c..1feab9ee50c 100644
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -4,7 +4,7 @@
# timezone_abbreviations to 'Default'. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
-# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.7 2009/03/05 14:27:50 heikki Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.8 2009/09/06 15:25:23 tgl Exp $
#################### AFRICA ####################
@@ -283,6 +283,7 @@ ICT 25200 # Indochina Time
# (Asia/Phnom_Penh)
# (Asia/Saigon)
# (Asia/Vientiane)
+IDT 10800 D # Israel Daylight Time
IRKST 32400 D # Irkutsk Summer Time
# (Asia/Irkutsk)
IRKT 28800 # Irkutsk Time
diff --git a/src/timezone/tznames/Europe.txt b/src/timezone/tznames/Europe.txt
index 206dbf3a24c..98998508a07 100644
--- a/src/timezone/tznames/Europe.txt
+++ b/src/timezone/tznames/Europe.txt
@@ -4,7 +4,7 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
-# $PostgreSQL: pgsql/src/timezone/tznames/Europe.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Europe.txt,v 1.3 2009/09/06 15:25:23 tgl Exp $
#
BST 3600 D # British Summer Time
@@ -191,6 +191,7 @@ SAMST 18000 D # Samara Summer Time
SAMT 14400 # Samara Time
# (Europe/Samara)
WEST 3600 D # Western Europe Summer Time
+ # (Africa/Casablanca)
# (Atlantic/Canary)
# (Atlantic/Faeroe)
# (Atlantic/Madeira)
diff --git a/src/timezone/tznames/README b/src/timezone/tznames/README
index 488fb670826..88958c8cbf9 100644
--- a/src/timezone/tznames/README
+++ b/src/timezone/tznames/README
@@ -1,4 +1,4 @@
-$PostgreSQL: pgsql/src/timezone/tznames/README,v 1.3 2008/03/21 13:23:29 momjian Exp $
+$PostgreSQL: pgsql/src/timezone/tznames/README,v 1.4 2009/09/06 15:25:23 tgl Exp $
tznames
=======
@@ -23,5 +23,9 @@ Your set of time zone names can then be included in future releases.
For the time being you can always add your own set.
The files named Africa.txt, etc, are not intended to be used directly as
-timezone abbreviation files. They contain reference definitions of timezone
+time zone abbreviation files. They contain reference definitions of time zone
names that can be copied into a custom abbreviation file as needed.
+
+Note that these files (*.txt) are already a subset of the zic timezone
+database files: we tried to list only those time zones that (according to
+the zic timezone database) appear to be still in use.
--
GitLab