# HG changeset patch
# User Sunil Kumar H G - Oracle Corporation - Bangalore India <sunil.kumar.h.g@oracle.com>
# Date 1361169107 28800
# Node ID f5c29a3e8107f3ba7cc4383dec66c22883d8d6d2
# Parent  eb04a6ca141ddd121d1706736e03c7f9452723e6
15823417 SUNBT7205219 update zoneinfo timezones to 2012g (Palestine, Samoa)

diff -r eb04a6ca141d -r f5c29a3e8107 components/timezone/Makefile
--- a/components/timezone/Makefile	Sun Feb 17 21:51:48 2013 -0800
+++ b/components/timezone/Makefile	Sun Feb 17 22:31:47 2013 -0800
@@ -19,13 +19,15 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME= 	timezone
 
-HUMAN_VERSION=		2012f
+COMPONENT_BUGDB=	utility/timezone
+
+HUMAN_VERSION=		2012g
 
 # "etcetera" must be listed before "backward" because it sets up links that
 # "backward" needs.
diff -r eb04a6ca141d -r f5c29a3e8107 components/timezone/README
--- a/components/timezone/README	Sun Feb 17 21:51:48 2013 -0800
+++ b/components/timezone/README	Sun Feb 17 22:31:47 2013 -0800
@@ -1,4 +1,4 @@
-Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 
 The /usr/share/lib/zoneinfo/src directory contains zoneinfo timezone source
 files.  These source files have been compiled using zic(1M) to create
@@ -8,7 +8,7 @@
 The zoneinfo files track the Olson public source provided at
 ftp://ftp.iana.org/tz/releases/, therefore zoneinfo files may be added and
 removed as the Solaris source is updated.  The current Solaris release of
-the zoneinfo files is based on tzdata2012f.tar.gz.
+the zoneinfo files is based on tzdata2012g.tar.gz.
 
 The /usr/share/lib/zoneinfo/GMT[+-]* timezones listed below have been
 removed from the release.  Replace usage of the
diff -r eb04a6ca141d -r f5c29a3e8107 components/timezone/asia
--- a/components/timezone/asia	Sun Feb 17 21:51:48 2013 -0800
+++ b/components/timezone/asia	Sun Feb 17 22:31:47 2013 -0800
@@ -2293,6 +2293,8 @@
 
 # From Arthur David Olson (2011-09-20):
 # 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
+# From Paul Eggert (2012-10-12):
+# 2012 transitions per http://www.timeanddate.com as of 2012-10-12.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
@@ -2303,7 +2305,7 @@
 			2:00 Palestine	EE%sT	2011 Apr  2 12:01
 			2:00	1:00	EEST	2011 Aug  1
 			2:00	-	EET	2012 Mar 30
-			2:00	1:00	EEST	2012 Sep 28
+			2:00	1:00	EEST	2012 Sep 21 1:00
 			2:00	-	EET
 
 Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
@@ -2318,7 +2320,7 @@
 			2:00	-	EET	2011 Aug 30
 			2:00	1:00	EEST	2011 Sep 30 3:00
 			2:00	-	EET	2012 Mar 30
-			2:00	1:00	EEST	2012 Sep 28 3:00
+			2:00	1:00	EEST	2012 Sep 21 1:00
 			2:00	-	EET
 
 # Paracel Is
diff -r eb04a6ca141d -r f5c29a3e8107 components/timezone/australasia
--- a/components/timezone/australasia	Sun Feb 17 21:51:48 2013 -0800
+++ b/components/timezone/australasia	Sun Feb 17 22:31:47 2013 -0800
@@ -628,6 +628,23 @@
 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012
 # seasons, there is not yet any indication that this trend will continue on
 # a regular basis. For now, we have explicitly listed the transitions below.
+#
+# From Nicky (2012-09-10):
+# Daylight Saving Time commences on Sunday 30th September 2012 and
+# ends on Sunday 7th of April 2013.
+#
+# Please find link below for more information.
+# http://www.mcil.gov.ws/mcil_publications.html
+#
+# That publication also includes dates for Summer of 2013/4 as well
+# which give the impression of a pattern in selecting dates for the
+# future, so for now, we will guess this will continue.
+
+# Western Samoa
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	WS	2012	max	-	Sep	lastSun	3:00	1	D
+Rule	WS	2012	max	-	Apr	Sun>=1	4:00	0	-
+# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
 			-11:26:56 -	LMT	1911
 			-11:30	-	SAMT	1950		# Samoa Time
@@ -635,8 +652,8 @@
 			-11:00	1:00	WSDT	2011 Apr 2 4:00
 			-11:00	-	WST	2011 Sep 24 3:00
 			-11:00	1:00	WSDT	2011 Dec 30
-			 13:00	1:00	WSDT	2012 Apr 1 4:00
-			 13:00	-	WST
+			 13:00	1:00	WSDT	2012 Apr Sun>=1 4:00
+			 13:00	WS	WS%sT
 
 # Solomon Is
 # excludes Bougainville, for which see Papua New Guinea