timezone data in luci-0.12/BB14.07: Update to 2015a

Update also luci-0.12 with the timezone data 2015a.
More info at the pull request for Luci trunk:
https://github.com/openwrt/luci/pull/316

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

diff --git a/modules/base/luasrc/sys/zoneinfo/tzdata.lua b/modules/base/luasrc/sys/zoneinfo/tzdata.lua
index 8c7cc2add4fc42a0ac6d3ba7c3e96552f1e4aa5b..7c20131ec9486c58394544d853de7dd6996a9f30 100644 (file)
--- a/modules/base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/base/luasrc/sys/zoneinfo/tzdata.lua
@@ -95,7 +95,7 @@ TZ = {
        { 'America/Boise', 'MST7MDT,M3.2.0,M11.1.0' },
        { 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' },
        { 'America/Campo Grande', 'AMT4AMST,M10.3.0/0,M2.3.0/0' },
-       { 'America/Cancun', 'CST6CDT,M4.1.0,M10.5.0' },
+       { 'America/Cancun', 'EST5' },
        { 'America/Caracas', 'VET4:30' },
        { 'America/Cayenne', 'GFT3' },
        { 'America/Cayman', 'EST5' },
@@ -187,7 +187,7 @@ TZ = {
        { 'America/Rio Branco', 'ACT5' },
        { 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' },
        { 'America/Santarem', 'BRT3' },
-       { 'America/Santiago', 'CLT4CLST,M9.1.6/24,M4.4.6/24' },
+       { 'America/Santiago', 'CLT3' },
        { 'America/Santo Domingo', 'AST4' },
        { 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' },
        { 'America/Scoresbysund', 'EGT1EGST,M3.5.0/0,M10.5.0/1' },
@@ -216,7 +216,7 @@ TZ = {
        { 'Antarctica/Macquarie', 'MIST-11' },
        { 'Antarctica/Mawson', 'MAWT-5' },
        { 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
-       { 'Antarctica/Palmer', 'CLT4CLST,M9.1.6/24,M4.4.6/24' },
+       { 'Antarctica/Palmer', 'CLT3' },
        { 'Antarctica/Rothera', 'ROTT3' },
        { 'Antarctica/Syowa', 'SYOT-3' },
        { 'Antarctica/Troll', 'UTC0CEST-2,M3.5.0/1,M10.5.0/3' },
@@ -393,7 +393,7 @@ TZ = {
        { 'Pacific/Bougainville', 'BST-11' },
        { 'Pacific/Chatham', 'CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45' },
        { 'Pacific/Chuuk', 'CHUT-10' },
-       { 'Pacific/Easter', 'EAST6EASST,M9.1.6/22,M4.4.6/22' },
+       { 'Pacific/Easter', 'EAST5' },
        { 'Pacific/Efate', 'VUT-11' },
        { 'Pacific/Enderbury', 'PHOT-13' },
        { 'Pacific/Fakaofo', 'TKT-13' },

diff --git a/modules/base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
index d2f77ed2817ea223edef412518aa35d7b73c4aaf..14aef636543b9305aab897875d8daae8346e94d6 100644 (file)
--- a/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -54,8 +54,7 @@ OFFSET = {
        uyst  =  -7200, -- UYST
        fnt   =  -7200, -- FNT
        srt   = -10800, -- SRT
-       clt   = -14400, -- CLT
-       clst  = -10800, -- CLST
+       clt   = -10800, -- CLT
        egt   =  -3600, -- EGT
        egst  =      0, -- EGST
        nst   = -12600, -- NST
@@ -144,8 +143,7 @@ OFFSET = {
        chast =  45900, -- CHAST
        chadt =  49500, -- CHADT
        chut  =  36000, -- CHUT
-       east  = -21600, -- EAST
-       easst = -18000, -- EASST
+       east  = -18000, -- EAST
        vut   =  39600, -- VUT
        phot  =  46800, -- PHOT
        tkt   =  46800, -- TKT