diff --git a/.gitignore b/.gitignore
index e60390d..ff3ccb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ noarch/
/tzdata2011h.tar.gz
/tzdata2011i.tar.gz
/tzcode2011i.tar.gz
+/tzdata2011j.tar.gz
diff --git a/sources b/sources
index b7418fb..c38fd86 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2
-c7a86ec34f30f8d6aa77ef94902a3047 tzdata2011i.tar.gz
cf7f4335b7c8682899fa2814e711c1b2 tzcode2011i.tar.gz
+30a6bebdbdd03c5bd29241c15f569d50 tzdata2011j.tar.gz
diff --git a/tzdata-2011j-k.patch b/tzdata-2011j-k.patch
new file mode 100644
index 0000000..c4341b2
--- /dev/null
+++ b/tzdata-2011j-k.patch
@@ -0,0 +1,451 @@
+diff -r -c old/asia new/asia
+*** tzdata2011j/asia Sat Sep 3 08:28:37 2011
+--- tzdata2011k/asia Tue Sep 20 17:54:03 2011
+***************
+*** 1,4 ****
+! # @(#)asia 8.65
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+--- 1,4 ----
+! # @(#)asia 8.68
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+***************
+*** 2194,2200 ****
+--- 2194,2230 ----
+ # http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
+ #
+
++ # From Steffen Thorsen (2011-08-26):
++ # Gaza and the West Bank did go back to standard time in the beginning of
++ # August, and will now enter daylight saving time again on 2011-08-30
++ # 00:00 (so two periods of DST in 2011). The pause was because of
++ # Ramadan.
++ #
++ #
++ # http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
++ #
++ # Additional info:
++ #
++ # http://www.timeanddate.com/news/time/palestine-dst-2011.html
++ #
++
++ # From Alexander Krivenyshev (2011-08-27):
++ # According to the article in The Jerusalem Post:
++ # "...Earlier this month, the Palestinian government in the West Bank decided to
++ # move to standard time for 30 days, during Ramadan. The Palestinians in the
++ # Gaza Strip accepted the change and also moved their clocks one hour back.
++ # The Hamas government said on Saturday that it won't observe summertime after
++ # the Muslim feast of Id al-Fitr, which begins on Tuesday..."
++ # ...
++ #
++ # http://www.jpost.com/MiddleEast/Article.aspx?id=235650
++ #
++ # or
++ #
++ # http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
++ #
+ # The rules for Egypt are stolen from the `africa' file.
++
+ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+ Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
+ Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 -
+***************
+*** 2210,2221 ****
+ Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S
+ Rule Palestine 2006 only - Sep 22 0:00 0 -
+ Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
+! Rule Palestine 2008 only - Aug lastFri 2:00 0 -
+ Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S
+! Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S
+! Rule Palestine 2009 max - Sep Fri>=1 2:00 0 -
+ Rule Palestine 2010 only - Aug 11 0:00 0 -
+
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
+ 2:00 Zion EET 1948 May 15
+--- 2240,2254 ----
+ Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S
+ Rule Palestine 2006 only - Sep 22 0:00 0 -
+ Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
+! Rule Palestine 2008 only - Aug lastFri 0:00 0 -
+ Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S
+! Rule Palestine 2009 only - Sep Fri>=1 2:00 0 -
+! Rule Palestine 2010 only - Mar lastSat 0:01 1:00 S
+ Rule Palestine 2010 only - Aug 11 0:00 0 -
+
++ # From Arthur David Olson (2011-09-20):
++ # 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
++
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct
+ 2:00 Zion EET 1948 May 15
+***************
+*** 2222,2229 ****
+ 2:00 EgyptAsia EE%sT 1967 Jun 5
+ 2:00 Zion I%sT 1996
+ 2:00 Jordan EE%sT 1999
+! 2:00 Palestine EE%sT
+
+ # Paracel Is
+ # no information
+
+--- 2255,2277 ----
+ 2:00 EgyptAsia EE%sT 1967 Jun 5
+ 2:00 Zion I%sT 1996
+ 2:00 Jordan EE%sT 1999
+! 2:00 Palestine EE%sT 2011 Apr 2 12:01
+! 2:00 1:00 EEST 2011 Aug 1
+! 2:00 - EET
+
++ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct
++ 2:00 Zion EET 1948 May 15
++ 2:00 EgyptAsia EE%sT 1967 Jun 5
++ 2:00 Zion I%sT 1996
++ 2:00 Jordan EE%sT 1999
++ 2:00 Palestine EE%sT 2008 Aug
++ 2:00 1:00 EEST 2008 Sep
++ 2:00 Palestine EE%sT 2011 Apr 1 12:01
++ 2:00 1:00 EEST 2011 Aug 1
++ 2:00 - EET 2011 Aug 30
++ 2:00 1:00 EEST 2011 Oct 3 3:00
++ 2:00 - EET
++
+ # Paracel Is
+ # no information
+
+diff -r -c old/europe new/europe
+*** tzdata2011j/europe Wed Aug 17 12:52:01 2011
+--- tzdata2011k/europe Tue Sep 20 17:44:59 2011
+***************
+*** 1,5 ****
+ #
+! # @(#)europe 8.34
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+--- 1,5 ----
+ #
+! # @(#)europe 8.38
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+***************
+*** 561,569 ****
+ #
+ Rule Russia 1992 only - Mar lastSat 23:00 1:00 S
+ Rule Russia 1992 only - Sep lastSat 23:00 0 -
+! Rule Russia 1993 max - Mar lastSun 2:00s 1:00 S
+ Rule Russia 1993 1995 - Sep lastSun 2:00s 0 -
+! Rule Russia 1996 max - Oct lastSun 2:00s 0 -
+
+ # From Alexander Krivenyshev (2011-06-14):
+ # According to Kremlin press service, Russian President Dmitry Medvedev
+--- 561,569 ----
+ #
+ Rule Russia 1992 only - Mar lastSat 23:00 1:00 S
+ Rule Russia 1992 only - Sep lastSat 23:00 0 -
+! Rule Russia 1993 2010 - Mar lastSun 2:00s 1:00 S
+ Rule Russia 1993 1995 - Sep lastSun 2:00s 0 -
+! Rule Russia 1996 2010 - Oct lastSun 2:00s 0 -
+
+ # From Alexander Krivenyshev (2011-06-14):
+ # According to Kremlin press service, Russian President Dmitry Medvedev
+***************
+*** 583,589 ****
+ # From Arthur David Olson (2011-06-15):
+ # Take "abolishing daylight saving time" to mean that time is now considered
+ # to be standard.
+- # At least for now, keep the "old" Russia rules for the benefit of Belarus.
+
+ # These are for backward compatibility with older versions.
+
+--- 583,588 ----
+***************
+*** 689,694 ****
+--- 688,710 ----
+ 1:00 EU CE%sT
+
+ # Belarus
++ # From Yauhen Kharuzhy (2011-09-16):
++ # By latest Belarus government act Europe/Minsk timezone was changed to
++ # GMT+3 without DST (was GMT+2 with DST).
++ #
++ # Sources (Russian language):
++ # 1.
++ #
++ # http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
++ #
++ # 2.
++ #
++ # http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
++ #
++ # 3.
++ #
++ # http://news.tut.by/society/250578.html
++ #
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ Zone Europe/Minsk 1:50:16 - LMT 1880
+ 1:50 - MMT 1924 May 2 # Minsk Mean Time
+***************
+*** 700,706 ****
+ 2:00 1:00 EEST 1991 Sep 29 2:00s
+ 2:00 - EET 1992 Mar 29 0:00s
+ 2:00 1:00 EEST 1992 Sep 27 0:00s
+! 2:00 Russia EE%sT
+
+ # Belgium
+ #
+--- 716,723 ----
+ 2:00 1:00 EEST 1991 Sep 29 2:00s
+ 2:00 - EET 1992 Mar 29 0:00s
+ 2:00 1:00 EEST 1992 Sep 27 0:00s
+! 2:00 Russia EE%sT 2011 Mar 27 2:00s
+! 3:00 - FET # Further-eastern European Time
+
+ # Belgium
+ #
+***************
+*** 2034,2040 ****
+ 2:00 Poland CE%sT 1946
+ 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
+ 2:00 Russia EE%sT 2011 Mar 27 2:00s
+! 3:00 - KALT
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+ # Respublika Adygeya, Arkhangel'skaya oblast',
+--- 2051,2057 ----
+ 2:00 Poland CE%sT 1946
+ 3:00 Russia MSK/MSD 1991 Mar 31 2:00s
+ 2:00 Russia EE%sT 2011 Mar 27 2:00s
+! 3:00 - FET # Further-eastern European Time
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+ # Respublika Adygeya, Arkhangel'skaya oblast',
+***************
+*** 2189,2195 ****
+ # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
+
+ # From Oscar van Vlijmen (2009-11-29):
+! # ...some regions of RUssia were merged with others since 2005...
+ # Some names were changed, no big deal, except for one instance: a new name.
+ # YAK/YAKST: UTC+9 Zabajkal'skij kraj.
+
+--- 2206,2212 ----
+ # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
+
+ # From Oscar van Vlijmen (2009-11-29):
+! # ...some regions of [Russia] were merged with others since 2005...
+ # Some names were changed, no big deal, except for one instance: a new name.
+ # YAK/YAKST: UTC+9 Zabajkal'skij kraj.
+
+***************
+*** 2613,2618 ****
+--- 2630,2657 ----
+ # of March at 3am the time is changing to 4am and each last Sunday of
+ # October the time at 4am is changing to 3am"
+
++ # From Alexander Krivenyshev (2011-09-20):
++ # On September 20, 2011 the deputies of the Verkhovna Rada agreed to
++ # abolish the transfer clock to winter time.
++ #
++ # Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
++ # approval from 266 deputies.
++ #
++ # Ukraine abolishes transter back to the winter time (in Russian)
++ #
++ # http://news.mail.ru/politics/6861560/
++ #
++ #
++ # The Ukrainians will no longer change the clock (in Russian)
++ #
++ # http://www.segodnya.ua/news/14290482.html
++ #
++ #
++ # Deputies cancelled the winter time (in Russian)
++ #
++ # http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
++ #
++
+ # Zone NAME GMTOFF RULES FORMAT [UNTIL]
+ # Most of Ukraine since 1970 has been like Kiev.
+ # "Kyiv" is the transliteration of the Ukrainian name, but
+***************
+*** 2626,2632 ****
+ 3:00 - MSK 1990 Jul 1 2:00
+ 2:00 - EET 1992
+ 2:00 E-Eur EE%sT 1995
+! 2:00 EU EE%sT
+ # Ruthenia used CET 1990/1991.
+ # "Uzhhorod" is the transliteration of the Ukrainian name, but
+ # "Uzhgorod" is more common in English.
+--- 2665,2672 ----
+ 3:00 - MSK 1990 Jul 1 2:00
+ 2:00 - EET 1992
+ 2:00 E-Eur EE%sT 1995
+! 2:00 EU EE%sT 2011 Mar lastSun 1:00u
+! 3:00 - FET # Further-eastern European Time
+ # Ruthenia used CET 1990/1991.
+ # "Uzhhorod" is the transliteration of the Ukrainian name, but
+ # "Uzhgorod" is more common in English.
+***************
+*** 2640,2646 ****
+ 1:00 - CET 1991 Mar 31 3:00
+ 2:00 - EET 1992
+ 2:00 E-Eur EE%sT 1995
+! 2:00 EU EE%sT
+ # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
+ # "Zaporizhia" is the transliteration of the Ukrainian name, but
+ # "Zaporozh'ye" is more common in English. Use the common English
+--- 2680,2687 ----
+ 1:00 - CET 1991 Mar 31 3:00
+ 2:00 - EET 1992
+ 2:00 E-Eur EE%sT 1995
+! 2:00 EU EE%sT 2011 Mar lastSun 1:00u
+! 3:00 - FET # Further-eastern European Time
+ # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
+ # "Zaporizhia" is the transliteration of the Ukrainian name, but
+ # "Zaporozh'ye" is more common in English. Use the common English
+***************
+*** 2653,2659 ****
+ 1:00 C-Eur CE%sT 1943 Oct 25
+ 3:00 Russia MSK/MSD 1991 Mar 31 2:00
+ 2:00 E-Eur EE%sT 1995
+! 2:00 EU EE%sT
+ # Central Crimea used Moscow time 1994/1997.
+ Zone Europe/Simferopol 2:16:24 - LMT 1880
+ 2:16 - SMT 1924 May 2 # Simferopol Mean T
+--- 2694,2701 ----
+ 1:00 C-Eur CE%sT 1943 Oct 25
+ 3:00 Russia MSK/MSD 1991 Mar 31 2:00
+ 2:00 E-Eur EE%sT 1995
+! 2:00 EU EE%sT 2011 Mar lastSun 1:00u
+! 3:00 - FET # Further-eastern European Time
+ # Central Crimea used Moscow time 1994/1997.
+ Zone Europe/Simferopol 2:16:24 - LMT 1880
+ 2:16 - SMT 1924 May 2 # Simferopol Mean T
+***************
+*** 2678,2684 ****
+ # Assume it happened in March by not changing the clocks.
+ 3:00 Russia MSK/MSD 1997
+ 3:00 - MSK 1997 Mar lastSun 1:00u
+! 2:00 EU EE%sT
+
+ ###############################################################################
+
+--- 2720,2727 ----
+ # Assume it happened in March by not changing the clocks.
+ 3:00 Russia MSK/MSD 1997
+ 3:00 - MSK 1997 Mar lastSun 1:00u
+! 2:00 EU EE%sT 2011 Mar lastSun 1:00u
+! 3:00 - FET # Further-eastern European Time
+
+ ###############################################################################
+
+diff -r -c old/northamerica new/northamerica
+*** tzdata2011j/northamerica Wed Aug 17 17:33:36 2011
+--- tzdata2011k/northamerica Tue Sep 20 13:55:04 2011
+***************
+*** 1,5 ****
+ #
+! # @(#)northamerica 8.48
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+--- 1,5 ----
+ #
+! # @(#)northamerica 8.49
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+
+***************
+*** 1168,1198 ****
+ # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
+ # at 00:01 local time. For now, assume it started in 1987.
+
+! # From Michael Pelley (2011-08-05):
+! # The Government of Newfoundland and Labrador has pending changes to
+! # modify the hour for daylight savings time to come into effect in
+! # November 2011. This modification would change the time from 12:01AM to
+! # 2:00AM on the dates of the switches of Daylight Savings Time to/from
+! # Standard Time.
+! #
+! # As a matter of reference, in Canada provinces have the authority of
+! # setting time zone information. The legislation has passed our
+! # legislative body (The House of Assembly) and is awaiting the
+! # proclamation to come into effect. You may find this information at:
+! #
+! # http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm
+ #
+- # and
+- # search within that web page for Standard Time (Amendment) Act. The Act
+- # may be found at:
+- #
+- # http://www.assembly.nl.ca/business/bills/Bill1106.htm
+- #
+ # ...
+! # MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery
+! # Office of the Chief Information Officer Executive Council Government of
+! # Newfoundland & Labrador P.O. Box 8700, 40 Higgins Line, St. John's NL
+! # A1B 4J6
+
+ Rule StJohns 1987 only - Apr Sun>=1 0:01 1:00 D
+ Rule StJohns 1987 2006 - Oct lastSun 0:01 0 S
+--- 1168,1188 ----
+ # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
+ # at 00:01 local time. For now, assume it started in 1987.
+
+! # From Michael Pelley (2011-09-12):
+! # We received today, Monday, September 12, 2011, notification that the
+! # changes to the Newfoundland Standard Time Act have been proclaimed.
+! # The change in the Act stipulates that the change from Daylight Savings
+! # Time to Standard Time and from Standard Time to Daylight Savings Time
+! # now occurs at 2:00AM.
+! # ...
+! #
+! # http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm
+ #
+ # ...
+! # MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery
+! # Office of the Chief Information Officer
+! # Executive Council
+! # Government of Newfoundland & Labrador
+
+ Rule StJohns 1987 only - Apr Sun>=1 0:01 1:00 D
+ Rule StJohns 1987 2006 - Oct lastSun 0:01 0 S
+diff -r -c old/zone.tab new/zone.tab
+*** tzdata2011j/zone.tab Wed Aug 17 13:36:43 2011
+--- tzdata2011k/zone.tab Tue Sep 20 17:37:30 2011
+***************
+*** 1,5 ****
+ #
+! # @(#)zone.tab 8.47
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ #
+--- 1,5 ----
+ #
+! # @(#)zone.tab 8.49
+ # This file is in the public domain, so clarified as of
+ # 2009-05-17 by Arthur David Olson.
+ #
+***************
+*** 319,325 ****
+ PM +4703-05620 America/Miquelon
+ PN -2504-13005 Pacific/Pitcairn
+ PR +182806-0660622 America/Puerto_Rico
+! PS +3130+03428 Asia/Gaza
+ PT +3843-00908 Europe/Lisbon mainland
+ PT +3238-01654 Atlantic/Madeira Madeira Islands
+ PT +3744-02540 Atlantic/Azores Azores
+--- 319,326 ----
+ PM +4703-05620 America/Miquelon
+ PN -2504-13005 Pacific/Pitcairn
+ PR +182806-0660622 America/Puerto_Rico
+! PS +3130+03428 Asia/Gaza Gaza Strip
+! PS +313200+0350542 Asia/Hebron West Bank
+ PT +3843-00908 Europe/Lisbon mainland
+ PT +3238-01654 Atlantic/Madeira Madeira Islands
+ PT +3744-02540 Atlantic/Azores Azores
diff --git a/tzdata-2011i-kemerovo.patch b/tzdata-2011j-kemerovo.patch
similarity index 81%
rename from tzdata-2011i-kemerovo.patch
rename to tzdata-2011j-kemerovo.patch
index ef52390..bd515ad 100644
--- a/tzdata-2011i-kemerovo.patch
+++ b/tzdata-2011j-kemerovo.patch
@@ -1,6 +1,6 @@
diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011i/europe~ 2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011i/europe 2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011j/europe~ 2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011j/europe 2011-06-27 16:49:39.323493224 +0200
@@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk 5:48:48 - NMT 19
7:00 Russia KRA%sT 1991 Mar 31 2:00s
6:00 Russia KRA%sT 1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index 03352af..db0f716 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
Summary: Timezone data
Name: tzdata
-Version: 2011i
-%define tzdata_version 2011i
+Version: 2011k
+%define tzdata_version 2011j
%define tzcode_version 2011i
-Release: 1%{?dist}
+Release: 0.1.20110921%{?dist}
License: Public Domain
Group: System Environment/Base
URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,8 @@ Source0: tzdata-base-0.tar.bz2
Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
# __decl_patches
-Patch1: tzdata-2011i-kemerovo.patch
+Patch1: tzdata-2011j-kemerovo.patch
+Patch2: tzdata-2011j-k.patch
# __end
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
Makeconfig.in > Makeconfig
# __apply_patches
%patch1 -p0
+%patch2 -p0
# __end
mkdir javazic
@@ -113,6 +115,17 @@ rm -rf %{buildroot}
%{_datadir}/javazi
%changelog
+* Wed Sep 21 2011 Petr Machata - 2011k-0.1.20110921
+- Upstream 2011j:
+ - Fix the Samoa date line skip
+ - Changes in past timestamp typos several Africa zones
+- Proposed upstream 2011k:
+ - Belarus and Ukraine adopt permanent DST in 2011
+ - Palestine suspends DST during Ramadan in 2011
+ - Gaza and West Bank split in 2011. West Bank is tracked in the
+ timezone Asia/Hebron. zone.tab update accordingly.
+- Resolves: #737896
+
* Mon Aug 29 2011 Petr Machata - 2011h-1
- Upstream 2011i:
- Add Africa/Juba (South Sudan) zone