1 files changed, 34 insertions, 3 deletions

diff --git a/java/diablo-jdk15/pkg-plist b/java/diablo-jdk15/pkg-plist
index fefbb27d7c88..05ab8275438b 100644
--- a/java/diablo-jdk15/pkg-plist
+++ b/java/diablo-jdk15/pkg-plist
@@ -1635,7 +1635,8 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Abidjan
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Accra
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Addis_Ababa
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Algiers
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmera
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmara
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Asmera
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bamako
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Bangui
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Africa/Banjul
@@ -1699,10 +1700,12 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Tucuman
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Argentina/Ushuaia
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Aruba
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Asuncion
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Atikokan
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Bahia
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Barbados
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Belem
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Belize
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Blanc-Sablon
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Boa_Vista
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Bogota
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Boise
@@ -1714,7 +1717,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayenne
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cayman
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Chicago
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Chihuahua
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Coral_Harbour
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Coral_Harbour
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Costa_Rica
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Cuiaba
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Curacao
@@ -1743,7 +1746,9 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Hermosillo
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Indianapolis
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Knox
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Marengo
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Petersburg
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vevay
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Indiana/Vincennes
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Inuvik
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Iqaluit
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Jamaica
@@ -1762,6 +1767,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Menominee
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Merida
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Mexico_City
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Miquelon
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Moncton
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Monterrey
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montevideo
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Montreal
@@ -1772,6 +1778,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nipigon
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Nome
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Noronha
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/Center
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/North_Dakota/New_Salem
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Panama
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Pangnirtung
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/America/Paramaribo
@@ -1897,7 +1904,8 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Azores
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Bermuda
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Canary
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Cape_Verde
-diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faeroe
+%%TZORIGINAL%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faeroe
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Faroe
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Madeira
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/Reykjavik
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Atlantic/South_Georgia
@@ -1908,6 +1916,7 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Brisbane
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Broken_Hill
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Currie
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Darwin
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Eucla
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Hobart
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lindeman
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Lord_Howe
@@ -1915,7 +1924,10 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Melbourne
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Perth
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Australia/Sydney
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/CET
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/CST6CDT
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EET
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EST
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/EST5EDT
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+1
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Etc/GMT+10
@@ -1984,10 +1996,12 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Uzhgorod
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vaduz
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vienna
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Vilnius
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Volgograd
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Warsaw
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zaporozhye
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe/Zurich
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/GMT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/HST
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Antananarivo
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Chagos
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Christmas
@@ -2000,6 +2014,9 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mauritius
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Mayotte
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian/Reunion
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MET
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MST
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/MST7MDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/PST8PDT
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Apia
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Auckland
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Chatham
@@ -2038,6 +2055,19 @@ diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Tongatapu
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Truk
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wake
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific/Wallis
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/AST4ADT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/CST6CDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/EST5EDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/HST10
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/MST7MDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/PST8PDT
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9
+%%TZUPDATE%%diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV/YST9YDT
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/WET
 diablo-jdk%%JDK_VERSION%%/jre/lib/zi/ZoneInfoMappings
 %%WEB%%diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop/sun_java.desktop
@@ -2329,6 +2359,7 @@ diablo-jdk%%JDK_VERSION%%/src.zip
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/%%ARCH%%
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin/desktop
 %%WEB%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/plugin
+%%TZUPDATE%%@dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/SystemV
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Pacific
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Indian
 @dirrm diablo-jdk%%JDK_VERSION%%/jre/lib/zi/Europe