Put JST back into the default set of timezone abbreviations;

was removed in an unexplainable moment of brain fade.

diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index c5aa41873a95daee2a4bfea82c807fc0d352dfb2..dbb3b9aeca7d7985a18ae70ef9a880b7c517b44e 100644 (file)
--- 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.2 2006/07/25 13:49:21 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.3 2006/12/15 16:54:43 tgl Exp $
 #
 
 # CONFLICT! ADT is not unique
@@ -156,6 +156,8 @@ IST     19800    # Indian Standard Time
 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)
 KDT     36000 D  # Korean Daylight Time (not in zic)
 KGST    21600 D  # Kyrgyzstan Summer Time
                  #     (Asia/Bishkek)

diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index ca956ea7a17c09d884062bd90a92988e72878b39..e805986d143f07048d726105e5b7080573bb8ac1 100644 (file)
--- 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.2 2006/07/25 13:49:21 tgl Exp $
+# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.3 2006/12/15 16:54:43 tgl Exp $
 
 
 #################### AFRICA ####################
@@ -283,6 +283,8 @@ IRT     12600    # Iran Time (not in zic)
 # - IST: Indian Standard Time (Asia)
 IST      7200    # Israel Standard Time (not in zic)
 JAYT    32400    # Jayapura Time (Indonesia) (not in zic)
+JST     32400    # Japan Standard Time
+                 #     (Asia/Tokyo)
 KDT     36000 D  # Korean Daylight Time (not in zic)
 KGST    21600 D  # Kyrgyzstan Summer Time
                  #     (Asia/Bishkek)