merge novem

2 files changed, 119 insertions, 209 deletions

diff --git a/library/tzdata/Africa/Casablanca b/library/tzdata/Africa/Casablanca
index 74b767a..dec2778 100644
--- a/library/tzdata/Africa/Casablanca
+++ b/library/tzdata/Africa/Casablanca
@@ -34,191 +34,135 @@ set TZData(:Africa/Casablanca) {
     {1345428000 3600 1 WEST}
     {1348970400 0 0 WET}
     {1367114400 3600 1 WEST}
-    {1373335200 0 0 WET}
-    {1375927200 3600 1 WEST}
-    {1380420000 0 0 WET}
-    {1398564000 3600 1 WEST}
+    {1373162400 0 0 WET}
+    {1376100000 3600 1 WEST}
+    {1382839200 0 0 WET}
+    {1396144800 3600 1 WEST}
     {1404007200 0 0 WET}
     {1406599200 3600 1 WEST}
-    {1411869600 0 0 WET}
-    {1430013600 3600 1 WEST}
+    {1414288800 0 0 WET}
+    {1427594400 3600 1 WEST}
     {1434592800 0 0 WET}
     {1437184800 3600 1 WEST}
-    {1443319200 0 0 WET}
-    {1461463200 3600 1 WEST}
+    {1445738400 0 0 WET}
+    {1459044000 3600 1 WEST}
     {1465264800 0 0 WET}
     {1467856800 3600 1 WEST}
-    {1474768800 0 0 WET}
-    {1493517600 3600 1 WEST}
+    {1477792800 0 0 WET}
+    {1490493600 3600 1 WEST}
     {1495850400 0 0 WET}
     {1498442400 3600 1 WEST}
-    {1506218400 0 0 WET}
-    {1524967200 3600 1 WEST}
+    {1509242400 0 0 WET}
+    {1521943200 3600 1 WEST}
     {1526436000 0 0 WET}
     {1529028000 3600 1 WEST}
-    {1538272800 0 0 WET}
-    {1556416800 3600 1 WEST}
+    {1540692000 0 0 WET}
+    {1553997600 3600 1 WEST}
     {1557108000 0 0 WET}
     {1559700000 3600 1 WEST}
-    {1569722400 0 0 WET}
+    {1572141600 0 0 WET}
+    {1585447200 3600 1 WEST}
+    {1587693600 0 0 WET}
     {1590285600 3600 1 WEST}
-    {1601172000 0 0 WET}
+    {1603591200 0 0 WET}
+    {1616896800 3600 1 WEST}
+    {1618279200 0 0 WET}
     {1620871200 3600 1 WEST}
-    {1632621600 0 0 WET}
+    {1635645600 0 0 WET}
+    {1648346400 3600 1 WEST}
+    {1648951200 0 0 WET}
     {1651543200 3600 1 WEST}
-    {1664071200 0 0 WET}
-    {1682820000 3600 1 WEST}
-    {1695520800 0 0 WET}
-    {1714269600 3600 1 WEST}
-    {1727575200 0 0 WET}
-    {1745719200 3600 1 WEST}
-    {1759024800 0 0 WET}
-    {1777168800 3600 1 WEST}
-    {1790474400 0 0 WET}
-    {1808618400 3600 1 WEST}
-    {1821924000 0 0 WET}
-    {1840672800 3600 1 WEST}
-    {1853373600 0 0 WET}
-    {1872122400 3600 1 WEST}
-    {1885428000 0 0 WET}
-    {1903572000 3600 1 WEST}
-    {1916877600 0 0 WET}
-    {1935021600 3600 1 WEST}
-    {1948327200 0 0 WET}
-    {1966471200 3600 1 WEST}
-    {1979776800 0 0 WET}
-    {1997920800 3600 1 WEST}
-    {2011226400 0 0 WET}
-    {2029975200 3600 1 WEST}
-    {2042676000 0 0 WET}
-    {2061424800 3600 1 WEST}
-    {2074730400 0 0 WET}
-    {2092874400 3600 1 WEST}
-    {2106180000 0 0 WET}
-    {2124324000 3600 1 WEST}
-    {2137629600 0 0 WET}
-    {2155773600 3600 1 WEST}
-    {2169079200 0 0 WET}
-    {2187223200 3600 1 WEST}
-    {2200528800 0 0 WET}
-    {2219277600 3600 1 WEST}
-    {2232583200 0 0 WET}
-    {2250727200 3600 1 WEST}
-    {2264032800 0 0 WET}
-    {2282176800 3600 1 WEST}
-    {2295482400 0 0 WET}
-    {2313626400 3600 1 WEST}
-    {2326932000 0 0 WET}
-    {2345076000 3600 1 WEST}
-    {2358381600 0 0 WET}
-    {2377130400 3600 1 WEST}
-    {2389831200 0 0 WET}
-    {2408580000 3600 1 WEST}
-    {2421885600 0 0 WET}
-    {2440029600 3600 1 WEST}
-    {2453335200 0 0 WET}
-    {2471479200 3600 1 WEST}
-    {2484784800 0 0 WET}
-    {2502928800 3600 1 WEST}
-    {2516234400 0 0 WET}
-    {2534378400 3600 1 WEST}
-    {2547684000 0 0 WET}
-    {2566432800 3600 1 WEST}
-    {2579133600 0 0 WET}
-    {2597882400 3600 1 WEST}
-    {2611188000 0 0 WET}
-    {2629332000 3600 1 WEST}
-    {2642637600 0 0 WET}
-    {2660781600 3600 1 WEST}
-    {2674087200 0 0 WET}
-    {2692231200 3600 1 WEST}
-    {2705536800 0 0 WET}
-    {2724285600 3600 1 WEST}
-    {2736986400 0 0 WET}
-    {2755735200 3600 1 WEST}
-    {2769040800 0 0 WET}
-    {2787184800 3600 1 WEST}
-    {2800490400 0 0 WET}
-    {2818634400 3600 1 WEST}
-    {2831940000 0 0 WET}
-    {2850084000 3600 1 WEST}
-    {2863389600 0 0 WET}
-    {2881533600 3600 1 WEST}
-    {2894839200 0 0 WET}
-    {2913588000 3600 1 WEST}
-    {2926288800 0 0 WET}
-    {2945037600 3600 1 WEST}
-    {2958343200 0 0 WET}
-    {2976487200 3600 1 WEST}
-    {2989792800 0 0 WET}
-    {3007936800 3600 1 WEST}
-    {3021242400 0 0 WET}
-    {3039386400 3600 1 WEST}
-    {3052692000 0 0 WET}
-    {3070836000 3600 1 WEST}
-    {3084141600 0 0 WET}
-    {3102890400 3600 1 WEST}
-    {3116196000 0 0 WET}
-    {3134340000 3600 1 WEST}
-    {3147645600 0 0 WET}
-    {3165789600 3600 1 WEST}
-    {3179095200 0 0 WET}
-    {3197239200 3600 1 WEST}
-    {3210544800 0 0 WET}
-    {3228688800 3600 1 WEST}
-    {3241994400 0 0 WET}
-    {3260743200 3600 1 WEST}
-    {3273444000 0 0 WET}
-    {3292192800 3600 1 WEST}
-    {3305498400 0 0 WET}
-    {3323642400 3600 1 WEST}
-    {3336948000 0 0 WET}
-    {3355092000 3600 1 WEST}
-    {3368397600 0 0 WET}
-    {3386541600 3600 1 WEST}
-    {3399847200 0 0 WET}
-    {3417991200 3600 1 WEST}
-    {3431296800 0 0 WET}
-    {3450045600 3600 1 WEST}
-    {3462746400 0 0 WET}
-    {3481495200 3600 1 WEST}
-    {3494800800 0 0 WET}
-    {3512944800 3600 1 WEST}
-    {3526250400 0 0 WET}
-    {3544394400 3600 1 WEST}
-    {3557700000 0 0 WET}
-    {3575844000 3600 1 WEST}
-    {3589149600 0 0 WET}
-    {3607898400 3600 1 WEST}
-    {3620599200 0 0 WET}
-    {3639348000 3600 1 WEST}
-    {3652653600 0 0 WET}
-    {3670797600 3600 1 WEST}
-    {3684103200 0 0 WET}
-    {3702247200 3600 1 WEST}
-    {3715552800 0 0 WET}
-    {3733696800 3600 1 WEST}
-    {3747002400 0 0 WET}
-    {3765146400 3600 1 WEST}
-    {3778452000 0 0 WET}
-    {3797200800 3600 1 WEST}
-    {3809901600 0 0 WET}
-    {3828650400 3600 1 WEST}
-    {3841956000 0 0 WET}
-    {3860100000 3600 1 WEST}
-    {3873405600 0 0 WET}
-    {3891549600 3600 1 WEST}
-    {3904855200 0 0 WET}
-    {3922999200 3600 1 WEST}
-    {3936304800 0 0 WET}
-    {3954448800 3600 1 WEST}
-    {3967754400 0 0 WET}
-    {3986503200 3600 1 WEST}
-    {3999808800 0 0 WET}
-    {4017952800 3600 1 WEST}
-    {4031258400 0 0 WET}
-    {4049402400 3600 1 WEST}
-    {4062708000 0 0 WET}
-    {4080852000 3600 1 WEST}
-    {4094157600 0 0 WET}
+    {1667095200 0 0 WET}
+    {1682128800 3600 1 WEST}
+    {1698544800 0 0 WET}
+    {1712714400 3600 1 WEST}
+    {1729994400 0 0 WET}
+    {1743386400 3600 1 WEST}
+    {1761444000 0 0 WET}
+    {1774749600 3600 1 WEST}
+    {1792893600 0 0 WET}
+    {1806199200 3600 1 WEST}
+    {1824948000 0 0 WET}
+    {1837648800 3600 1 WEST}
+    {1856397600 0 0 WET}
+    {1869098400 3600 1 WEST}
+    {1887847200 0 0 WET}
+    {1901152800 3600 1 WEST}
+    {1919296800 0 0 WET}
+    {1932602400 3600 1 WEST}
+    {1950746400 0 0 WET}
+    {1964052000 3600 1 WEST}
+    {1982800800 0 0 WET}
+    {1995501600 3600 1 WEST}
+    {2014250400 0 0 WET}
+    {2026951200 3600 1 WEST}
+    {2045700000 0 0 WET}
+    {2058400800 3600 1 WEST}
+    {2077149600 0 0 WET}
+    {2090455200 3600 1 WEST}
+    {2108167200 0 0 WET}
+    {2121904800 3600 1 WEST}
+    {2138839200 0 0 WET}
+    {2153354400 3600 1 WEST}
+    {2184800400 3600 1 WEST}
+    {2216250000 3600 1 WEST}
+    {2248304400 3600 1 WEST}
+    {2279754000 3600 1 WEST}
+    {2311203600 3600 1 WEST}
+    {2342653200 3600 1 WEST}
+    {2374102800 3600 1 WEST}
+    {2405552400 3600 1 WEST}
+    {2437606800 3600 1 WEST}
+    {2469056400 3600 1 WEST}
+    {2500506000 3600 1 WEST}
+    {2531955600 3600 1 WEST}
+    {2563405200 3600 1 WEST}
+    {2595459600 3600 1 WEST}
+    {2626909200 3600 1 WEST}
+    {2658358800 3600 1 WEST}
+    {2689808400 3600 1 WEST}
+    {2721258000 3600 1 WEST}
+    {2752707600 3600 1 WEST}
+    {2784762000 3600 1 WEST}
+    {2816211600 3600 1 WEST}
+    {2847661200 3600 1 WEST}
+    {2879110800 3600 1 WEST}
+    {2910560400 3600 1 WEST}
+    {2942010000 3600 1 WEST}
+    {2974064400 3600 1 WEST}
+    {3005514000 3600 1 WEST}
+    {3036963600 3600 1 WEST}
+    {3068413200 3600 1 WEST}
+    {3099862800 3600 1 WEST}
+    {3131917200 3600 1 WEST}
+    {3163366800 3600 1 WEST}
+    {3194816400 3600 1 WEST}
+    {3226266000 3600 1 WEST}
+    {3257715600 3600 1 WEST}
+    {3289165200 3600 1 WEST}
+    {3321219600 3600 1 WEST}
+    {3352669200 3600 1 WEST}
+    {3384118800 3600 1 WEST}
+    {3415568400 3600 1 WEST}
+    {3447018000 3600 1 WEST}
+    {3479072400 3600 1 WEST}
+    {3510522000 3600 1 WEST}
+    {3541971600 3600 1 WEST}
+    {3573421200 3600 1 WEST}
+    {3604870800 3600 1 WEST}
+    {3636320400 3600 1 WEST}
+    {3668374800 3600 1 WEST}
+    {3699824400 3600 1 WEST}
+    {3731274000 3600 1 WEST}
+    {3762723600 3600 1 WEST}
+    {3794173200 3600 1 WEST}
+    {3825622800 3600 1 WEST}
+    {3857677200 3600 1 WEST}
+    {3889126800 3600 1 WEST}
+    {3920576400 3600 1 WEST}
+    {3952026000 3600 1 WEST}
+    {3983475600 3600 1 WEST}
+    {4015530000 3600 1 WEST}
+    {4046979600 3600 1 WEST}
+    {4078429200 3600 1 WEST}
 }
diff --git a/library/tzdata/Africa/Juba b/library/tzdata/Africa/Juba
index 7495981..40551f2 100644
--- a/library/tzdata/Africa/Juba
+++ b/library/tzdata/Africa/Juba
@@ -1,39 +1,5 @@
 # created by tools/tclZIC.tcl - do not edit
-
-set TZData(:Africa/Juba) {
-    {-9223372036854775808 7584 0 LMT}
-    {-1230775584 7200 0 CAT}
-    {10360800 10800 1 CAST}
-    {24786000 7200 0 CAT}
-    {41810400 10800 1 CAST}
-    {56322000 7200 0 CAT}
-    {73432800 10800 1 CAST}
-    {87944400 7200 0 CAT}
-    {104882400 10800 1 CAST}
-    {119480400 7200 0 CAT}
-    {136332000 10800 1 CAST}
-    {151016400 7200 0 CAT}
-    {167781600 10800 1 CAST}
-    {182552400 7200 0 CAT}
-    {199231200 10800 1 CAST}
-    {214174800 7200 0 CAT}
-    {230680800 10800 1 CAST}
-    {245710800 7200 0 CAT}
-    {262735200 10800 1 CAST}
-    {277246800 7200 0 CAT}
-    {294184800 10800 1 CAST}
-    {308782800 7200 0 CAT}
-    {325634400 10800 1 CAST}
-    {340405200 7200 0 CAT}
-    {357084000 10800 1 CAST}
-    {371941200 7200 0 CAT}
-    {388533600 10800 1 CAST}
-    {403477200 7200 0 CAT}
-    {419983200 10800 1 CAST}
-    {435013200 7200 0 CAT}
-    {452037600 10800 1 CAST}
-    {466635600 7200 0 CAT}
-    {483487200 10800 1 CAST}
-    {498171600 7200 0 CAT}
-    {947930400 10800 0 EAT}
+if {![info exists TZData(Africa/Khartoum)]} {
+    LoadTimeZoneFile Africa/Khartoum
 }
+set TZData(:Africa/Juba) $TZData(:Africa/Khartoum)