Update to 1.6.26 oi-extras
authorBart Coddens <bart.coddens@gmail.com>
Wed, 13 Jul 2011 22:59:37 +0200
branchoi-extras
changeset 217 5d34f3760a32
parent 216 dce321d063d3
child 218 7049e2d43193
Update to 1.6.26
ub_javavm/jdk/Makefile
ub_javavm/jdk/developer-java-jdk64.p5m
ub_javavm/jdk/library-java-javadb.p5m
ub_javavm/jdk/runtime-java.p5m
--- a/ub_javavm/jdk/Makefile	Tue Jun 28 15:48:51 2011 +0100
+++ b/ub_javavm/jdk/Makefile	Wed Jul 13 22:59:37 2011 +0200
@@ -9,20 +9,20 @@
 #
 
 #
-# Copyright 2011, Andrzej Szeszo
+# Copyright 2011, Andrzej Szeszo, Bart Coddens
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		jdk
-COMPONENT_VERSION=	25
+COMPONENT_VERSION=	26
 COMPONENT_SRC=		jdk1.6.0_$(COMPONENT_VERSION)
 
 COMPONENT_ARCHIVE_1.i386=	jdk-6u$(COMPONENT_VERSION)-dlj-solaris-i586.sh
-COMPONENT_ARCHIVE_HASH_1.i386=	sha1:1a55f742502ce3cebca9cc44288e33f0547aa0b7
+COMPONENT_ARCHIVE_HASH_1.i386=	sha1:f5912eeb222090eefe816019b5383bafd6c271be
 COMPONENT_ARCHIVE_URL_1.i386=	http://download.java.net/dlj/binaries/$(COMPONENT_ARCHIVE_1.i386)
 COMPONENT_ARCHIVE_2.i386=	jdk-6u$(COMPONENT_VERSION)-dlj-solaris-amd64.sh
-COMPONENT_ARCHIVE_HASH_2.i386=	sha1:5d6ea21bb5f968c93c2840e9d02b224e0bf40f75
+COMPONENT_ARCHIVE_HASH_2.i386=	sha1:1344ae6f65071a448b38e322f31e42c51842ee39
 COMPONENT_ARCHIVE_URL_2.i386=	http://download.java.net/dlj/binaries/$(COMPONENT_ARCHIVE_2.i386)
 
 COMPONENT_ARCHIVE_1.sparc=	jdk-6u$(COMPONENT_VERSION)-dlj-solaris-sparc.sh
--- a/ub_javavm/jdk/developer-java-jdk64.p5m	Tue Jun 28 15:48:51 2011 +0100
+++ b/ub_javavm/jdk/developer-java-jdk64.p5m	Wed Jul 13 22:59:37 2011 +0200
@@ -77,7 +77,3 @@
 file path=usr/jdk/instances/jdk1.6.0/bin/$(MACH64)/wsgen
 file path=usr/jdk/instances/jdk1.6.0/bin/$(MACH64)/wsimport
 file path=usr/jdk/instances/jdk1.6.0/bin/$(MACH64)/xjc
-file \
-    path=usr/jdk/instances/jdk1.6.0/lib/visualvm/profiler/lib/deployed/jdk15/solaris-$(MACH64)/libprofilerinterface.so
-file \
-    path=usr/jdk/instances/jdk1.6.0/lib/visualvm/profiler/lib/deployed/jdk16/solaris-$(MACH64)/libprofilerinterface.so
--- a/ub_javavm/jdk/library-java-javadb.p5m	Tue Jun 28 15:48:51 2011 +0100
+++ b/ub_javavm/jdk/library-java-javadb.p5m	Wed Jul 13 22:59:37 2011 +0200
@@ -184,8 +184,6 @@
 file path=opt/SUNWjavadb/demo/databases/toursdb/log/log.ctrl
 file path=opt/SUNWjavadb/demo/databases/toursdb/log/log1.dat
 file path=opt/SUNWjavadb/demo/databases/toursdb/log/logmirror.ctrl
-file \
-    path=opt/SUNWjavadb/demo/databases/toursdb/seg0/c$(COMPONENT_VERSION)1.dat
 file path=opt/SUNWjavadb/demo/databases/toursdb/seg0/c10.dat
 file path=opt/SUNWjavadb/demo/databases/toursdb/seg0/c101.dat
 file path=opt/SUNWjavadb/demo/databases/toursdb/seg0/c111.dat
@@ -408,7 +406,7 @@
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminapps.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminapps49914.html
 file \
-    path=opt/SUNWjavadb/docs/html/adminguide/cadminapps591$(COMPONENT_VERSION).html
+    path=opt/SUNWjavadb/docs/html/adminguide/cadminapps59125.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminapps811478.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminapps811631.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminapps811656.html
@@ -434,12 +432,12 @@
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminhubbkup21105.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminhubbkup63476.html
 file \
-    path=opt/SUNWjavadb/docs/html/adminguide/cadminhubbkup675$(COMPONENT_VERSION).html
+    path=opt/SUNWjavadb/docs/html/adminguide/cadminhubbkup67525.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminhubbkup75469.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminhubbkup98797.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminjavadb.html
 file \
-    path=opt/SUNWjavadb/docs/html/adminguide/cadminlockvti4$(COMPONENT_VERSION)53.html
+    path=opt/SUNWjavadb/docs/html/adminguide/cadminlockvti42553.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminlockvti83889.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminlog800315.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminlog98.html
@@ -453,11 +451,11 @@
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminov38650.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminov65220.html
 file \
-    path=opt/SUNWjavadb/docs/html/adminguide/cadminov8$(COMPONENT_VERSION)1$(COMPONENT_VERSION).html
+    path=opt/SUNWjavadb/docs/html/adminguide/cadminov825125.html
 file \
-    path=opt/SUNWjavadb/docs/html/adminguide/cadminov8$(COMPONENT_VERSION)149.html
+    path=opt/SUNWjavadb/docs/html/adminguide/cadminov825149.html
 file \
-    path=opt/SUNWjavadb/docs/html/adminguide/cadminov8$(COMPONENT_VERSION)266.html
+    path=opt/SUNWjavadb/docs/html/adminguide/cadminov825266.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminov83312.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminovcliconnect.html
 file path=opt/SUNWjavadb/docs/html/adminguide/cadminovntsrvsample.html
@@ -660,8 +658,7 @@
 file path=opt/SUNWjavadb/docs/html/devguide/cdevcsecureroles.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy11201.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy12748.html
-file \
-    path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy153$(COMPONENT_VERSION).html
+file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy15325.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy15818.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy17604.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy18639.html
@@ -671,8 +668,7 @@
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy30736.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy32171.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy38918.html
-file \
-    path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy8$(COMPONENT_VERSION)29.html
+file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy82529.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy855368.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy855655.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdeploy856333.html
@@ -684,9 +680,9 @@
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdgpref24290.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdgpref29520.html
 file \
-    path=opt/SUNWjavadb/docs/html/devguide/cdevdvlp$(COMPONENT_VERSION)820.html
+    path=opt/SUNWjavadb/docs/html/devguide/cdevdvlp25820.html
 file \
-    path=opt/SUNWjavadb/docs/html/devguide/cdevdvlp$(COMPONENT_VERSION)889.html
+    path=opt/SUNWjavadb/docs/html/devguide/cdevdvlp25889.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdvlp13018.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdvlp14839.html
 file path=opt/SUNWjavadb/docs/html/devguide/cdevdvlp17453.html
@@ -821,7 +817,7 @@
 file path=opt/SUNWjavadb/docs/html/devguide/rdevconceptssur.html
 file path=opt/SUNWjavadb/docs/html/devguide/rdevcopyright.html
 file \
-    path=opt/SUNWjavadb/docs/html/devguide/rdevcsecure1$(COMPONENT_VERSION).html
+    path=opt/SUNWjavadb/docs/html/devguide/rdevcsecure125.html
 file path=opt/SUNWjavadb/docs/html/devguide/rdevcsecure13713.html
 file path=opt/SUNWjavadb/docs/html/devguide/rdevcsecure190.html
 file path=opt/SUNWjavadb/docs/html/devguide/rdevcsecure26537.html
@@ -858,7 +854,7 @@
 file path=opt/SUNWjavadb/docs/html/devguide/tdevconcepts41704.html
 file path=opt/SUNWjavadb/docs/html/devguide/tdevconcepts839040.html
 file \
-    path=opt/SUNWjavadb/docs/html/devguide/tdevcsecure8$(COMPONENT_VERSION)56.html
+    path=opt/SUNWjavadb/docs/html/devguide/tdevcsecure82556.html
 file path=opt/SUNWjavadb/docs/html/devguide/tdevcsecure81850.html
 file path=opt/SUNWjavadb/docs/html/devguide/tdevcsecurenewbootpw.html
 file path=opt/SUNWjavadb/docs/html/devguide/tdevcsecurenewextkey.html
@@ -915,7 +911,7 @@
 file path=opt/SUNWjavadb/docs/html/getstart/rgsquck35368.html
 file path=opt/SUNWjavadb/docs/html/getstart/rgstrademderby.html
 file path=opt/SUNWjavadb/docs/html/getstart/rwwdactivity3.html
-file path=opt/SUNWjavadb/docs/html/getstart/tgs26$(COMPONENT_VERSION)0.html
+file path=opt/SUNWjavadb/docs/html/getstart/tgs26250.html
 file path=opt/SUNWjavadb/docs/html/getstart/tgsrunningdblook.html
 file path=opt/SUNWjavadb/docs/html/getstart/tgsrunningij.html
 file path=opt/SUNWjavadb/docs/html/getstart/tgsrunningsysinfo.html
@@ -944,7 +940,7 @@
 file path=opt/SUNWjavadb/docs/html/ref/crefmpref11181.html
 file path=opt/SUNWjavadb/docs/html/ref/crefmpref23223.html
 file path=opt/SUNWjavadb/docs/html/ref/crefmpref23947.html
-file path=opt/SUNWjavadb/docs/html/ref/crefproper22$(COMPONENT_VERSION)0.html
+file path=opt/SUNWjavadb/docs/html/ref/crefproper22250.html
 file path=opt/SUNWjavadb/docs/html/ref/crefproper51399.html
 file path=opt/SUNWjavadb/docs/html/ref/crefproperdynstat.html
 file path=opt/SUNWjavadb/docs/html/ref/crefsqlbuiltinsystemfunctions.html
@@ -1157,8 +1153,8 @@
 file path=opt/SUNWjavadb/docs/html/ref/rrefpgc1.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefproceduresinplacecompress.html
 file \
-    path=opt/SUNWjavadb/docs/html/ref/rrefproper$(COMPONENT_VERSION)0$(COMPONENT_VERSION).html
-file path=opt/SUNWjavadb/docs/html/ref/rrefproper$(COMPONENT_VERSION)581.html
+    path=opt/SUNWjavadb/docs/html/ref/rrefproper25025.html
+file path=opt/SUNWjavadb/docs/html/ref/rrefproper25581.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefproper10607.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefproper13217.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefproper13766.html
@@ -1178,7 +1174,7 @@
 file path=opt/SUNWjavadb/docs/html/ref/rrefproper34037.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefproper35028.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefproper37341.html
-file path=opt/SUNWjavadb/docs/html/ref/rrefproper393$(COMPONENT_VERSION).html
+file path=opt/SUNWjavadb/docs/html/ref/rrefproper39325.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefproper40346.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefproper40688.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefproper43414.html
@@ -1242,7 +1238,7 @@
 file path=opt/SUNWjavadb/docs/html/ref/rrefsistabssystableperms.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefso2.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefsql9241891.html
-file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj$(COMPONENT_VERSION)228.html
+file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj25228.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj1055824.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj10696.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj1080779.html
@@ -1321,7 +1317,7 @@
 file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj42154.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj42324.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj42476.html
-file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj431$(COMPONENT_VERSION).html
+file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj43125.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj55788.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj57522.html
 file path=opt/SUNWjavadb/docs/html/ref/rrefsqlj57924.html
@@ -1395,10 +1391,10 @@
 file path=opt/SUNWjavadb/docs/html/tools/ctools1004764.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsdblook.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsgenddldb.html
-file path=opt/SUNWjavadb/docs/html/tools/ctoolsij$(COMPONENT_VERSION)986.html
+file path=opt/SUNWjavadb/docs/html/tools/ctoolsij25986.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsij12001.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsij32837.html
-file path=opt/SUNWjavadb/docs/html/tools/ctoolsij345$(COMPONENT_VERSION).html
+file path=opt/SUNWjavadb/docs/html/tools/ctoolsij34525.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsijcomref14191.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsijcomref15645.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsijcomref18998.html
@@ -1408,7 +1404,7 @@
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsijcomref32407.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsijcomref36744.html
 file \
-    path=opt/SUNWjavadb/docs/html/tools/ctoolsijtools$(COMPONENT_VERSION)085.html
+    path=opt/SUNWjavadb/docs/html/tools/ctoolsijtools25085.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsijtools11318.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsijtools16011.html
 file path=opt/SUNWjavadb/docs/html/tools/ctoolsijtools20118.html
@@ -1444,9 +1440,9 @@
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsdrvrnmeurl.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsexportarguements.html
 file \
-    path=opt/SUNWjavadb/docs/html/tools/rtoolsijcomref$(COMPONENT_VERSION)570.html
+    path=opt/SUNWjavadb/docs/html/tools/rtoolsijcomref25570.html
 file \
-    path=opt/SUNWjavadb/docs/html/tools/rtoolsijcomref$(COMPONENT_VERSION)753.html
+    path=opt/SUNWjavadb/docs/html/tools/rtoolsijcomref25753.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijcomref1003067.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijcomref1003444.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijcomref10316.html
@@ -1486,14 +1482,14 @@
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijcomrefshow.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijlocale.html
 file \
-    path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref$(COMPONENT_VERSION)589.html
+    path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref25589.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref10135.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref12236.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref28146.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref28788.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref29864.html
 file \
-    path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref3$(COMPONENT_VERSION)85.html
+    path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref32585.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref35032.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref38481.html
 file path=opt/SUNWjavadb/docs/html/tools/rtoolsijpropref41073.html
@@ -1536,7 +1532,7 @@
 file path=opt/SUNWjavadb/docs/html/tuning/ctundepth1003369.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctundepth1003672.html
 file \
-    path=opt/SUNWjavadb/docs/html/tuning/ctundepth105$(COMPONENT_VERSION).html
+    path=opt/SUNWjavadb/docs/html/tuning/ctundepth10525.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctundepth13055.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctundepth14326.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctundepth21935.html
@@ -1581,7 +1577,7 @@
 file path=opt/SUNWjavadb/docs/html/tuning/ctunoptimz41314.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunoptimz42065.html
 file \
-    path=opt/SUNWjavadb/docs/html/tuning/ctunoptimz424$(COMPONENT_VERSION).html
+    path=opt/SUNWjavadb/docs/html/tuning/ctunoptimz42425.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunoptimz56859.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunoptimz856914.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunoptimz857385.html
@@ -1589,7 +1585,7 @@
 file path=opt/SUNWjavadb/docs/html/tuning/ctunoptimz859974.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunoptimz860097.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunoptimzoverride.html
-file path=opt/SUNWjavadb/docs/html/tuning/ctunperf$(COMPONENT_VERSION)864.html
+file path=opt/SUNWjavadb/docs/html/tuning/ctunperf25864.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunperf1004126.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunperf1004182.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunperf10065.html
@@ -1622,14 +1618,14 @@
 file path=opt/SUNWjavadb/docs/html/tuning/ctunstats848901.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunstats848961.html
 file \
-    path=opt/SUNWjavadb/docs/html/tuning/ctunstats849$(COMPONENT_VERSION)1.html
+    path=opt/SUNWjavadb/docs/html/tuning/ctunstats849251.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunstats849000.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunstats849203.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctunstats849505.html
 file \
-    path=opt/SUNWjavadb/docs/html/tuning/ctuntransform$(COMPONENT_VERSION)857.html
+    path=opt/SUNWjavadb/docs/html/tuning/ctuntransform25857.html
 file \
-    path=opt/SUNWjavadb/docs/html/tuning/ctuntransform$(COMPONENT_VERSION)868.html
+    path=opt/SUNWjavadb/docs/html/tuning/ctuntransform25868.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctuntransform11313.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctuntransform13699.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctuntransform13966.html
@@ -1637,7 +1633,7 @@
 file path=opt/SUNWjavadb/docs/html/tuning/ctuntransform16033.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctuntransform16279.html
 file \
-    path=opt/SUNWjavadb/docs/html/tuning/ctuntransform2$(COMPONENT_VERSION)76.html
+    path=opt/SUNWjavadb/docs/html/tuning/ctuntransform22576.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctuntransform21780.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctuntransform35783.html
 file path=opt/SUNWjavadb/docs/html/tuning/ctuntransform36368.html
--- a/ub_javavm/jdk/runtime-java.p5m	Tue Jun 28 15:48:51 2011 +0100
+++ b/ub_javavm/jdk/runtime-java.p5m	Wed Jul 13 22:59:37 2011 +0200
@@ -646,6 +646,7 @@
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Manaus
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Martinique
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Matamoros
+file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Metlakatla
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Mazatlan
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Menominee
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Merida
@@ -685,6 +686,7 @@
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Santo_Domingo
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Sao_Paulo
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Scoresbysund
+file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/Sitka
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/St_Johns
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/St_Kitts
 file path=usr/jdk/instances/jdk1.6.0/jre/lib/zi/America/St_Lucia