Merge m-c to fx-team.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 31 Jan 2014 21:17:29 -0500
changeset 182433 9b125f2682e94bf2f9f5a1e1189ff0896cf5ee86
parent 182432 46a75174aeb9ae9c2f3aba9843774bb39bd03ee8 (current diff)
parent 182415 45e2143238b9e1cfc67896e5eb7055abbee5bb4a (diff)
child 182434 0646c830546569210fb0722a6d9d290402c7955d
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to fx-team.
intl/icu-patches/bug-853706
intl/icu-patches/bug-899722
intl/icu-patches/bug-899722-2
intl/icu-patches/bug-901348
intl/icu/APIChangeReport.html
intl/icu/as_is/bomlist.py
intl/icu/as_is/os390/unpax-icu.sh
intl/icu/as_is/os400/bldiculd.sh
intl/icu/as_is/os400/convertConfigure.sed
intl/icu/as_is/os400/cxxfilt.cpp
intl/icu/as_is/os400/fixup-icu.sh
intl/icu/as_is/os400/iculd.c
intl/icu/as_is/os400/unpax-icu.sh
intl/icu/icu4c.css
intl/icu/license.html
intl/icu/packaging/PACKAGES
intl/icu/packaging/README
intl/icu/packaging/rpm/icu.spec
intl/icu/readme.html
intl/icu/source/common/mutex.cpp
intl/icu/source/common/uinit.c
intl/icu/source/configure.in
intl/icu/source/data/coll/hi_.txt
intl/icu/source/data/coll/hi__DIRECT.txt
intl/icu/source/data/coll/ms_BN.txt
intl/icu/source/data/coll/ms_MY.txt
intl/icu/source/data/coll/ms_SG.txt
intl/icu/source/data/coll/zh_.txt
intl/icu/source/data/coll/zh_TW_STROKE.txt
intl/icu/source/data/coll/zh__PINYIN.txt
intl/icu/source/data/curr/bn_IN.txt
intl/icu/source/data/curr/shi_Latn_MA.txt
intl/icu/source/data/curr/uz_Cyrl_UZ.txt
intl/icu/source/data/locales/gv_GB.txt
intl/icu/source/data/zone/es_419.txt
intl/icu/source/data/zone/shi_Latn_MA.txt
intl/icu/source/data/zone/uz_Cyrl_UZ.txt
intl/icu/source/i18n/bms.cpp
intl/icu/source/i18n/bmsearch.cpp
intl/icu/source/i18n/colldata.cpp
intl/icu/source/i18n/unicode/bms.h
intl/icu/source/i18n/unicode/bmsearch.h
intl/icu/source/i18n/unicode/colldata.h
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-bug 960811 - clobber to rebuild preprocessed files when enabling synthetic APKs
+Bug 924839 - Touching ICU's configure scripts in this bug doesn't work without a clobber.  This is filed as bug 966038.
--- a/b2g/config/emulator-ics/config.json
+++ b/b2g/config/emulator-ics/config.json
@@ -8,19 +8,19 @@
     "upload_files": [
         "{workdir}/out/target/product/generic/*.tar.bz2",
         "{workdir}/out/target/product/generic/tests/*.zip",
         "{workdir}/out/emulator.tar.gz",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{workdir}/sources.xml"
     ],
     "upload_platform": "emulator-ics",
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     },
     "b2g_manifest": "emulator.xml",
     "b2g_manifest_branch": "master",
     "b2g_manifest_intree": true
 }
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -7,17 +7,17 @@
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="59605a7c026ff06cc1613af3938579b1dddc6cfe">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="aedd5c9636f305d4433491056a0ca984dfb859b1"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eda08beb3ba9a159843c70ffde0f9660ec351eb9"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="87aa8679560ce09f6445621d6f370d9de722cdba"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
--- a/b2g/config/emulator-jb/config.json
+++ b/b2g/config/emulator-jb/config.json
@@ -14,19 +14,19 @@
     ],
     "public_upload_files": [
         "{workdir}/out/target/product/generic/*.tar.bz2",
         "{workdir}/out/target/product/generic/tests/*.zip",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{workdir}/sources.xml"
     ],
     "upload_platform": "emulator-jb",
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     },
     "b2g_manifest": "emulator-jb.xml",
     "b2g_manifest_branch": "master",
     "b2g_manifest_intree": true
 }
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -6,17 +6,17 @@
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="317f25e0a4cb3e8e86e2b76c37a14081372f0307">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="aedd5c9636f305d4433491056a0ca984dfb859b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="905bfa3548eb75cf1792d0d8412b92113bbd4318"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="c3d7efc45414f1b44cd9c479bb2758c91c4707c0"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="5c45f43419d5582949284eee9cef0c43d866e03b"/>
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.2" path="prebuilts/clang/linux-x86/3.2" revision="3748b4168e7bd8d46457d4b6786003bc6a5223ce"/>
--- a/b2g/config/emulator/config.json
+++ b/b2g/config/emulator/config.json
@@ -13,19 +13,19 @@
         "{workdir}/sources.xml"
     ],
     "public_upload_files": [
         "{workdir}/out/target/product/generic/*.tar.bz2",
         "{workdir}/out/target/product/generic/tests/*.zip",
         "{objdir}/dist/b2g-*.crashreporter-symbols.zip",
         "{workdir}/sources.xml"
     ],
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     },
     "b2g_manifest": "emulator.xml",
     "b2g_manifest_branch": "master",
     "b2g_manifest_intree": true
 }
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -7,17 +7,17 @@
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="59605a7c026ff06cc1613af3938579b1dddc6cfe">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="aedd5c9636f305d4433491056a0ca984dfb859b1"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="eda08beb3ba9a159843c70ffde0f9660ec351eb9"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="87aa8679560ce09f6445621d6f370d9de722cdba"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "a7eca2fffd8345f66a3908a52ae00408bff82497", 
+    "revision": "56cedb487649ecd17173482c4ffe87d1bc298d86", 
     "repo_path": "/integration/gaia-central"
 }
--- a/b2g/config/hamachi/config.json
+++ b/b2g/config/hamachi/config.json
@@ -26,16 +26,16 @@
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1"
     },
     "b2g_manifest": "hamachi.xml",
     "b2g_manifest_branch": "master",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["backup-hamachi.tar.xz"],
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     }
 }
--- a/b2g/config/hamachi/limited-memory-config.json
+++ b/b2g/config/hamachi/limited-memory-config.json
@@ -21,16 +21,16 @@
     ],
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1"
     },
     "b2g_manifest": "hamachi.xml",
     "b2g_manifest_branch": "master",
     "additional_source_tarballs": ["backup-hamachi.tar.xz"],
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     }
 }
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -6,17 +6,17 @@
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="59605a7c026ff06cc1613af3938579b1dddc6cfe">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="aedd5c9636f305d4433491056a0ca984dfb859b1"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>
--- a/b2g/config/helix/config.json
+++ b/b2g/config/helix/config.json
@@ -21,16 +21,16 @@
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1",
         "ANDROIDFS_DIR": "{workdir}/helix-ics"
     },
     "b2g_manifest": "helix.xml",
     "b2g_manifest_branch": "master",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["helix-ics.tar.xz"],
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     }
 }
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -5,17 +5,17 @@
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="59605a7c026ff06cc1613af3938579b1dddc6cfe">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="aedd5c9636f305d4433491056a0ca984dfb859b1"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>
--- a/b2g/config/inari/config.json
+++ b/b2g/config/inari/config.json
@@ -26,16 +26,16 @@
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1"
     },
     "b2g_manifest": "inari.xml",
     "b2g_manifest_branch": "master",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["backup-inari.tar.xz"],
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     }
 }
--- a/b2g/config/inari/sources.xml
+++ b/b2g/config/inari/sources.xml
@@ -7,17 +7,17 @@
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="59605a7c026ff06cc1613af3938579b1dddc6cfe">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="aedd5c9636f305d4433491056a0ca984dfb859b1"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="cd5dfce80bc3f0139a56b58aca633202ccaee7f8"/>
--- a/b2g/config/leo/config.json
+++ b/b2g/config/leo/config.json
@@ -21,16 +21,16 @@
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1"
     },
     "b2g_manifest": "leo.xml",
     "b2g_manifest_branch": "master",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["backup-leo.tar.xz"],
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     }
 }
--- a/b2g/config/leo/sources.xml
+++ b/b2g/config/leo/sources.xml
@@ -6,17 +6,17 @@
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="59605a7c026ff06cc1613af3938579b1dddc6cfe">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="aedd5c9636f305d4433491056a0ca984dfb859b1"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
--- a/b2g/config/mako/config.json
+++ b/b2g/config/mako/config.json
@@ -26,16 +26,16 @@
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1"
     },
     "b2g_manifest": "nexus-4.xml",
     "b2g_manifest_branch": "master",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": [],
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     }
 }
--- a/b2g/config/mako/sources.xml
+++ b/b2g/config/mako/sources.xml
@@ -6,17 +6,17 @@
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="317f25e0a4cb3e8e86e2b76c37a14081372f0307">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="aedd5c9636f305d4433491056a0ca984dfb859b1"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="905bfa3548eb75cf1792d0d8412b92113bbd4318"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="c3d7efc45414f1b44cd9c479bb2758c91c4707c0"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="5c45f43419d5582949284eee9cef0c43d866e03b"/>
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.2" path="prebuilts/clang/linux-x86/3.2" revision="3748b4168e7bd8d46457d4b6786003bc6a5223ce"/>
@@ -113,17 +113,17 @@
   <project name="platform_system_core" path="system/core" remote="b2g" revision="542d1f59dc331b472307e5bd043101d14d5a3a3e"/>
   <project name="platform/system/extras" path="system/extras" revision="18c1180e848e7ab8691940481f5c1c8d22c37b3e"/>
   <project name="platform/system/media" path="system/media" revision="d90b836f66bf1d9627886c96f3a2d9c3007fbb80"/>
   <project name="platform/system/netd" path="system/netd" revision="56112dd7b811301b718d0643a82fd5cac9522073"/>
   <project name="platform/system/security" path="system/security" revision="f48ff68fedbcdc12b570b7699745abb6e7574907"/>
   <project name="platform/system/vold" path="system/vold" revision="8de05d4a52b5a91e7336e6baa4592f945a6ddbea"/>
   <default remote="caf" revision="refs/tags/android-4.3_r2.1" sync-j="4"/>
   <!-- Nexus 4 specific things -->
-  <project name="device-mako" path="device/lge/mako" remote="b2g" revision="55a5f7def3310ba245102a97270daf1c052c058d"/>
+  <project name="device-mako" path="device/lge/mako" remote="b2g" revision="78d17f0c117f0c66dd55ee8d5c5dde8ccc93ecba"/>
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="3a9a17613cc685aa232432566ad6cc607eab4ec1"/>
   <project name="device/lge/mako-kernel" path="device/lge/mako-kernel" revision="d1729e53d71d711c8fde25eab8728ff2b9b4df0e"/>
   <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="f995ccdb7c023b7edd8064c9d06fbea8f7108c45"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="7d33aaf740bbf6c7c6e9c34a92b371eda311b66b"/>
   <project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="0e56e450367cd802241b27164a2979188242b95f"/>
   <project name="platform/hardware/broadcom/wlan" path="hardware/broadcom/wlan" revision="0e1929fa3aa38bf9d40e9e953d619fab8164c82e"/>
   <project name="platform/hardware/qcom/audio" path="hardware/qcom/audio" revision="b0a528d839cfd9d170d092fe3743b5252b4243a6"/>
   <project name="platform/hardware/qcom/bt" path="hardware/qcom/bt" revision="380945eaa249a2dbdde0daa4c8adb8ca325edba6"/>
--- a/b2g/config/unagi/config.json
+++ b/b2g/config/unagi/config.json
@@ -20,16 +20,16 @@
         "{workdir}/load-config.sh",
         "{workdir}/.config",
         "{workdir}/sources.xml"
     ],
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1"
     },
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     }
 }
--- a/b2g/config/wasabi/config.json
+++ b/b2g/config/wasabi/config.json
@@ -21,16 +21,16 @@
     "env": {
         "VARIANT": "user",
         "MOZILLA_OFFICIAL": "1"
     },
     "b2g_manifest": "wasabi.xml",
     "b2g_manifest_branch": "master",
     "b2g_manifest_intree": true,
     "additional_source_tarballs": ["backup-wasabi.tar.gz"],
-    "gecko_l10n_root": "http://hg.mozilla.org/l10n-central",
+    "gecko_l10n_root": "https://hg.mozilla.org/l10n-central",
     "gaia": {
         "l10n": {
             "vcs": "hgtool",
-            "root": "http://hg.mozilla.org/gaia-l10n"
+            "root": "https://hg.mozilla.org/gaia-l10n"
         }
     }
 }
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -6,17 +6,17 @@
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="59605a7c026ff06cc1613af3938579b1dddc6cfe">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="aedd5c9636f305d4433491056a0ca984dfb859b1"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="67f11d9b60750270f0bea834832e8108e95204e8"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="e9b6626eddbc85873eaa2a9174a9bd5101e5c05f"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="84f2f2fce22605e17d511ff1767e54770067b5b5"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="e33ea242b4328fb0d1824c951f379332b5021512"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="0ff2eb11982b9d3c7a3333900cf0d3a5c0f77e32"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -52,13 +52,13 @@ MOZ_TIME_MANAGER=1
 
 MOZ_B2G_CERTDATA=1
 MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
 MOZ_B2G=1
 
 if test "$OS_TARGET" = "Android"; then
-MOZ_NUWA_PROCESS=
+MOZ_NUWA_PROCESS=1
 fi
 MOZ_FOLD_LIBS=1
 
 MOZ_JSDOWNLOADS=1
--- a/browser/components/sessionstore/src/SessionHistory.jsm
+++ b/browser/components/sessionstore/src/SessionHistory.jsm
@@ -45,16 +45,19 @@ let SessionHistoryInternal = {
    * Returns whether the given docShell's session history is empty.
    *
    * @param docShell
    *        The docShell that owns the session history.
    */
   isEmpty: function (docShell) {
     let webNavigation = docShell.QueryInterface(Ci.nsIWebNavigation);
     let history = webNavigation.sessionHistory;
+    if (!webNavigation.currentURI) {
+      return true;
+    }
     let uri = webNavigation.currentURI.spec;
     return uri == "about:blank" && history.count == 0;
   },
 
   /**
    * Collects session history data for a given docShell.
    *
    * @param docShell
--- a/browser/components/sessionstore/src/SessionStore.jsm
+++ b/browser/components/sessionstore/src/SessionStore.jsm
@@ -575,30 +575,34 @@ let SessionStoreInternal = {
 
   /**
    * This method handles incoming messages sent by the session store content
    * script and thus enables communication with OOP tabs.
    */
   receiveMessage: function ssi_receiveMessage(aMessage) {
     var browser = aMessage.target;
     var win = browser.ownerDocument.defaultView;
+    let tab = this._getTabForBrowser(browser);
+    if (!tab) {
+      // Ignore messages from <browser> elements that are not tabs.
+      return;
+    }
 
     switch (aMessage.name) {
       case "SessionStore:setupSyncHandler":
         TabState.setSyncHandler(browser, aMessage.objects.handler);
         break;
       case "SessionStore:update":
         this.recordTelemetry(aMessage.data.telemetry);
         TabState.update(browser, aMessage.data);
         this.saveStateDelayed(win);
         break;
       case "SessionStore:restoreHistoryComplete":
         if (this.isCurrentEpoch(browser, aMessage.data.epoch)) {
           // Notify the tabbrowser that the tab chrome has been restored.
-          let tab = this._getTabForBrowser(browser);
           let tabData = browser.__SS_data;
 
           // wall-paper fix for bug 439675: make sure that the URL to be loaded
           // is always visible in the address bar
           let activePageData = tabData.entries[tabData.index - 1] || null;
           let uri = activePageData ? activePageData.url || null : null;
           browser.userTypedValue = uri;
 
@@ -639,17 +643,16 @@ let SessionStoreInternal = {
       case "SessionStore:restoreTabContentComplete":
         if (this.isCurrentEpoch(browser, aMessage.data.epoch)) {
           // This callback is used exclusively by tests that want to
           // monitor the progress of network loads.
           if (gDebuggingEnabled) {
             Services.obs.notifyObservers(browser, NOTIFY_TAB_RESTORED, null);
           }
 
-          let tab = this._getTabForBrowser(browser);
           if (tab) {
             SessionStoreInternal._resetLocalTabRestoringState(tab);
             SessionStoreInternal.restoreNextTab();
           }
         }
         break;
       case "SessionStore:restoreDocumentComplete":
         if (this.isCurrentEpoch(browser, aMessage.data.epoch)) {
@@ -661,17 +664,16 @@ let SessionStoreInternal = {
           delete browser.__SS_restore_tab;
           delete browser.__SS_data;
 
           this._sendTabRestoredNotification(tab);
         }
         break;
       case "SessionStore:reloadPendingTab":
         if (this.isCurrentEpoch(browser, aMessage.data.epoch)) {
-          let tab = this._getTabForBrowser(browser);
           if (tab && browser.__SS_restoreState == TAB_STATE_NEEDS_RESTORE) {
             this.restoreTabContent(tab);
           }
         }
         break;
       default:
         debug("received unknown message '" + aMessage.name + "'");
         break;
@@ -755,16 +757,22 @@ let SessionStoreInternal = {
     // ignore windows opened while shutting down
     if (this._loadState == STATE_QUITTING)
       return;
 
     // Assign the window a unique identifier we can use to reference
     // internal data about the window.
     aWindow.__SSi = this._generateWindowID();
 
+    let mm = aWindow.messageManager;
+    MESSAGES.forEach(msg => mm.addMessageListener(msg, this));
+
+    // Load the frame script after registering listeners.
+    mm.loadFrameScript("chrome://browser/content/content-sessionStore.js", true);
+
     // and create its data object
     this._windows[aWindow.__SSi] = { tabs: [], selected: 0, _closedTabs: [], busy: false };
 
     let isPrivateWindow = false;
     if (PrivateBrowsingUtils.isWindowPrivate(aWindow))
       this._windows[aWindow.__SSi].isPrivate = isPrivateWindow = true;
     if (!this._isWindowLoaded(aWindow))
       this._windows[aWindow.__SSi]._restoring = true;
@@ -1077,16 +1085,19 @@ let SessionStoreInternal = {
 
     for (let i = 0; i < tabbrowser.tabs.length; i++) {
       this.onTabRemove(aWindow, tabbrowser.tabs[i], true);
     }
 
     // Cache the window state until it is completely gone.
     DyingWindowCache.set(aWindow, winData);
 
+    let mm = aWindow.messageManager;
+    MESSAGES.forEach(msg => mm.removeMessageListener(msg, this));
+
     delete aWindow.__SSi;
   },
 
   /**
    * On quit application requested
    */
   onQuitApplicationRequested: function ssi_onQuitApplicationRequested() {
     // get a current snapshot of all windows
@@ -1275,41 +1286,32 @@ let SessionStoreInternal = {
    * @param aWindow
    *        Window reference
    * @param aTab
    *        Tab reference
    * @param aNoNotification
    *        bool Do not save state if we're updating an existing tab
    */
   onTabAdd: function ssi_onTabAdd(aWindow, aTab, aNoNotification) {
-    let mm = aTab.linkedBrowser.messageManager;
-    MESSAGES.forEach(msg => mm.addMessageListener(msg, this));
-
-    // Load the frame script after registering listeners.
-    mm.loadFrameScript("chrome://browser/content/content-sessionStore.js", false);
-
     if (!aNoNotification) {
       this.saveStateDelayed(aWindow);
     }
   },
 
   /**
    * remove listeners for a tab
    * @param aWindow
    *        Window reference
    * @param aTab
    *        Tab reference
    * @param aNoNotification
    *        bool Do not save state if we're updating an existing tab
    */
   onTabRemove: function ssi_onTabRemove(aWindow, aTab, aNoNotification) {
     let browser = aTab.linkedBrowser;
-    let mm = browser.messageManager;
-    MESSAGES.forEach(msg => mm.removeMessageListener(msg, this));
-
     delete browser.__SS_data;
 
     // If this tab was in the middle of restoring or still needs to be restored,
     // we need to reset that state. If the tab was restoring, we will attempt to
     // restore the next tab.
     let previousState = browser.__SS_restoreState;
     if (previousState) {
       this._resetTabRestoringState(aTab);
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -58,16 +58,17 @@ robocop-deps := $(notdir $(robocop_FILES
 
 MOCHITEST_ROBOCOP_FILES := \
   $(wildcard $(TESTPATH)/*.html) \
   $(wildcard $(TESTPATH)/*.jpg) \
   $(wildcard $(TESTPATH)/*.sjs) \
   $(wildcard $(TESTPATH)/test*.js) \
   $(wildcard $(TESTPATH)/robocop*.js) \
   $(wildcard $(TESTPATH)/*.xml) \
+  $(wildcard $(TESTPATH)/*.swf) \
   $(NULL)
 
 GARBAGE += \
   AndroidManifest.xml \
   $(robocop-deps) \
   $(testconstants-dep) \
   $(NULL)
 
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -1288,29 +1288,21 @@ nsFrameLoader::SwapWithOtherLoader(nsFra
   }
   if (aOther->mChildMessageManager) {
     nsInProcessTabChildGlobal* otherTabChild =
       static_cast<nsInProcessTabChildGlobal*>(aOther->mChildMessageManager.get());
     otherTabChild->SetOwner(ourContent);
     otherTabChild->SetChromeMessageManager(ourMessageManager);
   }
   // Swap and setup things in parent message managers.
-  nsFrameMessageManager* ourParentManager = mMessageManager ?
-    mMessageManager->GetParentManager() : nullptr;
-  nsFrameMessageManager* otherParentManager = aOther->mMessageManager ?
-    aOther->mMessageManager->GetParentManager() : nullptr;
   if (mMessageManager) {
-    mMessageManager->RemoveFromParent();
-    mMessageManager->SetParentManager(otherParentManager);
-    mMessageManager->SetCallback(aOther, false);
+    mMessageManager->SetCallback(aOther);
   }
   if (aOther->mMessageManager) {
-    aOther->mMessageManager->RemoveFromParent();
-    aOther->mMessageManager->SetParentManager(ourParentManager);
-    aOther->mMessageManager->SetCallback(this, false);
+    aOther->mMessageManager->SetCallback(this);
   }
   mMessageManager.swap(aOther->mMessageManager);
 
   aFirstToSwap.swap(aSecondToSwap);
 
   // Drop any cached content viewers in the two session histories.
   nsCOMPtr<nsISHistoryInternal> ourInternalHistory =
     do_QueryInterface(ourHistory);
@@ -2413,18 +2405,18 @@ nsFrameLoader::EnsureMessageManager()
     return rv;
   }
 
   if (!mIsTopLevelContent && !OwnerIsBrowserOrAppFrame() && !mRemoteFrame) {
     return NS_OK;
   }
 
   if (mMessageManager) {
-    if (ShouldUseRemoteProcess()) {
-      mMessageManager->SetCallback(mRemoteBrowserShown ? this : nullptr);
+    if (ShouldUseRemoteProcess() && mRemoteBrowserShown) {
+      mMessageManager->InitWithCallback(this);
     }
     return NS_OK;
   }
 
   nsIScriptContext* sctx = mOwnerContent->GetContextForEventHandlers(&rv);
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_STATE(sctx);
   AutoPushJSContext cx(sctx->GetNativeContext());
@@ -2444,17 +2436,17 @@ nsFrameLoader::EnsureMessageManager()
   } else {
     mMessageManager = new nsFrameMessageManager(nullptr,
                                                 static_cast<nsFrameMessageManager*>(parentManager.get()),
                                                 MM_CHROME);
 
     mChildMessageManager =
       new nsInProcessTabChildGlobal(mDocShell, mOwnerContent, mMessageManager);
     // Force pending frame scripts to be loaded.
-    mMessageManager->SetCallback(this);
+    mMessageManager->InitWithCallback(this);
   }
   return NS_OK;
 }
 
 EventTarget*
 nsFrameLoader::GetTabChildGlobalAsEventTarget()
 {
   return static_cast<nsInProcessTabChildGlobal*>(mChildMessageManager.get());
--- a/content/base/src/nsFrameMessageManager.cpp
+++ b/content/base/src/nsFrameMessageManager.cpp
@@ -1061,59 +1061,68 @@ nsFrameMessageManager::ReceiveMessage(ns
   nsRefPtr<nsFrameMessageManager> kungfuDeathGrip = mParentManager;
   return mParentManager ? mParentManager->ReceiveMessage(aTarget, aMessage,
                                                          aIsSync, aCloneData,
                                                          aCpows, aPrincipal,
                                                          aJSONRetVal) : NS_OK;
 }
 
 void
-nsFrameMessageManager::AddChildManager(nsFrameMessageManager* aManager,
-                                       bool aLoadScripts)
+nsFrameMessageManager::AddChildManager(nsFrameMessageManager* aManager)
 {
   mChildManagers.AppendObject(aManager);
-  if (aLoadScripts) {
-    nsRefPtr<nsFrameMessageManager> kungfuDeathGrip = this;
-    nsRefPtr<nsFrameMessageManager> kungfuDeathGrip2 = aManager;
-    // We have parent manager if we're a window message manager.
-    // In that case we want to load the pending scripts from global
-    // message manager.
-    if (mParentManager) {
-      nsRefPtr<nsFrameMessageManager> globalMM = mParentManager;
-      for (uint32_t i = 0; i < globalMM->mPendingScripts.Length(); ++i) {
-        aManager->LoadFrameScript(globalMM->mPendingScripts[i], false,
-                                  globalMM->mPendingScriptsGlobalStates[i]);
-      }
+
+  nsRefPtr<nsFrameMessageManager> kungfuDeathGrip = this;
+  nsRefPtr<nsFrameMessageManager> kungfuDeathGrip2 = aManager;
+  // We have parent manager if we're a window message manager.
+  // In that case we want to load the pending scripts from global
+  // message manager.
+  if (mParentManager) {
+    nsRefPtr<nsFrameMessageManager> globalMM = mParentManager;
+    for (uint32_t i = 0; i < globalMM->mPendingScripts.Length(); ++i) {
+      aManager->LoadFrameScript(globalMM->mPendingScripts[i], false,
+                                globalMM->mPendingScriptsGlobalStates[i]);
     }
-    for (uint32_t i = 0; i < mPendingScripts.Length(); ++i) {
-      aManager->LoadFrameScript(mPendingScripts[i], false,
-                                mPendingScriptsGlobalStates[i]);
+  }
+  for (uint32_t i = 0; i < mPendingScripts.Length(); ++i) {
+    aManager->LoadFrameScript(mPendingScripts[i], false,
+                              mPendingScriptsGlobalStates[i]);
+  }
+}
+
+void
+nsFrameMessageManager::SetCallback(MessageManagerCallback* aCallback)
+{
+  MOZ_ASSERT(!mIsBroadcaster || !mCallback,
+             "Broadcasters cannot have callbacks!");
+  if (aCallback && mCallback != aCallback) {
+    mCallback = aCallback;
+    if (mOwnsCallback) {
+      mOwnedCallback = aCallback;
     }
   }
 }
 
 void
-nsFrameMessageManager::SetCallback(MessageManagerCallback* aCallback, bool aLoadScripts)
+nsFrameMessageManager::InitWithCallback(MessageManagerCallback* aCallback)
 {
-  NS_ASSERTION(!mIsBroadcaster || !mCallback,
-               "Broadcasters cannot have callbacks!");
-  if (aCallback && mCallback != aCallback) {
-    mCallback = aCallback;
-    if (mOwnsCallback) {
-      mOwnedCallback = aCallback;
-    }
-    // First load global scripts by adding this to parent manager.
-    if (mParentManager) {
-      mParentManager->AddChildManager(this, aLoadScripts);
-    }
-    if (aLoadScripts) {
-      for (uint32_t i = 0; i < mPendingScripts.Length(); ++i) {
-        LoadFrameScript(mPendingScripts[i], false, mPendingScriptsGlobalStates[i]);
-      }
-    }
+  if (mCallback) {
+    // Initialization should only happen once.
+    return;
+  }
+
+  SetCallback(aCallback);
+
+  // First load global scripts by adding this to parent manager.
+  if (mParentManager) {
+    mParentManager->AddChildManager(this);
+  }
+
+  for (uint32_t i = 0; i < mPendingScripts.Length(); ++i) {
+    LoadFrameScript(mPendingScripts[i], false, mPendingScriptsGlobalStates[i]);
   }
 }
 
 void
 nsFrameMessageManager::RemoveFromParent()
 {
   if (mParentManager) {
     mParentManager->RemoveChildManager(this);
--- a/content/base/src/nsFrameMessageManager.h
+++ b/content/base/src/nsFrameMessageManager.h
@@ -219,26 +219,25 @@ public:
   static nsFrameMessageManager*
   NewProcessMessageManager(mozilla::dom::ContentParent* aProcess);
 
   nsresult ReceiveMessage(nsISupports* aTarget, const nsAString& aMessage,
                           bool aIsSync, const StructuredCloneData* aCloneData,
                           CpowHolder* aCpows, nsIPrincipal* aPrincipal,
                           InfallibleTArray<nsString>* aJSONRetVal);
 
-  void AddChildManager(nsFrameMessageManager* aManager,
-                       bool aLoadScripts = true);
+  void AddChildManager(nsFrameMessageManager* aManager);
   void RemoveChildManager(nsFrameMessageManager* aManager)
   {
     mChildManagers.RemoveObject(aManager);
   }
   void Disconnect(bool aRemoveFromParent = true);
 
-  void SetCallback(mozilla::dom::ipc::MessageManagerCallback* aCallback,
-                   bool aLoadScripts = true);
+  void InitWithCallback(mozilla::dom::ipc::MessageManagerCallback* aCallback);
+  void SetCallback(mozilla::dom::ipc::MessageManagerCallback* aCallback);
   mozilla::dom::ipc::MessageManagerCallback* GetCallback()
   {
     return mCallback;
   }
 
   nsresult DispatchAsyncMessage(const nsAString& aMessageName,
                                 const JS::Value& aJSON,
                                 const JS::Value& aObjects,
--- a/content/html/content/src/HTMLMediaElement.cpp
+++ b/content/html/content/src/HTMLMediaElement.cpp
@@ -3289,16 +3289,23 @@ nsresult HTMLMediaElement::DispatchEvent
                                               false);
 }
 
 nsresult HTMLMediaElement::DispatchAsyncEvent(const nsAString& aName)
 {
   LOG_EVENT(PR_LOG_DEBUG, ("%p Queuing event %s", this,
             NS_ConvertUTF16toUTF8(aName).get()));
 
+  // Save events that occur while in the bfcache. These will be dispatched
+  // if the page comes out of the bfcache.
+  if (mEventDeliveryPaused) {
+    mPendingEvents.AppendElement(aName);
+    return NS_OK;
+  }
+
   nsCOMPtr<nsIRunnable> event = new nsAsyncEventRunner(aName, this);
   NS_DispatchToMainThread(event, NS_DISPATCH_NORMAL);
   return NS_OK;
 }
 
 nsresult HTMLMediaElement::DispatchPendingMediaEvents()
 {
   NS_ASSERTION(!mEventDeliveryPaused,
--- a/dom/apps/src/Webapps.jsm
+++ b/dom/apps/src/Webapps.jsm
@@ -2582,39 +2582,33 @@ onInstallSuccessAck: function onInstallS
   /**
     * Asynchronously reads a list of manifests
     */
 
   _manifestCache: {},
 
   _readManifests: function(aData) {
     return Task.spawn(function*() {
-      if (!aData.length) {
-        return aData;
-      }
-
       for (let elem of aData) {
         let id = elem.id;
 
         if (!this._manifestCache[id]) {
           // the manifest file used to be named manifest.json, so fallback on this.
           let baseDir = this.webapps[id].basePath == this.getCoreAppsBasePath()
                           ? "coreAppsDir" : DIRECTORY_NAME;
 
-          let file = FileUtils.getFile(baseDir, ["webapps", id, "manifest.webapp"], true);
-
-          if (!file.exists()) {
-            file = FileUtils.getFile(baseDir, ["webapps", id, "update.webapp"], true);
+          let dir = FileUtils.getDir(baseDir, ["webapps", id], false, true);
+
+          let fileNames = ["manifest.webapp", "update.webapp", "manifest.json"];
+          for (let fileName of fileNames) {
+            this._manifestCache[id] = yield this._loadJSONAsync(OS.Path.join(dir.path, fileName));
+            if (this._manifestCache[id]) {
+              break;
+            }
           }
-
-          if (!file.exists()) {
-            file = FileUtils.getFile(baseDir, ["webapps", id, "manifest.json"], true);
-          }
-
-          this._manifestCache[id] = yield this._loadJSONAsync(file.path);
         }
 
         elem.manifest = this._manifestCache[id];
       }
 
       return aData;
     }.bind(this)).then(null, Cu.reportError);
   },
--- a/dom/base/nsScriptNameSpaceManager.h
+++ b/dom/base/nsScriptNameSpaceManager.h
@@ -145,20 +145,38 @@ public:
                              bool aHasClassInterface,
                              const nsCID *aConstructorCID);
 
   nsGlobalNameStruct* GetConstructorProto(const nsGlobalNameStruct* aStruct);
 
   void RegisterDefineDOMInterface(const nsAFlatString& aName,
     mozilla::dom::DefineInterface aDefineDOMInterface,
     mozilla::dom::ConstructorEnabled* aConstructorEnabled);
+  template<size_t N>
+  void RegisterDefineDOMInterface(const char16_t (&aKey)[N],
+    mozilla::dom::DefineInterface aDefineDOMInterface,
+    mozilla::dom::ConstructorEnabled* aConstructorEnabled)
+  {
+    nsLiteralString key(aKey);
+    return RegisterDefineDOMInterface(key, aDefineDOMInterface,
+                                      aConstructorEnabled);
+  }
 
   void RegisterNavigatorDOMConstructor(const nsAFlatString& aName,
     mozilla::dom::ConstructNavigatorProperty aNavConstructor,
     mozilla::dom::ConstructorEnabled* aConstructorEnabled);
+  template<size_t N>
+  void RegisterNavigatorDOMConstructor(const char16_t (&aKey)[N],
+    mozilla::dom::ConstructNavigatorProperty aNavConstructor,
+    mozilla::dom::ConstructorEnabled* aConstructorEnabled)
+  {
+    nsLiteralString key(aKey);
+    return RegisterNavigatorDOMConstructor(key, aNavConstructor,
+                                           aConstructorEnabled);
+  }
 
   typedef PLDHashOperator
   (* NameEnumerator)(const nsAString& aGlobalName, void* aClosure);
 
   void EnumerateGlobalNames(NameEnumerator aEnumerator,
                             void* aClosure);
   void EnumerateNavigatorNames(NameEnumerator aEnumerator,
                                void* aClosure);
--- a/dom/bindings/Codegen.py
+++ b/dom/bindings/Codegen.py
@@ -9524,21 +9524,21 @@ class CGRegisterProtos(CGAbstractMethod)
     def __init__(self, config):
         CGAbstractMethod.__init__(self, None, 'Register', 'void',
                                   [Argument('nsScriptNameSpaceManager*', 'aNameSpaceManager')])
         self.config = config
 
     def _defineMacro(self):
        return """
 #define REGISTER_PROTO(_dom_class, _ctor_check) \\
-  aNameSpaceManager->RegisterDefineDOMInterface(NS_LITERAL_STRING(#_dom_class), _dom_class##Binding::DefineDOMInterface, _ctor_check);
+  aNameSpaceManager->RegisterDefineDOMInterface(MOZ_UTF16(#_dom_class), _dom_class##Binding::DefineDOMInterface, _ctor_check);
 #define REGISTER_CONSTRUCTOR(_dom_constructor, _dom_class, _ctor_check) \\
-  aNameSpaceManager->RegisterDefineDOMInterface(NS_LITERAL_STRING(#_dom_constructor), _dom_class##Binding::DefineDOMInterface, _ctor_check);
+  aNameSpaceManager->RegisterDefineDOMInterface(MOZ_UTF16(#_dom_constructor), _dom_class##Binding::DefineDOMInterface, _ctor_check);
 #define REGISTER_NAVIGATOR_CONSTRUCTOR(_prop, _dom_class, _ctor_check) \\
-  aNameSpaceManager->RegisterNavigatorDOMConstructor(NS_LITERAL_STRING(_prop), _dom_class##Binding::ConstructNavigatorObject, _ctor_check);
+  aNameSpaceManager->RegisterNavigatorDOMConstructor(MOZ_UTF16(_prop), _dom_class##Binding::ConstructNavigatorObject, _ctor_check);
 
 """
     def _undefineMacro(self):
         return """
 #undef REGISTER_CONSTRUCTOR
 #undef REGISTER_PROTO
 #undef REGISTER_NAVIGATOR_CONSTRUCTOR"""
     def _registerProtos(self):
--- a/dom/indexedDB/IDBTransaction.cpp
+++ b/dom/indexedDB/IDBTransaction.cpp
@@ -293,16 +293,20 @@ IDBTransaction::StartSavepoint()
   ));
   NS_ENSURE_TRUE(stmt, false);
 
   mozStorageStatementScoper scoper(stmt);
 
   nsresult rv = stmt->Execute();
   NS_ENSURE_SUCCESS(rv, false);
 
+  if (IsWriteAllowed()) {
+    mUpdateFileRefcountFunction->StartSavepoint();
+  }
+
   ++mSavepointCount;
 
   return true;
 }
 
 nsresult
 IDBTransaction::ReleaseSavepoint()
 {
@@ -316,16 +320,20 @@ IDBTransaction::ReleaseSavepoint()
   ));
   NS_ENSURE_TRUE(stmt, NS_OK);
 
   mozStorageStatementScoper scoper(stmt);
 
   nsresult rv = stmt->Execute();
   NS_ENSURE_SUCCESS(rv, NS_OK);
 
+  if (IsWriteAllowed()) {
+    mUpdateFileRefcountFunction->ReleaseSavepoint();
+  }
+
   --mSavepointCount;
 
   return NS_OK;
 }
 
 void
 IDBTransaction::RollbackSavepoint()
 {
@@ -339,16 +347,20 @@ IDBTransaction::RollbackSavepoint()
     "ROLLBACK TO SAVEPOINT " SAVEPOINT_NAME
   ));
   NS_ENSURE_TRUE_VOID(stmt);
 
   mozStorageStatementScoper scoper(stmt);
 
   nsresult rv = stmt->Execute();
   NS_ENSURE_SUCCESS_VOID(rv);
+
+  if (IsWriteAllowed()) {
+    mUpdateFileRefcountFunction->RollbackSavepoint();
+  }
 }
 
 nsresult
 IDBTransaction::GetOrCreateConnection(mozIStorageConnection** aResult)
 {
   NS_ASSERTION(!NS_IsMainThread(), "Wrong thread!");
   NS_ASSERTION(IndexedDatabaseManager::IsMainProcess(), "Wrong process!");
 
@@ -1073,22 +1085,32 @@ UpdateRefcountFunction::ProcessValue(moz
       nsRefPtr<FileInfo> fileInfo = mFileManager->GetFileInfo(id);
       NS_ASSERTION(fileInfo, "Shouldn't be null!");
 
       nsAutoPtr<FileInfoEntry> newEntry(new FileInfoEntry(fileInfo));
       mFileInfoEntries.Put(id, newEntry);
       entry = newEntry.forget();
     }
 
+    if (mInSavepoint) {
+      mSavepointEntriesIndex.Put(id, entry);
+    }
+
     switch (aUpdateType) {
       case eIncrement:
         entry->mDelta++;
+        if (mInSavepoint) {
+          entry->mSavepointDelta++;
+        }
         break;
       case eDecrement:
         entry->mDelta--;
+        if (mInSavepoint) {
+          entry->mSavepointDelta--;
+        }
         break;
       default:
         NS_NOTREACHED("Unknown update type!");
     }
   }
 
   return NS_OK;
 }
@@ -1160,16 +1182,26 @@ UpdateRefcountFunction::FileInfoUpdateCa
 {
   if (aValue->mDelta) {
     aValue->mFileInfo->UpdateDBRefs(aValue->mDelta);
   }
 
   return PL_DHASH_NEXT;
 }
 
+PLDHashOperator
+UpdateRefcountFunction::RollbackSavepointCallback(const uint64_t& aKey,
+                                                  FileInfoEntry* aValue,
+                                                  void* aUserArg)
+{
+  aValue->mDelta -= aValue->mSavepointDelta;
+
+  return PL_DHASH_NEXT;
+}
+
 bool
 UpdateRefcountFunction::DatabaseUpdateFunction::Update(int64_t aId,
                                                        int32_t aDelta)
 {
   nsresult rv = UpdateInternal(aId, aDelta);
   if (NS_FAILED(rv)) {
     mErrorCode = rv;
     return false;
--- a/dom/indexedDB/IDBTransaction.h
+++ b/dom/indexedDB/IDBTransaction.h
@@ -362,44 +362,73 @@ private:
 
 class UpdateRefcountFunction MOZ_FINAL : public mozIStorageFunction
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_MOZISTORAGEFUNCTION
 
   UpdateRefcountFunction(FileManager* aFileManager)
-  : mFileManager(aFileManager)
+  : mFileManager(aFileManager), mInSavepoint(false)
   { }
 
   ~UpdateRefcountFunction()
   { }
 
+  void StartSavepoint()
+  {
+    MOZ_ASSERT(!mInSavepoint);
+    MOZ_ASSERT(!mSavepointEntriesIndex.Count());
+
+    mInSavepoint = true;
+  }
+
+  void ReleaseSavepoint()
+  {
+    MOZ_ASSERT(mInSavepoint);
+
+    mSavepointEntriesIndex.Clear();
+
+    mInSavepoint = false;
+  }
+
+  void RollbackSavepoint()
+  {
+    MOZ_ASSERT(mInSavepoint);
+
+    mInSavepoint = false;
+
+    mSavepointEntriesIndex.EnumerateRead(RollbackSavepointCallback, nullptr);
+
+    mSavepointEntriesIndex.Clear();
+  }
+
   void ClearFileInfoEntries()
   {
     mFileInfoEntries.Clear();
   }
 
   nsresult WillCommit(mozIStorageConnection* aConnection);
   void DidCommit();
   void DidAbort();
 
 private:
   class FileInfoEntry
   {
   public:
     FileInfoEntry(FileInfo* aFileInfo)
-    : mFileInfo(aFileInfo), mDelta(0)
+    : mFileInfo(aFileInfo), mDelta(0), mSavepointDelta(0)
     { }
 
     ~FileInfoEntry()
     { }
 
     nsRefPtr<FileInfo> mFileInfo;
     int32_t mDelta;
+    int32_t mSavepointDelta;
   };
 
   enum UpdateType {
     eIncrement,
     eDecrement
   };
 
   class DatabaseUpdateFunction
@@ -442,19 +471,27 @@ private:
                          FileInfoEntry* aValue,
                          void* aUserArg);
 
   static PLDHashOperator
   FileInfoUpdateCallback(const uint64_t& aKey,
                          FileInfoEntry* aValue,
                          void* aUserArg);
 
+  static PLDHashOperator
+  RollbackSavepointCallback(const uint64_t& aKey,
+                            FileInfoEntry* aValue,
+                            void* aUserArg);
+
   FileManager* mFileManager;
   nsClassHashtable<nsUint64HashKey, FileInfoEntry> mFileInfoEntries;
+  nsDataHashtable<nsUint64HashKey, FileInfoEntry*> mSavepointEntriesIndex;
 
   nsTArray<int64_t> mJournalsToCreateBeforeCommit;
   nsTArray<int64_t> mJournalsToRemoveAfterCommit;
   nsTArray<int64_t> mJournalsToRemoveAfterAbort;
+
+  bool mInSavepoint;
 };
 
 END_INDEXEDDB_NAMESPACE
 
 #endif // mozilla_dom_indexeddb_idbtransaction_h__
--- a/dom/indexedDB/test/test_file_os_delete.html
+++ b/dom/indexedDB/test/test_file_os_delete.html
@@ -16,65 +16,82 @@
 
     const name = window.location.pathname;
 
     const objectStoreName = "Blobs";
 
     getUsage(grabFileUsageAndContinueHandler);
     let startUsage = yield undefined;
 
-    const fileData = { key: 1, file: getRandomFile("random.bin", 100000) };
+    const fileData1 = {
+      key: 1,
+      obj: { id: 1, file: getRandomFile("random.bin", 100000) }
+    };
+    const fileData2 = {
+      key: 2,
+      obj: { id: 1, file: getRandomFile("random.bin", 100000) }
+    };
 
     {
       let request = indexedDB.open(name, 1);
       request.onerror = errorHandler;
       request.onupgradeneeded = grabEventAndContinueHandler;
       request.onsuccess = grabEventAndContinueHandler;
       let event = yield undefined;
 
       is(event.type, "upgradeneeded", "Got correct event type");
 
       let db = event.target.result;
       db.onerror = errorHandler;
 
       let objectStore = db.createObjectStore(objectStoreName, { });
 
-      objectStore.add(fileData.file, fileData.key);
+      objectStore.createIndex("index", "id", { unique: true });
+
+      objectStore.add(fileData1.obj, fileData1.key);
+
+      request = objectStore.add(fileData2.obj, fileData2.key);
+      request.addEventListener("error", new ExpectError("ConstraintError", true));
+      request.onsuccess = unexpectedSuccessHandler;
+      yield undefined;
 
       event = yield undefined;
 
       is(event.type, "success", "Got correct event type");
 
       getUsage(grabFileUsageAndContinueHandler);
       let usage = yield undefined;
 
-      is(usage, startUsage + fileData.file.size, "Correct file usage");
+      is(usage, startUsage + fileData1.obj.file.size + fileData2.obj.file.size,
+         "Correct file usage");
 
       let trans = db.transaction([objectStoreName], READ_WRITE);
-      trans.objectStore(objectStoreName).delete(fileData.key);
+      trans.objectStore(objectStoreName).delete(fileData1.key);
       trans.oncomplete = grabEventAndContinueHandler;
       event = yield undefined;
 
       is(event.type, "complete", "Got correct event type");
 
       getUsage(grabFileUsageAndContinueHandler);
       usage = yield undefined;
 
-      is(usage, startUsage + fileData.file.size, "OS file exists");
+      is(usage, startUsage + fileData1.obj.file.size + fileData2.obj.file.size,
+         "OS files exists");
 
-      fileData.file = null;
+      fileData1.obj.file = null;
+      fileData2.obj.file = null;
     }
 
     scheduleGC();
     yield undefined;
 
     getUsage(grabFileUsageAndContinueHandler);
     let endUsage = yield undefined;
 
-    is(endUsage, startUsage, "OS file deleted");
+    is(endUsage, startUsage, "OS files deleted");
 
     finishTest();
     yield undefined;
   }
   </script>
   <script type="text/javascript;version=1.7" src="file.js"></script>
   <script type="text/javascript;version=1.7" src="helpers.js"></script>
 
--- a/dom/ipc/PreallocatedProcessManager.cpp
+++ b/dom/ipc/PreallocatedProcessManager.cpp
@@ -304,17 +304,17 @@ PreallocatedProcessManagerImpl::PublishS
   MOZ_ASSERT(NS_IsMainThread());
 
   if (Preferences::GetBool("dom.ipc.processPriorityManager.testMode")) {
     AutoJSContext cx;
     nsCOMPtr<nsIMessageBroadcaster> ppmm =
       do_GetService("@mozilla.org/parentprocessmessagemanager;1");
     nsresult rv = ppmm->BroadcastAsyncMessage(
       NS_LITERAL_STRING("TEST-ONLY:nuwa-add-new-process"),
-      JSVAL_NULL, JSVAL_NULL, cx, 1);
+      JS::NullHandleValue, JS::NullHandleValue, cx, 1);
   }
 
   if (!mNuwaForkWaitTasks.IsEmpty()) {
     mNuwaForkWaitTasks.ElementAt(0)->Cancel();
     mNuwaForkWaitTasks.RemoveElementAt(0);
   }
 
   mSpareProcesses.AppendElement(aContent);
@@ -357,17 +357,17 @@ PreallocatedProcessManagerImpl::OnNuwaRe
                                              hal::PROCESS_PRIORITY_MASTER);
   mIsNuwaReady = true;
   if (Preferences::GetBool("dom.ipc.processPriorityManager.testMode")) {
     AutoJSContext cx;
     nsCOMPtr<nsIMessageBroadcaster> ppmm =
       do_GetService("@mozilla.org/parentprocessmessagemanager;1");
     nsresult rv = ppmm->BroadcastAsyncMessage(
       NS_LITERAL_STRING("TEST-ONLY:nuwa-ready"),
-      JSVAL_NULL, JSVAL_NULL, cx, 1);
+      JS::NullHandleValue, JS::NullHandleValue, cx, 1);
   }
   NuwaFork();
 }
 
 bool
 PreallocatedProcessManagerImpl::PreallocatedProcessReady()
 {
   return !mSpareProcesses.IsEmpty();
--- a/dom/ipc/tests/mochitest.ini
+++ b/dom/ipc/tests/mochitest.ini
@@ -1,2 +1,2 @@
 [test_NuwaProcessCreation.html]
-skip-if = true # re-enable when nuwa is enabled.
+run-if = toolkit == 'gonk'
--- a/dom/permission/PermissionPromptHelper.jsm
+++ b/dom/permission/PermissionPromptHelper.jsm
@@ -69,20 +69,28 @@ this.PermissionPromptHelper = {
 
     if (permValue == Ci.nsIPermissionManager.DENY_ACTION ||
         permValue == Ci.nsIPermissionManager.UNKNOWN_ACTION) {
       aCallbacks.cancel();
       return;
     }
 
     if (permValue == Ci.nsIPermissionManager.PROMPT_ACTION) {
+      // create an array with a nsIContentPermissionType element
+      let type = {
+        type: msg.type,
+        access: msg.access ? msg.access : "unused",
+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType])
+      };
+      let typeArray = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
+      typeArray.appendElement(type, false);
+
       // create a nsIContentPermissionRequest
       let request = {
-        type: msg.type,
-        access: msg.access ? msg.access : "unused",
+        types: typeArray,
         principal: principal,
         QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
         allow: aCallbacks.allow,
         cancel: aCallbacks.cancel,
         window: Services.wm.getOuterWindowWithId(msg.windowID)
       };
 
       permissionPromptService.getPermission(request);
--- a/dom/permission/PermissionPromptService.js
+++ b/dom/permission/PermissionPromptService.js
@@ -63,18 +63,27 @@ PermissionPromptService.prototype = {
    **/
   getPermission: function PS_getPermission(aRequest)
   {
     if (!(aRequest instanceof Ci.nsIContentPermissionRequest)) {
       throw new Error("PermissionService.getPermission: "
                       + "2nd argument must be type 'nsIContentPermissionRequest'");
     }
 
-    let type = aRequest.access !== "unused" ? aRequest.type + "-" + aRequest.access
-                                            : aRequest.type;
+    // Only allow exactly one permission request here.
+    let types = aRequest.types.QueryInterface(Ci.nsIArray);
+    if (types.length != 1) {
+      aRequest.cancel();
+      return;
+    }
+
+    let reqType = types.queryElementAt(0, Ci.nsIContentPermissionType);
+
+    let type = reqType.access !== "unused" ? reqType.type + "-" + reqType.access
+                                           : reqType.type;
     let perm =
       permissionManager.testExactPermissionFromPrincipal(aRequest.principal, type);
 
     switch (perm) {
       case Ci.nsIPermissionManager.ALLOW_ACTION:
         aRequest.allow();
         break;
       case Ci.nsIPermissionManager.PROMPT_ACTION:
--- a/dom/plugins/base/nsJSNPRuntime.cpp
+++ b/dom/plugins/base/nsJSNPRuntime.cpp
@@ -630,61 +630,42 @@ doInvoke(NPObject *npobj, NPIdentifier m
     if (!GetProperty(cx, npjsobj->mJSObj, method, &fv) ||
         ::JS_TypeOfValue(cx, fv) != JSTYPE_FUNCTION) {
       return false;
     }
   } else {
     fv = OBJECT_TO_JSVAL(npjsobj->mJSObj);
   }
 
-  JS::Value jsargs_buf[8];
-  JS::Value *jsargs = jsargs_buf;
-
-  if (argCount > (sizeof(jsargs_buf) / sizeof(JS::Value))) {
-    // Our stack buffer isn't large enough to hold all arguments,
-    // malloc a buffer.
-    jsargs = (JS::Value *)PR_Malloc(argCount * sizeof(JS::Value));
-    if (!jsargs) {
+  // Convert args
+  JS::AutoValueVector jsargs(cx);
+  if (!jsargs.reserve(argCount)) {
       ::JS_ReportOutOfMemory(cx);
-
       return false;
-    }
+  }
+  for (uint32_t i = 0; i < argCount; ++i) {
+    jsargs.infallibleAppend(NPVariantToJSVal(npp, cx, args + i));
   }
 
   JS::Rooted<JS::Value> v(cx);
-  bool ok;
-
-  {
-    JS::AutoArrayRooter tvr(cx, 0, jsargs);
+  bool ok = false;
 
-    // Convert args
-    for (uint32_t i = 0; i < argCount; ++i) {
-      jsargs[i] = NPVariantToJSVal(npp, cx, args + i);
-      tvr.changeLength(i + 1);
-    }
-
-    if (ctorCall) {
-      JSObject *newObj =
-        ::JS_New(cx, npjsobj->mJSObj, argCount, jsargs);
+  if (ctorCall) {
+    JSObject *newObj =
+      ::JS_New(cx, npjsobj->mJSObj, jsargs.length(), jsargs.begin());
 
-      if (newObj) {
-        v = OBJECT_TO_JSVAL(newObj);
-        ok = true;
-      } else {
-        ok = false;
-      }
-    } else {
-      ok = ::JS_CallFunctionValue(cx, npjsobj->mJSObj, fv, argCount, jsargs, v.address());
+    if (newObj) {
+      v.setObject(*newObj);
+      ok = true;
     }
-
+  } else {
+    ok = ::JS_CallFunctionValue(cx, npjsobj->mJSObj, fv, jsargs.length(),
+                                jsargs.begin(), v.address());
   }
 
-  if (jsargs != jsargs_buf)
-    PR_Free(jsargs);
-
   if (ok)
     ok = JSValToNPVariant(npp, cx, v, result);
 
   return ok;
 }
 
 // static
 bool
--- a/dom/quota/QuotaManager.cpp
+++ b/dom/quota/QuotaManager.cpp
@@ -2418,48 +2418,48 @@ QuotaManager::Observe(nsISupports* aSubj
             if (!NS_ProcessNextEvent(thread)) {
               NS_ERROR("Failed to process next event!");
               break;
             }
           }
         }
       }
 
-      // Give clients a chance to cleanup IO thread only objects.
-      nsCOMPtr<nsIRunnable> runnable =
-        NS_NewRunnableMethod(this, &QuotaManager::ReleaseIOThreadObjects);
-      if (!runnable) {
-        NS_WARNING("Failed to create runnable!");
-      }
-
-      if (NS_FAILED(mIOThread->Dispatch(runnable, NS_DISPATCH_NORMAL))) {
-        NS_WARNING("Failed to dispatch runnable!");
-      }
-
-      // Make sure to join with our IO thread.
-      if (NS_FAILED(mIOThread->Shutdown())) {
-        NS_WARNING("Failed to shutdown IO thread!");
-      }
-
       // Kick off the shutdown timer.
       if (NS_FAILED(mShutdownTimer->Init(this, DEFAULT_SHUTDOWN_TIMER_MS,
                                          nsITimer::TYPE_ONE_SHOT))) {
         NS_WARNING("Failed to initialize shutdown timer!");
       }
 
       // Each client will spin the event loop while we wait on all the threads
       // to close. Our timer may fire during that loop.
       for (uint32_t index = 0; index < Client::TYPE_MAX; index++) {
         mClients[index]->ShutdownTransactionService();
       }
 
       // Cancel the timer regardless of whether it actually fired.
       if (NS_FAILED(mShutdownTimer->Cancel())) {
         NS_WARNING("Failed to cancel shutdown timer!");
       }
+
+      // Give clients a chance to cleanup IO thread only objects.
+      nsCOMPtr<nsIRunnable> runnable =
+        NS_NewRunnableMethod(this, &QuotaManager::ReleaseIOThreadObjects);
+      if (!runnable) {
+        NS_WARNING("Failed to create runnable!");
+      }
+
+      if (NS_FAILED(mIOThread->Dispatch(runnable, NS_DISPATCH_NORMAL))) {
+        NS_WARNING("Failed to dispatch runnable!");
+      }
+
+      // Make sure to join with our IO thread.
+      if (NS_FAILED(mIOThread->Shutdown())) {
+        NS_WARNING("Failed to shutdown IO thread!");
+      }
     }
 
     return NS_OK;
   }
 
   if (!strcmp(aTopic, NS_TIMER_CALLBACK_TOPIC)) {
     NS_ASSERTION(IsMainProcess(), "Should only happen in the main process!");
 
--- a/dom/tests/mochitest/chrome/chrome.ini
+++ b/dom/tests/mochitest/chrome/chrome.ini
@@ -14,29 +14,31 @@ support-files =
   focus_window2.xul
   fullscreen.xul
   fullscreen_preventdefault.xul
   queryCaretRectUnix.html
   queryCaretRectWin.html
   selectAtPoint.html
   window_activation.xul
   window_callback_wrapping.xul
+  window_docshell_swap.xul
   window_focus.xul
   window_focus_docnav.xul
 
 [test_DOMWindowCreated.xul]
 [test_DOM_element_instanceof.xul]
 [test_activation.xul]
 [test_bug799299.xul]
 [test_bug800817.xul]
 [test_bug830396.xul]
 [test_bug830858.xul]
 [test_callback_wrapping.xul]
 [test_clonewrapper.xul]
 [test_cyclecollector.xul]
+[test_docshell_swap.xul]
 [test_focus.xul]
 [test_focus_docnav.xul]
 [test_focus_switchbinding.xul]
 [test_focused_link_scroll.xul]
 [test_fullscreen_preventdefault.xul]
 [test_geolocation.xul]
 [test_indexedSetter.html]
 [test_moving_nodeList.xul]
new file mode 100644
--- /dev/null
+++ b/dom/tests/mochitest/chrome/test_docshell_swap.xul
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/css" href="chrome://global/skin"?>
+<?xml-stylesheet type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"?>
+<window title="Docshell swap test"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
+
+  <!-- test results are displayed in the html:body -->
+  <body xmlns="http://www.w3.org/1999/xhtml">
+
+  </body>
+
+  <!-- test code goes here -->
+  <script type="application/javascript">
+  <![CDATA[
+
+  SimpleTest.waitForExplicitFinish();
+
+  // Create two identical windows, each with a <browser> element.
+  let win1 = window.openDialog("window_docshell_swap.xul", "_blank","chrome,width=300,height=200");
+  let win2 = window.openDialog("window_docshell_swap.xul", "_blank","chrome,width=300,height=200");
+
+  let loadCount = 0;
+  function loadHandler() {
+    loadCount++;
+    if (loadCount < 2)
+      return;
+
+    let browser1 = win1.document.getElementById("browser");
+    let browser2 = win2.document.getElementById("browser");
+
+    let flo1 = browser1.QueryInterface(Components.interfaces.nsIFrameLoaderOwner);
+    let flo2 = browser2.QueryInterface(Components.interfaces.nsIFrameLoaderOwner);
+
+    let pongCount = 0;
+
+    function gotPong(target_ok) {
+      pongCount++;
+      ok(target_ok, "message went to correct target");
+      if (pongCount == 1) {
+        win1.close();
+        win2.close();
+        SimpleTest.finish();
+      }
+    }
+
+    let mm1 = flo1.frameLoader.messageManager;
+    let mm2 = flo2.frameLoader.messageManager;
+    mm1.addMessageListener("pong", () => { gotPong(true); });
+    mm2.addMessageListener("pong", () => { gotPong(false); });
+
+    // Swap docshells. Everything should be identical to before, since there was nothing to
+    // distinguish these docshells.
+    flo1.swapFrameLoaders(flo2);
+
+    // mm1 shouldn't change here, but we update it in case it does due to a bug.
+    mm1 = flo1.frameLoader.messageManager;
+
+    // Load ping-pong code into first window.
+    mm1.loadFrameScript("data:,addMessageListener('ping', () => sendAsyncMessage('pong'));", false);
+
+    // A pong message received in win1 means success.
+    win1.messageManager.addMessageListener("pong", () => { gotPong(true); });
+
+    // A pong message received in win2 means failure!
+    win2.messageManager.addMessageListener("pong", () => { gotPong(false); });
+
+    // Send the ping to win1.
+    mm1.sendAsyncMessage("ping");
+  }
+
+  win1.addEventListener("load", loadHandler, false);
+  win2.addEventListener("load", loadHandler, false);
+  ]]>
+  </script>
+</window>
new file mode 100644
--- /dev/null
+++ b/dom/tests/mochitest/chrome/window_docshell_swap.xul
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<browser type="content" src="about:blank" id="browser"/>
+
+</window>
--- a/dom/webidl/URLUtilsReadOnly.webidl
+++ b/dom/webidl/URLUtilsReadOnly.webidl
@@ -20,9 +20,10 @@ interface URLUtilsReadOnly {
 
   readonly attribute DOMString protocol;
   readonly attribute DOMString host;
   readonly attribute DOMString hostname;
   readonly attribute DOMString port;
   readonly attribute DOMString pathname;
   readonly attribute DOMString search;
   readonly attribute DOMString hash;
+  readonly attribute DOMString origin;
 };
--- a/dom/webidl/WorkerGlobalScope.webidl
+++ b/dom/webidl/WorkerGlobalScope.webidl
@@ -9,17 +9,20 @@
  * © Copyright 2004-2011 Apple Computer, Inc., Mozilla Foundation, and Opera
  * Software ASA.
  * You are granted a license to use, reproduce and create derivative works of
  * this document.
  */
 
 interface WorkerGlobalScope : EventTarget {
   readonly attribute WorkerGlobalScope self;
+
+  [Replaceable]
   readonly attribute WorkerConsole console;
+
   readonly attribute WorkerLocation location;
 
   void close();
   attribute OnErrorEventHandler onerror;
 
   attribute EventHandler onoffline;
   attribute EventHandler ononline;
   // also has additional members in a partial interface
--- a/dom/workers/Location.cpp
+++ b/dom/workers/Location.cpp
@@ -20,17 +20,18 @@ WorkerLocation::Create(WorkerPrivate::Lo
   nsRefPtr<WorkerLocation> location =
     new WorkerLocation(NS_ConvertUTF8toUTF16(aInfo.mHref),
                        NS_ConvertUTF8toUTF16(aInfo.mProtocol),
                        NS_ConvertUTF8toUTF16(aInfo.mHost),
                        NS_ConvertUTF8toUTF16(aInfo.mHostname),
                        NS_ConvertUTF8toUTF16(aInfo.mPort),
                        NS_ConvertUTF8toUTF16(aInfo.mPathname),
                        NS_ConvertUTF8toUTF16(aInfo.mSearch),
-                       NS_ConvertUTF8toUTF16(aInfo.mHash));
+                       NS_ConvertUTF8toUTF16(aInfo.mHash),
+                       aInfo.mOrigin);
 
   return location.forget();
 }
 
 JSObject*
 WorkerLocation::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
   return WorkerLocationBinding_workers::Wrap(aCx, aScope, this);
--- a/dom/workers/Location.h
+++ b/dom/workers/Location.h
@@ -17,33 +17,36 @@ class WorkerLocation MOZ_FINAL : public 
   nsString mHref;
   nsString mProtocol;
   nsString mHost;
   nsString mHostname;
   nsString mPort;
   nsString mPathname;
   nsString mSearch;
   nsString mHash;
+  nsString mOrigin;
 
   WorkerLocation(const nsAString& aHref,
                  const nsAString& aProtocol,
                  const nsAString& aHost,
                  const nsAString& aHostname,
                  const nsAString& aPort,
                  const nsAString& aPathname,
                  const nsAString& aSearch,
-                 const nsAString& aHash)
+                 const nsAString& aHash,
+                 const nsAString& aOrigin)
     : mHref(aHref)
     , mProtocol(aProtocol)
     , mHost(aHost)
     , mHostname(aHostname)
     , mPort(aPort)
     , mPathname(aPathname)
     , mSearch(aSearch)
     , mHash(aHash)
+    , mOrigin(aOrigin)
   {
     MOZ_COUNT_CTOR(WorkerLocation);
     SetIsDOMBinding();
   }
 
 public:
 
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(WorkerLocation)
@@ -95,13 +98,17 @@ public:
   void GetSearch(nsString& aSearch) const
   {
     aSearch = mSearch;
   }
   void GetHash(nsString& aHash) const
   {
     aHash = mHash;
   }
+  void GetOrigin(nsString& aOrigin) const
+  {
+    aOrigin = mOrigin;
+  }
 };
 
 END_WORKERS_NAMESPACE
 
 #endif // mozilla_dom_workers_location_h__
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -3440,16 +3440,18 @@ WorkerPrivateParent<Derived>::SetBaseURI
     host.AppendLiteral(":");
     host.Append(mLocationInfo.mPort);
 
     mLocationInfo.mHost.Assign(host);
   }
   else {
     mLocationInfo.mHost.Assign(mLocationInfo.mHostname);
   }
+
+  nsContentUtils::GetUTFNonNullOrigin(aBaseURI, mLocationInfo.mOrigin);
 }
 
 template <class Derived>
 void
 WorkerPrivateParent<Derived>::SetPrincipal(nsIPrincipal* aPrincipal)
 {
   AssertIsOnMainThread();
 
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -126,16 +126,17 @@ public:
     nsCString mHref;
     nsCString mProtocol;
     nsCString mHost;
     nsCString mHostname;
     nsCString mPort;
     nsCString mPathname;
     nsCString mSearch;
     nsCString mHash;
+    nsString mOrigin;
   };
 
   struct LoadInfo
   {
     // All of these should be released in ForgetMainThreadObjects.
     nsCOMPtr<nsIURI> mBaseURI;
     nsCOMPtr<nsIURI> mResolvedScriptURI;
     nsCOMPtr<nsIPrincipal> mPrincipal;
new file mode 100644
--- /dev/null
+++ b/dom/workers/test/consoleReplaceable_worker.js
@@ -0,0 +1,10 @@
+/**
+ * Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+onmessage = function(event) {
+  postMessage({event: 'console exists', status: !!console, last : false});
+  console = 42;
+  postMessage({event: 'console is replaceable', status: console === 42, last : true});
+}
--- a/dom/workers/test/mochitest.ini
+++ b/dom/workers/test/mochitest.ini
@@ -3,16 +3,17 @@ support-files =
   WorkerTest_badworker.js
   atob_worker.js
   clearTimeouts_worker.js
   closeOnGC_server.sjs
   closeOnGC_worker.js
   close_worker.js
   content_worker.js
   console_worker.js
+  consoleReplaceable_worker.js
   csp_worker.js
   errorPropagation_iframe.html
   errorPropagation_worker.js
   errorwarning_worker.js
   eventDispatch_worker.js
   fibonacci_worker.js
   importScripts_worker.js
   importScripts_worker_imported1.js
@@ -70,16 +71,17 @@ support-files =
 [test_atob.html]
 [test_blobConstructor.html]
 [test_blobWorkers.html]
 [test_chromeWorker.html]
 [test_clearTimeouts.html]
 [test_close.html]
 [test_closeOnGC.html]
 [test_console.html]
+[test_consoleReplaceable.html]
 [test_contentWorker.html]
 [test_csp.html]
 [test_csp.html^headers^]
 [test_csp.js]
 [test_dataURLWorker.html]
 [test_errorPropagation.html]
 [test_errorwarning.html]
 [test_eventDispatch.html]
new file mode 100644
--- /dev/null
+++ b/dom/workers/test/test_consoleReplaceable.html
@@ -0,0 +1,44 @@
+<!--
+  Any copyright is dedicated to the Public Domain.
+  http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<!DOCTYPE HTML>
+<html>
+<!--
+Tests of DOM Worker Console
+-->
+<head>
+  <title>Test for DOM Worker Console</title>
+  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
+</head>
+<body>
+<p id="display"></p>
+<div id="content" style="display: none">
+
+</div>
+<pre id="test">
+<script class="testbody" language="javascript">
+  var worker = new Worker("consoleReplaceable_worker.js");
+
+  worker.onmessage = function(event) {
+    is(event.target, worker, "Worker and target match!");
+    ok(event.data.status, event.data.event);
+
+    if (event.data.last)
+      SimpleTest.finish();
+  };
+
+  worker.onerror = function(event) {
+    ok(false, "Worker had an error: " + event.message);
+    SimpleTest.finish();
+  }
+
+  worker.postMessage(true);
+
+  SimpleTest.waitForExplicitFinish();
+
+</script>
+</pre>
+</body>
+</html>
--- a/dom/workers/test/test_location.html
+++ b/dom/workers/test/test_location.html
@@ -34,17 +34,18 @@ Tests of DOM Worker Location
     "toString": baseHref + workerFilename,
     "href": baseHref + workerFilename,
     "protocol": window.location.protocol,
     "host": window.location.host,
     "hostname": window.location.hostname,
     "port": window.location.port,
     "pathname": basePath + workerFilename,
     "search": "",
-    "hash": ""
+    "hash": "",
+    "origin": "http://mochi.test:8888"
   };
 
   var lastSlash = href.substr(0, queryPos).lastIndexOf("/") + 1;
   is(thisFilename,
      href.substr(lastSlash, queryPos - lastSlash),
      "Correct filename ");
 
   var worker = new Worker(workerFilename);
--- a/gfx/gl/GLReadTexImageHelper.cpp
+++ b/gfx/gl/GLReadTexImageHelper.cpp
@@ -528,18 +528,17 @@ GLReadTexImageHelper::ReadTexImage(GLuin
             mGL->fGetIntegerv(LOCAL_GL_TEXTURE_BINDING_RECTANGLE, &oldTex);
             break;
         default: /* Already checked above */
             break;
         }
 
         ScopedGLState scopedScissorTestState(mGL, LOCAL_GL_SCISSOR_TEST, false);
         ScopedGLState scopedBlendState(mGL, LOCAL_GL_BLEND, false);
-
-        ScopedViewportRect(mGL, 0, 0, aSize.width, aSize.height);
+        ScopedViewportRect scopedViewportRect(mGL, 0, 0, aSize.width, aSize.height);
 
         /* Setup renderbuffer */
         mGL->fGenRenderbuffers(1, &rb);
         mGL->fBindRenderbuffer(LOCAL_GL_RENDERBUFFER, rb);
 
         GLenum rbInternalFormat =
             mGL->IsGLES2()
                 ? (mGL->IsExtensionSupported(GLContext::OES_rgb8_rgba8) ? LOCAL_GL_RGBA8 : LOCAL_GL_RGBA4)
--- a/gfx/thebes/nsSurfaceTexture.cpp
+++ b/gfx/thebes/nsSurfaceTexture.cpp
@@ -65,17 +65,17 @@ public:
     env->DeleteGlobalRef(aSurfaceTexture);
   }
 
   void UpdateTexImage(jobject aSurfaceTexture)
   {
     JNIEnv* env = GetJNIForThread();
 
     AutoLocalJNIFrame jniFrame(env);
-    env->CallObjectMethod(aSurfaceTexture, jSurfaceTexture_updateTexImage);
+    env->CallVoidMethod(aSurfaceTexture, jSurfaceTexture_updateTexImage);
   }
 
   bool GetTransformMatrix(jobject aSurfaceTexture, gfx::Matrix4x4& aMatrix)
   {
     JNIEnv* env = GetJNIForThread();
 
     AutoLocalJNIFrame jniFrame(env);
 
--- a/intl/icu-patches/bug-724533
+++ b/intl/icu-patches/bug-724533
@@ -1,109 +1,73 @@
 # HG changeset patch
-# Parent f0198ba6d08bc0bfc3f67f16ccb54c6f6681ee0c
-# User Norbert Lindenberg <mozilladev@lindenbergsoftware.com>
+# Parent a7f3631893c30ca7f1ccf5a36674786566e48103
+# User Jeff Walden <jwalden@mit.edu>
 Bug 724533 - Make ICU build with Mozilla build for Windows. r=gps
 
-diff --git a/intl/icu/source/aclocal.m4 b/intl/icu/source/aclocal.m4
---- a/intl/icu/source/aclocal.m4
-+++ b/intl/icu/source/aclocal.m4
-@@ -33,17 +33,20 @@ powerpc*-*-linux*)
- *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
- *-*-cygwin|*-*-mingw32)
- 	if test "$GCC" = yes; then
- 		AC_TRY_COMPILE([
- #ifndef __MINGW32__
- #error This is not MinGW
- #endif], [], icu_cv_host_frag=mh-mingw, icu_cv_host_frag=mh-cygwin)
+diff --git a/intl/icu/source/acinclude.m4 b/intl/icu/source/acinclude.m4
+--- a/intl/icu/source/acinclude.m4
++++ b/intl/icu/source/acinclude.m4
+@@ -42,7 +42,10 @@ powerpc*-*-linux*)
+ #error This is not MinGW64
+ #endif], [], icu_cv_host_frag=mh-mingw64, icu_cv_host_frag=mh-mingw), icu_cv_host_frag=mh-cygwin)
  	else
 -		icu_cv_host_frag=mh-cygwin-msvc
-+	        case "${host}" in
-+		*-*-mingw32) icu_cv_host_frag=mh-msys-msvc ;;
++		case "${host}" in
 +		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
++		*-*-mingw32|*-*-mingw64) icu_cv_host_frag=mh-msys-msvc ;;
 +		esac
  	fi ;;
  *-*-*bsd*|*-*-dragonfly*) 	icu_cv_host_frag=mh-bsd-gcc ;;
  *-*-aix*)
- 	if test "$GCC" = yes; then
- 		icu_cv_host_frag=mh-aix-gcc
- 	else
- 		icu_cv_host_frag=mh-aix-va
- 	fi ;;
-@@ -456,27 +459,31 @@ AC_DEFUN(AC_CHECK_STRICT_COMPILE,
-             # We use -std=c99 to disable the gnu99 defaults and its associated warnings
-             CFLAGS="$CFLAGS -Wall -std=c99 -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
-         else
-             case "${host}" in
-             *-*-cygwin)
+@@ -474,7 +477,9 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
                  if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
                  then
                      CFLAGS="$CFLAGS /W4"
 -                fi
 +                fi ;;
-+            *-*-mingw32)
++            *-*-mingw32|*-*-mingw64)
 +                CFLAGS="$CFLAGS -W4" ;;
              esac
          fi
          if test "$GXX" = yes
-         then
-             CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
-         else
-             case "${host}" in
-             *-*-cygwin)
+@@ -486,7 +491,9 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
                  if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
                  then
                      CXXFLAGS="$CXXFLAGS /W4"
 -                fi
 +                fi ;;
-+            *-*-mingw32)
-+                CXXFLAGS="$CXXFLAGS -W4" ;;
++            *-*-mingw32|*-*-mingw64)
++                CFLAGS="$CFLAGS -W4" ;;
              esac
          fi
      fi
- ])
- 
- 
 diff --git a/intl/icu/source/config/mh-cygwin-msvc b/intl/icu/source/config/mh-msys-msvc
 copy from intl/icu/source/config/mh-cygwin-msvc
 copy to intl/icu/source/config/mh-msys-msvc
 --- a/intl/icu/source/config/mh-cygwin-msvc
 +++ b/intl/icu/source/config/mh-msys-msvc
-@@ -1,22 +1,22 @@
+@@ -1,4 +1,4 @@
 -## Cygwin with Microsoft Visual C++ compiler specific setup
 +## MSYS with Microsoft Visual C++ compiler specific setup
- ## Copyright (c) 2001-2012, International Business Machines Corporation and
+ ## Copyright (c) 2001-2013, International Business Machines Corporation and
  ## others. All Rights Reserved.
  
- # We install sbin tools into the same bin directory because
- # pkgdata needs some of the tools in sbin, and we can't always depend on
- # icu-config working on Windows.
- sbindir=$(bindir)
- 
+@@ -10,8 +10,8 @@ sbindir=$(bindir)
  ## Commands to generate dependency files
  GEN_DEPS.c=	:
  GEN_DEPS.cc=	:
 -#GEN_DEPS.c=	$(COMPILE.c) /E
 -#GEN_DEPS.cc=	$(COMPILE.cc) /E
 +#GEN_DEPS.c=	$(COMPILE.c) -E
 +#GEN_DEPS.cc=	$(COMPILE.cc) -E
  
  ## Flags to create/use a static library
  ifneq ($(ENABLE_SHARED),YES)
- ## Make sure that the static libraries can be built and used
- CPPFLAGS += -DU_STATIC_IMPLEMENTATION#M#
- else
- ## Make sure that the static libraries can be built
- STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION
-@@ -36,63 +36,63 @@ CPPFLAGS+=-DU_RELEASE=1#M#
- endif
- 
- ifeq ($(ENABLE_DEBUG),1)
- # Pass debugging flag through
- CPPFLAGS+=-D_DEBUG=1#M#
+@@ -41,41 +41,41 @@ CPPFLAGS+=-D_DEBUG=1#M#
  ICULIBSUFFIX:=$(ICULIBSUFFIX)d#M#
  endif
  
 -# /GF pools strings and places them into read-only memory
 -# /EHsc enables exception handling
 -# /Zc:wchar_t makes wchar_t a native type. Required for C++ ABI compatibility.
 +# -GF pools strings and places them into read-only memory
 +# -EHsc enables exception handling
@@ -149,42 +113,32 @@ copy to intl/icu/source/config/mh-msys-m
  ## Non-shared intermediate object suffix
  STATIC_O = ao
  # OUTOPT is for creating a specific output name
 -OUTOPT = /out:
 +OUTOPT = -out:
  
  # Static library prefix and file extension
  LIBSICU = $(STATIC_PREFIX)$(ICUPREFIX)
- A = lib
+@@ -83,11 +83,11 @@ A = lib
  
  # Cygwin's ar can't handle Win64 right now. So we use Microsoft's tool instead.
  AR = LIB.EXE#M#
 -ARFLAGS := /nologo $(ARFLAGS:r=)#M#
 +ARFLAGS := -nologo $(ARFLAGS:r=)#M#
  RANLIB = ls -s#M#
 -AR_OUTOPT = /OUT:#M#
 +AR_OUTOPT = -OUT:#M#
  
 -## An import library is needed for z/OS, MSVC and Cygwin
 +## An import library is needed for z-OS, MSVC and Cygwin
  IMPORT_LIB_EXT = .lib
  
  LIBPREFIX=
- DEFAULT_LIBS = advapi32.lib
- 
- # Change the stubnames so that poorly working FAT disks and installation programs can work.
- # This is also for backwards compatibility.
- DATA_STUBNAME = dt
-@@ -109,47 +109,35 @@ LIBICUUC=	$(LIBDIR)/$(LIBICU)$(COMMON_ST
- LIBICUI18N=	$(LIBDIR)/$(LIBICU)$(I18N_STUBNAME)$(ICULIBSUFFIX).lib
- LIBICULE=	$(LIBDIR)/$(LIBICU)$(LAYOUT_STUBNAME)$(ICULIBSUFFIX).lib
- LIBICULX=	$(LIBDIR)/$(LIBICU)$(LAYOUTEX_STUBNAME)$(ICULIBSUFFIX).lib
- LIBICUIO=	$(LIBDIR)/$(LIBICU)$(IO_STUBNAME)$(ICULIBSUFFIX).lib
- LIBCTESTFW=	$(top_builddir)/tools/ctestfw/$(LIBICU)$(CTESTFW_STUBNAME)$(ICULIBSUFFIX).lib
+@@ -114,37 +114,25 @@ LIBCTESTFW=	$(top_builddir)/tools/ctestf
  LIBICUTOOLUTIL=	$(LIBDIR)/$(LIBICU)$(TOOLUTIL_STUBNAME)$(ICULIBSUFFIX).lib
  
  ## These are the library specific LDFLAGS
 -LDFLAGSICUDT+=	/base:"0x4ad00000" /NOENTRY# The NOENTRY option is required for creating a resource-only DLL.
 -LDFLAGSICUUC=	/base:"0x4a800000"# in-uc = 1MB
 -LDFLAGSICUI18N=	/base:"0x4a900000"# io-in = 2MB
 -LDFLAGSICUIO=	/base:"0x4ab00000"# le-io = 1MB
 -LDFLAGSICULE=	/base:"0x4ac00000"# lx-le = 512KB
@@ -195,17 +149,17 @@ copy to intl/icu/source/config/mh-msys-m
 +LDFLAGSICUIO=	-base:"0x4ab00000"# le-io = 1MB
 +LDFLAGSICULE=	-base:"0x4ac00000"# lx-le = 512KB
 +LDFLAGSICULX=	-base:"0x4ac80000"
  LDFLAGSCTESTFW=# Unused for now.
 -LDFLAGSICUTOOLUTIL=	/base:"0x4ac00000"# Same as layout. Layout and tools probably won't mix.
 -
 -# The #M# is used to delete lines for icu-config
 -# Current full path directory.
--CURR_FULL_DIR=$(subst \,/,$(shell cygpath -da .))#M# -m isn't used because it doesn't work on Win98
+-CURR_FULL_DIR?=$(subst \,/,$(shell cygpath -da .))#M# -m isn't used because it doesn't work on Win98
 -# Current full path directory for use in source code in a -D compiler option.
 -CURR_SRCCODE_FULL_DIR=$(subst \,\\,$(shell cygpath -da .))#M#
 -
 -ifeq ($(srcdir),.)
 -SOURCE_FILE=$<
 -else
 -SOURCE_FILE=$(shell cygpath -dma $<)#M#
 -endif
@@ -223,221 +177,127 @@ copy to intl/icu/source/config/mh-msys-m
 -	$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) /Fo$@ $(SOURCE_FILE)
 +	$(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -Fo$@ $<
  %.o: $(srcdir)/%.cpp
 -	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) /Fo$@ $(SOURCE_FILE)
 +	$(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -Fo$@ $<
  
  
  ## Dependency rules
- ## This is a start to how depdendencies could work
- # The commented out rules may not properly delete the file when ^C is pressed
- #   or the compiler fails.
- # make currently doesn't like rules with C:\\PROGRA~1\\.. in the depedency.
- #   So system headers are ignored by ignoring \\
-@@ -170,34 +158,34 @@ endif
- #	@echo -n "$@ $(basename $<).o : " > $@
- #	@$(SHELL) -ec '$(GEN_DEPS.cc) $< \
- #		| grep "#line 1 " | grep -v \\\\ | cut -d " " -f 3 \
- #		| /usr/bin/sort -u | sed s/\"$$/\\\\/ | sed s/^\"/\	/ >> $@ \
- #		|| (rm -f $@ && echo $@ && false)'
+@@ -175,7 +163,7 @@ endif
  
  ## Compile a Windows resource file
  %.res : $(srcdir)/%.rc
 -	rc.exe /fo$@ $(CPPFLAGS) $(SOURCE_FILE)
 +	rc.exe -fo$@ $(CPPFLAGS) $<
  
  ## Versioned target for a shared library.
  FINAL_SO_TARGET= $(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
- MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
- 
- ## Starting in MSVC 2005, manifest files are required. This reduces the obnoxiousness of this feature.
- 	POST_SO_BUILD_STEP = @([ -e $<.manifest ] && \
- 	( echo Embedding manifest into $< && mt.exe -nologo -manifest $<.manifest -outputresource:"$<;2" && rm -rf $<.manifest )) \
- 	|| true
- 	POST_BUILD_STEP = @([ -e $@.manifest ] && \
- 	( echo Embedding manifest into $@ && mt.exe -nologo -manifest $@.manifest -outputresource:"$@;1" && rm -rf $@.manifest )) \
- 	|| true
+@@ -191,8 +179,8 @@ MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
  
  ## Special pkgdata information that is needed
  PKGDATA_VERSIONING = -r $(SO_TARGET_VERSION_MAJOR)
 -ICUPKGDATA_INSTALL_DIR = $(shell mkdir -p  $(DESTDIR)$(ICUPKGDATA_DIR) ;  cygpath -dma $(DESTDIR)$(ICUPKGDATA_DIR))#M#
 -ICUPKGDATA_INSTALL_LIBDIR = $(shell mkdir -p  $(DESTDIR)$(libdir) ; cygpath -dma $(DESTDIR)$(libdir))#M#
 +ICUPKGDATA_INSTALL_DIR = $(shell mkdir -p  $(DESTDIR)$(ICUPKGDATA_DIR) ;  echo $(DESTDIR)$(ICUPKGDATA_DIR))#M#
 +ICUPKGDATA_INSTALL_LIBDIR = $(shell mkdir -p  $(DESTDIR)$(libdir) ; echo $(DESTDIR)$(libdir))#M#
  
  ## Versioned import library names. The library names are versioned,
  ## but the import libraries do not need versioning.
- IMPORT_LIB = $(basename $(SO_TARGET))$(IMPORT_LIB_EXT)#M#
- MIDDLE_IMPORT_LIB = $(IMPORT_LIB)#M#
- FINAL_IMPORT_LIB = $(MIDDLE_IMPORT_LIB)#M#
- 
- # The following is for Makefile.inc's use.
-@@ -220,10 +208,10 @@ INSTALL-L=$(INSTALL_PROGRAM)
- LDLIBRARYPATH_ENVVAR = PATH
- 
- # These are needed to allow the pkgdata nmake files to work
- PKGDATA_INVOKE_OPTS = MAKEFLAGS=
- 
+@@ -225,5 +213,5 @@ PKGDATA_INVOKE_OPTS = MAKEFLAGS=
  # Include the version information in the shared library
  ENABLE_SO_VERSION_DATA=1
  
 -## End Cygwin-specific setup
 +## End MSYS-specific setup
  
 diff --git a/intl/icu/source/configure b/intl/icu/source/configure
 --- a/intl/icu/source/configure
 +++ b/intl/icu/source/configure
-@@ -4068,29 +4068,33 @@ fi
-             # We use -std=c99 to disable the gnu99 defaults and its associated warnings
-             CFLAGS="$CFLAGS -Wall -std=c99 -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings"
-         else
-             case "${host}" in
-             *-*-cygwin)
+@@ -4100,7 +4100,9 @@ fi
                  if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
                  then
                      CFLAGS="$CFLAGS /W4"
 -                fi
 +                fi ;;
-+            *-*-mingw32)
++            *-*-mingw32|*-*-mingw64)
 +                CFLAGS="$CFLAGS -W4" ;;
              esac
          fi
          if test "$GXX" = yes
-         then
-             CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long"
-         else
-             case "${host}" in
-             *-*-cygwin)
+@@ -4112,7 +4114,9 @@ fi
                  if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
                  then
                      CXXFLAGS="$CXXFLAGS /W4"
 -                fi
 +                fi ;;
-+            *-*-mingw32)
-+                CXXFLAGS="$CXXFLAGS -W4" ;;
++            *-*-mingw32|*-*-mingw64)
++                CFLAGS="$CFLAGS -W4" ;;
              esac
          fi
      fi
- 
- 
- # Check if we can build and use 64-bit libraries
- 
- 
-@@ -4864,17 +4868,20 @@ main ()
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-   icu_cv_host_frag=mh-mingw
- else
-   icu_cv_host_frag=mh-cygwin
+@@ -4915,7 +4919,10 @@ else
  fi
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  	else
 -		icu_cv_host_frag=mh-cygwin-msvc
-+	        case "${host}" in
-+		*-*-mingw32) icu_cv_host_frag=mh-msys-msvc ;;
++		case "${host}" in
 +		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
++		*-*-mingw32|*-*-mingw64) icu_cv_host_frag=mh-msys-msvc ;;
 +		esac
  	fi ;;
  *-*-*bsd*|*-*-dragonfly*) 	icu_cv_host_frag=mh-bsd-gcc ;;
  *-*-aix*)
- 	if test "$GCC" = yes; then
- 		icu_cv_host_frag=mh-aix-gcc
- 	else
- 		icu_cv_host_frag=mh-aix-va
- 	fi ;;
-@@ -5106,17 +5113,17 @@ fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enabled" >&5
- $as_echo "$enabled" >&6; }
- 
- 
- # MSVC floating-point option
+@@ -5157,7 +5164,7 @@ fi
  MSVC_RELEASE_FLAG=""
  if test $enabled = yes
  then
 -    if test $icu_cv_host_frag = mh-cygwin-msvc
 +    if test $icu_cv_host_frag = mh-cygwin-msvc -o $icu_cv_host_frag = mh-msys-msvc
      then
          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
- 
-     #if defined _MSC_VER && _MSC_VER >= 1400
-     #else
-     Microsoft Visual C++ < 2005
-     #endif
-diff --git a/intl/icu/source/configure.in b/intl/icu/source/configure.in
---- a/intl/icu/source/configure.in
-+++ b/intl/icu/source/configure.in
-@@ -313,18 +313,18 @@ AC_ARG_ENABLE(auto-cleanup,
-     esac],
- )
- AC_MSG_RESULT($enabled)
- AC_SUBST(UCLN_NO_AUTO_CLEANUP)
- 
- # MSVC floating-point option
+diff --git a/intl/icu/source/configure.ac b/intl/icu/source/configure.ac
+--- a/intl/icu/source/configure.ac
++++ b/intl/icu/source/configure.ac
+@@ -330,7 +330,7 @@ AC_SUBST(UCLN_NO_AUTO_CLEANUP)
  MSVC_RELEASE_FLAG=""
  if test $enabled = yes
--then  
+ then
 -    if test $icu_cv_host_frag = mh-cygwin-msvc
-+then
 +    if test $icu_cv_host_frag = mh-cygwin-msvc -o $icu_cv_host_frag = mh-msys-msvc
      then
          AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
      #if defined _MSC_VER && _MSC_VER >= 1400
-     #else
-     Microsoft Visual C++ < 2005
-     #endif
-         ]], [[]])],[MSVC_RELEASE_FLAG="/fp:precise"],[MSVC_RELEASE_FLAG="/Op"])
-         
 diff --git a/intl/icu/source/data/Makefile.in b/intl/icu/source/data/Makefile.in
 --- a/intl/icu/source/data/Makefile.in
 +++ b/intl/icu/source/data/Makefile.in
-@@ -345,17 +345,18 @@ GENRBOPTS=-k
- -include $(MISCSRCDIR)/misclocal.mk
- MSC_SOURCE= $(MISC_SOURCE) $(MISC_SOURCE_LOCAL)
- MSC_SRC_FILES=$(MSC_SOURCE:%=$(MISCSRCDIR)/%)
- 
- ifeq ($(ENABLE_SO_VERSION_DATA),1)
+@@ -350,7 +350,8 @@ ifeq ($(ENABLE_SO_VERSION_DATA),1)
  ifeq ($(PKGDATA_MODE),dll)
  SO_VERSION_DATA = $(OUTTMPDIR)/icudata.res
  $(SO_VERSION_DATA) : $(MISCSRCDIR)/icudata.rc
 -	rc.exe /i$(srcdir)/../common /i$(top_builddir)/common /fo$@ $(CPPFLAGS) $(SOURCE_FILE)
 +        # fixme: need to tell whether to use - or /, $(SOURCEFILE) or $<
 +	rc.exe -i$(srcdir)/../common -i$(top_builddir)/common -fo$@ $(CPPFLAGS) $<
  endif
  endif
  
- INDEX_NAME=res_index
- INDEX_FILE=$(OUTTMPDIR)/$(INDEX_NAME).txt
- 
- ALL_RES_SRC= $(RES_SRC) $(TRNS_SOURCE) $(MSC_SOURCE)
- RES_FILES = $(ALL_RES_SRC:%.txt=$(BUILDDIR)/%.res) $(BUILDDIR)/$(INDEX_NAME).res $(BUILDDIR)/pool.res
 diff --git a/intl/icu/source/runConfigureICU b/intl/icu/source/runConfigureICU
 --- a/intl/icu/source/runConfigureICU
 +++ b/intl/icu/source/runConfigureICU
-@@ -279,16 +279,27 @@ case $platform in
-         DEBUG_CXXFLAGS='-g -O0'
-         ;;
-     MinGW)
-         THE_OS="MinGW"
-         THE_COMP="the GNU C++"
-         RELEASE_CFLAGS='-O3'
-         RELEASE_CXXFLAGS='-O3'
+@@ -315,6 +315,17 @@ case $platform in
+         CXXFLAGS="--std=c++03"
+         export CXXFLAGS
          ;;
 +    MSYS/MSVC)
 +        THE_OS="MSYS"
 +        THE_COMP="Microsoft Visual C++"
 +        CC=cl; export CC
 +        CXX=cl; export CXX
 +        RELEASE_CFLAGS='-Gy -MD'
 +        RELEASE_CXXFLAGS='-Gy -MD'
 +        DEBUG_CFLAGS='-Zi -MDd'
 +        DEBUG_CXXFLAGS='-Zi -MDd'
 +        DEBUG_LDFLAGS='-DEBUG'
 +        ;;
      *BSD)
          THE_OS="BSD"
          THE_COMP="the GNU C++"
-         CC=gcc; export CC
-         CXX=g++; export CXX
-         DEBUG_CFLAGS='-g -O0'
-         DEBUG_CXFLAGS='-g -O0'
-         ;;
deleted file mode 100644
--- a/intl/icu-patches/bug-853706
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# Parent 7965d384123c42ca0e4e4b18bc3ad73b26369f16
-# User Norbert Lindenberg <mozilladev@lindenbergsoftware.com>
-Bug 853706 - Backported fix for formatting 0 with significant digits from ICU.
-
-diff --git a/intl/icu/source/i18n/decimfmt.cpp b/intl/icu/source/i18n/decimfmt.cpp
---- a/intl/icu/source/i18n/decimfmt.cpp
-+++ b/intl/icu/source/i18n/decimfmt.cpp
-@@ -1709,16 +1709,24 @@ DecimalFormat::subformat(UnicodeString& 
-             }
- 
-             // Output grouping separator if necessary.
-             if (isGroupingPosition(i)) {
-                 currentLength = appendTo.length();
-                 appendTo.append(*grouping);
-                 handler.addAttribute(kGroupingSeparatorField, currentLength, appendTo.length());
-             }
-+        } 
-+
-+        // This handles the special case of formatting 0. For zero only, we count the 
-+        // zero to the left of the decimal point as one signficant digit. Ordinarily we 
-+        // do not count any leading 0's as significant. If the number we are formatting 
-+        // is not zero, then either sigCount or digits.getCount() will be non-zero. 
-+        if (sigCount == 0 && digits.getCount() == 0) { 
-+          sigCount = 1; 
-         }
- 
-         // TODO(dlf): this looks like it was a bug, we marked the int field as ending
-         // before the zero was generated.
-         // Record field information for caller.
-         // if (fieldPosition.getField() == NumberFormat::kIntegerField)
-         //     fieldPosition.setEndIndex(appendTo.length());
- 
deleted file mode 100644
--- a/intl/icu-patches/bug-899722
+++ /dev/null
@@ -1,29 +0,0 @@
-Bug 899722 Part 1: Fix ECMAScript intl on BSD by stripping the extra 's' added to the library name, as done on linux. r=norbert
-
-diff --git a/intl/icu/source/config/mh-bsd-gcc b/intl/icu/source/config/mh-bsd-gcc
---- a/intl/icu/source/config/mh-bsd-gcc
-+++ b/intl/icu/source/config/mh-bsd-gcc
-@@ -58,10 +58,22 @@ STATIC_O = ao
- 
- ## Versioned libraries rules
- 
- %.$(SO).$(SO_TARGET_VERSION_MAJOR): %.$(SO).$(SO_TARGET_VERSION)
- 	$(RM) $@ && ln -s ${<F} $@
- %.$(SO): %.$(SO).$(SO_TARGET_VERSION_MAJOR)
- 	$(RM) $@ && ln -s ${*F}.$(SO).$(SO_TARGET_VERSION) $@
- 
--## End FreeBSD-specific setup
-+##  Bind internal references
- 
-+# LDflags that pkgdata will use
-+BIR_LDFLAGS= -Wl,-Bsymbolic
-+
-+# Dependencies [i.e. map files] for the final library
-+BIR_DEPS=
-+
-+## Remove shared library 's'
-+STATIC_PREFIX_WHEN_USED = 
-+STATIC_PREFIX = 
-+
-+## End BSD-specific setup
-+
deleted file mode 100644
--- a/intl/icu-patches/bug-899722-2
+++ /dev/null
@@ -1,110 +0,0 @@
-Bug 899722 Part 2 - Backport upstream r32937 to fix symbol collision w/ truncate on BSD r=norbert
-
-http://bugs.icu-project.org/trac/ticket/10290
-diff --git a/intl/icu/source/tools/genrb/derb.c b/intl/icu/source/tools/genrb/derb.c
---- a/intl/icu/source/tools/genrb/derb.c
-+++ b/intl/icu/source/tools/genrb/derb.c
-@@ -49,17 +49,17 @@
- #define DERB_VERSION "1.0"
- 
- #define DERB_DEFAULT_TRUNC 80
- 
- static UConverter *defaultConverter = 0;
- 
- static const int32_t indentsize = 4;
- static int32_t truncsize = DERB_DEFAULT_TRUNC;
--static UBool truncate = FALSE;
-+static UBool opt_truncate = FALSE;
- 
- static const char *getEncodingName(const char *encoding);
- static void reportError(const char *pname, UErrorCode *status, const char *when);
- static UChar *quotedString(const UChar *string);
- static void printOutBundle(FILE *out, UConverter *converter, UResourceBundle *resource, int32_t indent, const char *pname, UErrorCode *status);
- static void printString(FILE *out, UConverter *converter, const UChar *str, int32_t len);
- static void printCString(FILE *out, UConverter *converter, const char *str, int32_t len);
- static void printIndent(FILE *out, UConverter *converter, int32_t indent);
-@@ -147,24 +147,24 @@ main(int argc, char* argv[]) {
-         encoding = options[2].value;
-     }
- 
-     if (options[3].doesOccur) {
-         tostdout = 1;
-     }
- 
-     if(options[4].doesOccur) {
--        truncate = TRUE;
-+        opt_truncate = TRUE;
-         if(options[4].value != NULL) {
-             truncsize = atoi(options[4].value); /* user defined printable size */
-         } else {
-             truncsize = DERB_DEFAULT_TRUNC; /* we'll use default omitting size */
-         }
-     } else {
--        truncate = FALSE;
-+        opt_truncate = FALSE;
-     }
- 
-     if(options[5].doesOccur) {
-         verbose = TRUE;
-     }
- 
-     if (options[6].doesOccur) {
-         outputDir = options[6].value;
-@@ -468,17 +468,17 @@ static void printHex(FILE *out, UConvert
-     printString(out, converter, hex, (int32_t)(sizeof(hex)/sizeof(*hex)));
- }
- 
- static void printOutAlias(FILE *out,  UConverter *converter, UResourceBundle *parent, Resource r, const char *key, int32_t indent, const char *pname, UErrorCode *status) {
-     static const UChar cr[] = { '\n' };
-     int32_t len = 0;
-     const UChar* thestr = res_getAlias(&(parent->fResData), r, &len);
-     UChar *string = quotedString(thestr);
--    if(truncate && len > truncsize) {
-+    if(opt_truncate && len > truncsize) {
-         char msg[128];
-         printIndent(out, converter, indent);
-         sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
-             (long)len, (long)truncsize/2);
-         printCString(out, converter, msg, -1);
-         len = truncsize;
-     }
-     if(U_SUCCESS(*status)) {
-@@ -512,17 +512,17 @@ static void printOutBundle(FILE *out, UC
-     switch(ures_getType(resource)) {
-     case URES_STRING :
-         {
-             int32_t len=0;
-             const UChar* thestr = ures_getString(resource, &len, status);
-             UChar *string = quotedString(thestr);
- 
-             /* TODO: String truncation */
--            if(truncate && len > truncsize) {
-+            if(opt_truncate && len > truncsize) {
-                 char msg[128];
-                 printIndent(out, converter, indent);
-                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
-                         (long)len, (long)(truncsize/2));
-                 printCString(out, converter, msg, -1);
-                 len = truncsize/2;
-             }
-             printIndent(out, converter, indent);
-@@ -571,17 +571,17 @@ static void printOutBundle(FILE *out, UC
-             }
-             printString(out, converter, cr, (int32_t)(sizeof(cr) / sizeof(*cr)));
-             break;
-         }
-     case URES_BINARY :
-         {
-             int32_t len = 0;
-             const int8_t *data = (const int8_t *)ures_getBinary(resource, &len, status);
--            if(truncate && len > truncsize) {
-+            if(opt_truncate && len > truncsize) {
-                 char msg[128];
-                 printIndent(out, converter, indent);
-                 sprintf(msg, "// WARNING: this resource, size %li is truncated to %li\n",
-                         (long)len, (long)(truncsize/2));
-                 printCString(out, converter, msg, -1);
-                 len = truncsize;
-             }
-             if(U_SUCCESS(*status)) {
-
--- a/intl/icu-patches/bug-899722-4
+++ b/intl/icu-patches/bug-899722-4
@@ -1,25 +1,14 @@
 Bug 899722 Part 4: Prevent runConfigureICU from overriding CC/CXX on BSDs.
 
 diff --git a/intl/icu/source/runConfigureICU b/intl/icu/source/runConfigureICU
-index 1a476ff..8873cc3 100755
 --- a/intl/icu/source/runConfigureICU
 +++ b/intl/icu/source/runConfigureICU
-@@ -293,18 +293,16 @@ case $platform in
-         RELEASE_CXXFLAGS='-Gy -MD'
-         DEBUG_CFLAGS='-Zi -MDd'
-         DEBUG_CXXFLAGS='-Zi -MDd'
-         DEBUG_LDFLAGS='-DEBUG'
-         ;;
+@@ -329,8 +329,6 @@ case $platform in
      *BSD)
          THE_OS="BSD"
          THE_COMP="the GNU C++"
 -        CC=gcc; export CC
 -        CXX=g++; export CXX
          DEBUG_CFLAGS='-g -O0'
-         DEBUG_CXFLAGS='-g -O0'
+         DEBUG_CXXFLAGS='-g -O0'
          ;;
-     TRU64V5.1/CXX)
-         THE_OS="OSF1"
-         THE_COMP="Compaq cxx"
-         CC=cc; export CC
-         CXX=cxx; export CXX
deleted file mode 100644
--- a/intl/icu-patches/bug-901348
+++ /dev/null
@@ -1,38 +0,0 @@
-# HG changeset patch
-# User Nomis101
-# Date 1380136873 -7200
-#      Wed Sep 25 21:21:13 2013 +0200
-# Node ID 2921e2256ba8a8ac1ca8b5b0e48eb04511545d41
-# Parent  39f30376058cf20823534f2d510430eaa31844bf
-Bug 901348 - [10.9] Duplicate symbol errors building --with-intl-api
-
-diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h
---- a/intl/icu/source/common/umutex.h
-+++ b/intl/icu/source/common/umutex.h
-@@ -43,26 +43,18 @@
- # define NOIME
- # define NOMCX
- # include <windows.h>
- #endif  /* 0 */
- #define U_WINDOWS_CRIT_SEC_SIZE 64
- #endif  /* win32 */
- 
- #if U_PLATFORM_IS_DARWIN_BASED
--#if defined(__STRICT_ANSI__)
--#define UPRV_REMAP_INLINE
--#define inline
--#endif
- #include <libkern/OSAtomic.h>
- #define USE_MAC_OS_ATOMIC_INCREMENT 1
--#if defined(UPRV_REMAP_INLINE)
--#undef inline
--#undef UPRV_REMAP_INLINE
--#endif
- #endif
- 
- /*
-  * If we do not compile with dynamic_annotations.h then define
-  * empty annotation macros.
-  *  See http://code.google.com/p/data-race-test/wiki/DynamicAnnotations
-  */
- #ifndef ANNOTATE_HAPPENS_BEFORE
new file mode 100644
--- /dev/null
+++ b/intl/icu-patches/genrb-omitCollationRules.diff
@@ -0,0 +1,136 @@
+diff --git a/intl/icu/source/tools/genrb/genrb.c b/intl/icu/source/tools/genrb/genrb.c
+--- a/intl/icu/source/tools/genrb/genrb.c
++++ b/intl/icu/source/tools/genrb/genrb.c
+@@ -1,7 +1,7 @@
+ /*
+ *******************************************************************************
+ *
+-*   Copyright (C) 1998-2012, International Business Machines
++*   Copyright (C) 1998-2014, International Business Machines
+ *   Corporation and others.  All Rights Reserved.
+ *
+ *******************************************************************************
+@@ -280,7 +280,7 @@
+         }
+     }
+ 
+-    initParser(options[NO_COLLATION_RULES].doesOccur);
++    initParser();
+ 
+     /*added by Jing*/
+     if(options[LANGUAGE].doesOccur) {
+@@ -557,7 +557,8 @@
+         printf("autodetected encoding %s\n", cp);
+     }
+     /* Parse the data into an SRBRoot */
+-    data = parse(ucbuf, inputDir, outputDir, !omitBinaryCollation, status);
++    data = parse(ucbuf, inputDir, outputDir,
++                 !omitBinaryCollation, options[NO_COLLATION_RULES].doesOccur, status);
+ 
+     if (data == NULL || U_FAILURE(*status)) {
+         fprintf(stderr, "couldn't parse the file %s. Error:%s\n", filename,u_errorName(*status));
+diff --git a/intl/icu/source/tools/genrb/parse.cpp b/intl/icu/source/tools/genrb/parse.cpp
+--- a/intl/icu/source/tools/genrb/parse.cpp
++++ b/intl/icu/source/tools/genrb/parse.cpp
+@@ -85,10 +85,9 @@
+     const char     *outputdir;
+     uint32_t        outputdirLength;
+     UBool           makeBinaryCollation;
++    UBool           omitCollationRules;
+ } ParseState;
+ 
+-static UBool gOmitCollationRules  = FALSE;
+-
+ typedef struct SResource *
+ ParseResourceFunction(ParseState* state, char *tag, uint32_t startline, const struct UString* comment, UErrorCode *status);
+ 
+@@ -323,7 +322,7 @@
+     }
+     uprv_strcat(filename, cs);
+ 
+-    if(gOmitCollationRules) {
++    if(state->omitCollationRules) {
+         return res_none();
+     }
+ 
+@@ -771,7 +770,7 @@
+     }
+ 
+     /* Parse the data into an SRBRoot */
+-    data = parse(ucbuf, genrbdata->inputDir, genrbdata->outputDir, FALSE, status);
++    data = parse(ucbuf, genrbdata->inputDir, genrbdata->outputDir, FALSE, FALSE, status);
+ 
+     root = data->fRoot;
+     collations = resLookup(root, "collations");
+@@ -1007,7 +1006,7 @@
+ #endif
+             /* in order to achieve smaller data files, we can direct genrb */
+             /* to omit collation rules */
+-            if(gOmitCollationRules) {
++            if(state->omitCollationRules) {
+                 bundle_closeString(state->bundle, member);
+             } else {
+                 table_add(result, member, line, status);
+@@ -1839,7 +1838,7 @@
+     {"reserved", NULL, NULL}
+ };
+ 
+-void initParser(UBool omitCollationRules)
++void initParser()
+ {
+     U_STRING_INIT(k_type_string,    "string",    6);
+     U_STRING_INIT(k_type_binary,    "binary",    6);
+@@ -1858,8 +1857,6 @@
+     U_STRING_INIT(k_type_plugin_collation,      "process(collation)",        18);
+     U_STRING_INIT(k_type_plugin_transliterator, "process(transliterator)",   23);
+     U_STRING_INIT(k_type_plugin_dependency,     "process(dependency)",       19);
+-
+-    gOmitCollationRules = omitCollationRules;
+ }
+ 
+ static inline UBool isTable(enum EResourceType type) {
+@@ -2039,8 +2036,8 @@
+ 
+ /* parse the top-level resource */
+ struct SRBRoot *
+-parse(UCHARBUF *buf, const char *inputDir, const char *outputDir, UBool makeBinaryCollation,
+-      UErrorCode *status)
++parse(UCHARBUF *buf, const char *inputDir, const char *outputDir,
++      UBool makeBinaryCollation, UBool omitCollationRules, UErrorCode *status)
+ {
+     struct UString    *tokenValue;
+     struct UString    comment;
+@@ -2064,6 +2061,7 @@
+     state.outputdir       = outputDir;
+     state.outputdirLength = (state.outputdir != NULL) ? (uint32_t)uprv_strlen(state.outputdir) : 0;
+     state.makeBinaryCollation = makeBinaryCollation;
++    state.omitCollationRules = omitCollationRules;
+ 
+     ustr_init(&comment);
+     expect(&state, TOK_STRING, &tokenValue, &comment, NULL, status);
+diff --git a/intl/icu/source/tools/genrb/parse.h b/intl/icu/source/tools/genrb/parse.h
+--- a/intl/icu/source/tools/genrb/parse.h
++++ b/intl/icu/source/tools/genrb/parse.h
+@@ -1,7 +1,7 @@
+ /*
+ *******************************************************************************
+ *
+-*   Copyright (C) 1998-2011, International Business Machines
++*   Copyright (C) 1998-2014, International Business Machines
+ *   Corporation and others.  All Rights Reserved.
+ *
+ *******************************************************************************
+@@ -24,11 +24,11 @@
+ 
+ U_CDECL_BEGIN
+ /* One time parser initalisation */
+-void initParser(UBool omitCollationRules);
++void initParser();
+ 
+ /* Parse a ResourceBundle text file */
+ struct SRBRoot* parse(UCHARBUF *buf, const char* inputDir, const char* outputDir,
+-                      UBool omitBinaryCollation, UErrorCode *status);
++                      UBool makeBinaryCollation, UBool omitCollationRules, UErrorCode *status);
+ 
+ U_CDECL_END
+ 
new file mode 100644
--- /dev/null
+++ b/intl/icu-patches/qualify-uinitonce-windows.diff
@@ -0,0 +1,22 @@
+diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h
+--- a/intl/icu/source/common/umutex.h
++++ b/intl/icu/source/common/umutex.h
+@@ -315,17 +315,17 @@ U_NAMESPACE_END
+ # define NOMCX
+ # ifndef NOMINMAX
+ # define NOMINMAX
+ # endif
+ # include <windows.h>
+ 
+ 
+ typedef struct UMutex {
+-    UInitOnce         fInitOnce;
++    icu::UInitOnce    fInitOnce;
+     CRITICAL_SECTION  fCS;
+ } UMutex;
+ 
+ /* Initializer for a static UMUTEX. Deliberately contains no value for the
+  *  CRITICAL_SECTION.
+  */
+ #define U_MUTEX_INITIALIZER {U_INITONCE_INITIALIZER}
+ 
deleted file mode 100644
--- a/intl/icu/APIChangeReport.html
+++ /dev/null
@@ -1,1457 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html><!--
-	 Copyright (C)  2012, International Business Machines Corporation, All Rights Reserved. 
-	-->
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>ICU4C API Comparison: 49 with 50 r32649M</title>
-<link type="text/css" href="icu4c.css" rel="stylesheet">
-</head>
-<body>
-<a name="#_top"></a>
-<h1>ICU4C API Comparison: 49 with 50 (r32649M)</h1>
-<div id="toc">
-<ul>
-<li>
-<a href="#removed">Removed from 49</a>
-</li>
-<li>
-<a href="#deprecated">Deprecated or Obsoleted in 50</a>
-</li>
-<li>
-<a href="#changed">Changed in  50</a>
-</li>
-<li>
-<a href="#promoted">Promoted to stable in 50</a>
-</li>
-<li>
-<a href="#added">Added in 50</a>
-</li>
-<li>
-<a href="#other">Other existing drafts in 50</a>
-</li>
-<li>
-<a href="#purevirtual">Signature Simplifications</a><sup style="background-color: yellow; font-size: smallest;">(new)</sup>
-</li>
-</ul>
-<hr>
-</div>
-<a name="removed"></a>
-<h2>Removed from 49</h2>
-<table BORDER="1" class="genTable">
-<THEAD>
-<tr>
-<th>File</th><th>API</th><th>49</th><th>50</th>
-</tr>
-</THEAD>
-<tr class="row1">
-<td class="file">coll.h</td><td class="proto">const Locale icu::Collator::getLocale(ULocDataLocaleType, UErrorCode&amp;)</td><td class="">Deprecated<br>3.0.</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">coll.h</td><td class="proto">uint32_t icu::Collator::setVariableTop(const UnicodeString, UErrorCode&amp;)</td><td class="stabchange">Stable<br>2.0</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">coll.h</td><td class="proto">void icu::Collator::setVariableTop(const uint32_t, UErrorCode&amp;)</td><td class="stabchange">Stable<br>2.0</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">plurfmt.h</td><td class="proto">void icu::PluralFormat::init(const PluralRules*, UErrorCode&amp;)</td><td class=""></td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">smpdtfmt.h</td><td class="proto">UnicodeString&amp; icu::SimpleDateFormat::format(Calendar&amp;, const UDateFormatContextType*, const UDateFormatContextValue*, int32_t, UnicodeString&amp;, FieldPosition&amp;)</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">smpdtfmt.h</td><td class="proto">int32_t icu::SimpleDateFormat::getDefaultContext(UDateFormatContextType, UErrorCode&amp;)</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">smpdtfmt.h</td><td class="proto">void icu::SimpleDateFormat::setDefaultContext(UDateFormatContextType, UDateFormatContextValue, UErrorCode&amp;)</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">Collator* icu::RuleBasedCollator::safeClone()</td><td class="stabchange">Stable<br>2.2</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tblcoll.h</td><td class="proto">ECollationStrength icu::RuleBasedCollator::getStrength()</td><td class="">Deprecated</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">EComparisonResult icu::RuleBasedCollator::compare(const UChar*, int32_t, const UChar*, int32_t)</td><td class="">Deprecated</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tblcoll.h</td><td class="proto">EComparisonResult icu::RuleBasedCollator::compare(const UnicodeString&amp;, const UnicodeString&amp;)</td><td class="">Deprecated</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">EComparisonResult icu::RuleBasedCollator::compare(const UnicodeString&amp;, const UnicodeString&amp;, int32_t)</td><td class="">Deprecated</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tblcoll.h</td><td class="proto">UBool icu::RuleBasedCollator::operator!=(const Collator&amp;)</td><td class="stabchange">Stable<br>2.0</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">const Locale icu::RuleBasedCollator::getLocale(ULocDataLocaleType, UErrorCode&amp;)</td><td class="">Deprecated</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tblcoll.h</td><td class="proto">uint32_t icu::RuleBasedCollator::setVariableTop(const UnicodeString, UErrorCode&amp;)</td><td class="stabchange">Stable<br>2.0</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">void icu::RuleBasedCollator::setStrength(ECollationStrength)</td><td class="">Deprecated</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tblcoll.h</td><td class="proto">void icu::RuleBasedCollator::setVariableTop(const uint32_t, UErrorCode&amp;)</td><td class="stabchange">Stable<br>2.0</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">int32_t icu::TimeZoneFormat::getDefaultParseOptions()</td><td class="">Internal</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">void icu::TimeZoneFormat::setDefaultParseOptions(int32_t)</td><td class="">Internal</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">uconfig.h</td><td class="proto"><tt>#define</tt> ICU_USE_THREADS</td><td class="">Internal</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">uconfig.h</td><td class="proto"><tt>#define</tt> UCONFIG_INTERNAL_DIGITLIST</td><td class="">Internal</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatContextType::UDAT_CAPITALIZATION</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatContextValue::UDAT_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatContextValue::UDAT_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatContextValue::UDAT_CAPITALIZATION_FOR_STANDALONE</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatContextValue::UDAT_CAPITALIZATION_FOR_UI_LIST_OR_MENU</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatContextValue::UDAT_CONTEXT_UNKNOWN</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto">int32_t udat_getDefaultContext(UDateFormat*, UDateFormatContextType, UErrorCode*)</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto">void udat_setDefaultContext(UDateFormat*, UDateFormatContextType, UDateFormatContextValue, UErrorCode*)</td><td class="">Draft<br>49</td><td>None<br>
-<span class=""><span></span></span></td>
-</tr>
-</table>
-<P></P>
-<a href="#_top">(jump back to top)</a>
-<hr>
-<a name="deprecated"></a>
-<h2>Deprecated or Obsoleted in 50</h2>
-<table BORDER="1" class="genTable">
-<THEAD>
-<tr>
-<th>File</th><th>API</th><th>49</th><th>50</th>
-</tr>
-</THEAD>
-<tr class="row1">
-<td class="file">coll.h</td><td class="proto">Collator* icu::Collator::safeClone()</td><td class="stabchange">Stable<br>2.2</td><td>Deprecated<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">coll.h</td><td class="proto">Locale icu::Collator::getLocale(ULocDataLocaleType, UErrorCode&amp;)</td><td class="">None</td><td>Deprecated<br>
-<span class=""><span>3.0.</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">plurfmt.h</td><td class="proto">void icu::PluralFormat::setLocale(const Locale&amp;, UErrorCode&amp;)</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">Locale icu::RuleBasedCollator::getLocale(ULocDataLocaleType, UErrorCode&amp;)</td><td class="">None</td><td>Deprecated<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">ucol.h</td><td class="proto"><tt>enum</tt> UColAttribute::UCOL_HIRAGANA_QUATERNARY_MODE</td><td class="stabchange">Stable<br>2.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_ABBR_STANDALONE_MONTH</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_HOUR_GENERIC_TZ</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_HOUR_MINUTE_GENERIC_TZ</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_HOUR_MINUTE_TZ</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_HOUR_TZ</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_STANDALONE_MONTH</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-</table>
-<P></P>
-<a href="#_top">(jump back to top)</a>
-<hr>
-<a name="changed"></a>
-<h2>Changed in  50 (old, new)</h2>
-<table BORDER="1" class="genTable">
-<THEAD>
-<tr>
-<th>File</th><th>API</th><th>49</th><th>50</th>
-</tr>
-</THEAD>
-<tr class="row1">
-<td class="file">coll.h</td><td class="proto">CollationKey&amp; icu::Collator::getCollationKey(const UChar*, int32_t, CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">coll.h</td><td class="proto">CollationKey&amp; icu::Collator::getCollationKey(const UnicodeString&amp;, CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">coll.h</td><td class="proto">Collator* icu::Collator::safeClone()</td><td class="stabchange">Stable<br>2.2</td><td>Deprecated<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">plurfmt.h</td><td class="proto">void icu::PluralFormat::setLocale(const Locale&amp;, UErrorCode&amp;)</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">UBool icu::CollationKey::isBogus()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">UBool icu::CollationKey::operator!=(const CollationKey&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">UBool icu::CollationKey::operator==(const CollationKey&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">UClassID icu::CollationKey::getDynamicClassID()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.2</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">UCollationResult icu::CollationKey::compareTo(const CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.6</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">const CollationKey&amp; icu::CollationKey::operator=(const CollationKey&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">const uint8_t* icu::CollationKey::getByteArray(int32_t&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">icu::CollationKey::CollationKey()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">icu::CollationKey::CollationKey(const CollationKey&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">icu::CollationKey::CollationKey(const uint8_t*, int32_t)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">icu::CollationKey::~CollationKey()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">int32_t icu::CollationKey::hashCode()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto"><tt>static</tt> UClassID icu::CollationKey::getStaticClassID()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.2</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">CollationKey&amp; icu::RuleBasedCollator::getCollationKey(const UChar*, int32_t, CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tblcoll.h</td><td class="proto">CollationKey&amp; icu::RuleBasedCollator::getCollationKey(const UnicodeString&amp;, CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">Format* icu::TimeZoneFormat::clone()</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">TimeZone* icu::TimeZoneFormat::parse(UTimeZoneFormatStyle, const UnicodeString&amp;, ParsePosition&amp;, UTimeZoneFormatTimeType*timeType=)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">TimeZone* icu::TimeZoneFormat::parse(UTimeZoneFormatStyle, const UnicodeString&amp;, ParsePosition&amp;, int32_t, UTimeZoneFormatTimeType*timeType=)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">TimeZoneFormat&amp; icu::TimeZoneFormat::operator=(const TimeZoneFormat&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">UBool icu::TimeZoneFormat::operator==(const Format&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">UClassID icu::TimeZoneFormat::getDynamicClassID()</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneFormat::format(UTimeZoneFormatStyle, const TimeZone&amp;, UDate, UnicodeString&amp;, UTimeZoneFormatTimeType*timeType=)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneFormat::format(const Formattable&amp;, UnicodeString&amp;, FieldPosition&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneFormat::formatOffsetISO8601(int32_t, UnicodeString&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneFormat::formatOffsetLocalizedGMT(int32_t, UnicodeString&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneFormat::formatOffsetRFC822(int32_t, UnicodeString&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneFormat::getGMTOffsetDigits(UnicodeString&amp;)</td><td class=""></td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneFormat::getGMTOffsetPattern(UTimeZoneFormatGMTOffsetPatternType, UnicodeString&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneFormat::getGMTPattern(UnicodeString&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneFormat::getGMTZeroFormat(UnicodeString&amp;)</td><td class=""></td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">const TimeZoneNames* icu::TimeZoneFormat::getTimeZoneNames()</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatGMTOffsetPatternType::UTZFMT_PAT_NEGATIVE_HMS</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatGMTOffsetPatternType::UTZFMT_PAT_NEGATIVE_HM</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatGMTOffsetPatternType::UTZFMT_PAT_POSITIVE_HMS</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatGMTOffsetPatternType::UTZFMT_PAT_POSITIVE_HM</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatParseOption::UTZFMT_PARSE_OPTION_ALL_STYLES</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatParseOption::UTZFMT_PARSE_OPTION_NONE</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatStyle::UTZFMT_STYLE_GENERIC_LOCATION</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatStyle::UTZFMT_STYLE_GENERIC_LONG</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatStyle::UTZFMT_STYLE_GENERIC_SHORT</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatStyle::UTZFMT_STYLE_ISO8601</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatStyle::UTZFMT_STYLE_LOCALIZED_GMT</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatStyle::UTZFMT_STYLE_RFC822</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatStyle::UTZFMT_STYLE_SPECIFIC_LONG</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatStyle::UTZFMT_STYLE_SPECIFIC_SHORT</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatTimeType::UTZFMT_TIME_TYPE_DAYLIGHT</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatTimeType::UTZFMT_TIME_TYPE_STANDARD</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>enum</tt> UTimeZoneFormatTimeType::UTZFMT_TIME_TYPE_UNKNOWN</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">icu::TimeZoneFormat::TimeZoneFormat(const TimeZoneFormat&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">icu::TimeZoneFormat::~TimeZoneFormat()</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">int32_t icu::TimeZoneFormat::parseOffsetISO8601(const UnicodeString&amp;, ParsePosition&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">int32_t icu::TimeZoneFormat::parseOffsetLocalizedGMT(const UnicodeString&amp;, ParsePosition&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">int32_t icu::TimeZoneFormat::parseOffsetRFC822(const UnicodeString&amp;, ParsePosition&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto"><tt>static</tt> TimeZoneFormat* icu::TimeZoneFormat::createInstance(const Locale&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto"><tt>static</tt> UClassID icu::TimeZoneFormat::getStaticClassID()</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">void icu::TimeZoneFormat::adoptTimeZoneNames(TimeZoneNames*)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">void icu::TimeZoneFormat::parseObject(const UnicodeString&amp;, Formattable&amp;, ParsePosition&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">void icu::TimeZoneFormat::setGMTOffsetDigits(const UnicodeString&amp;, UErrorCode&amp;)</td><td class=""></td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">void icu::TimeZoneFormat::setGMTOffsetPattern(UTimeZoneFormatGMTOffsetPatternType, const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">void icu::TimeZoneFormat::setGMTPattern(const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">void icu::TimeZoneFormat::setGMTZeroFormat(const UnicodeString&amp;, UErrorCode&amp;)</td><td class=""></td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">void icu::TimeZoneFormat::setTimeZoneNames(const TimeZoneNames&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">MatchInfoCollection* icu::TimeZoneNames::find(const UnicodeString&amp;, int32_t, uint32_t, UErrorCode&amp;)</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">StringEnumeration* icu::TimeZoneNames::getAvailableMetaZoneIDs(UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">StringEnumeration* icu::TimeZoneNames::getAvailableMetaZoneIDs(const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">TimeZoneNames* icu::TimeZoneNames::clone()</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">UBool icu::TimeZoneNames::MatchInfoCollection::getMetaZoneIDAt(int32_t, UnicodeString&amp;)</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">UBool icu::TimeZoneNames::MatchInfoCollection::getTimeZoneIDAt(int32_t, UnicodeString&amp;)</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">UBool icu::TimeZoneNames::operator!=(const TimeZoneNames&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">UBool icu::TimeZoneNames::operator==(const TimeZoneNames&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">UTimeZoneNameType icu::TimeZoneNames::MatchInfoCollection::getNameTypeAt(int32_t)</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneNames::getDisplayName(const UnicodeString&amp;, UTimeZoneNameType, UDate, UnicodeString&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneNames::getExemplarLocationName(const UnicodeString&amp;, UnicodeString&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneNames::getMetaZoneDisplayName(const UnicodeString&amp;, UTimeZoneNameType, UnicodeString&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneNames::getMetaZoneID(const UnicodeString&amp;, UDate, UnicodeString&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneNames::getReferenceZoneID(const UnicodeString&amp;, const char*, UnicodeString&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">UnicodeString&amp; icu::TimeZoneNames::getTimeZoneDisplayName(const UnicodeString&amp;, UTimeZoneNameType, UnicodeString&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto"><tt>enum</tt> UTimeZoneNameType::UTZNM_LONG_DAYLIGHT</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto"><tt>enum</tt> UTimeZoneNameType::UTZNM_LONG_GENERIC</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto"><tt>enum</tt> UTimeZoneNameType::UTZNM_LONG_STANDARD</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto"><tt>enum</tt> UTimeZoneNameType::UTZNM_SHORT_DAYLIGHT</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto"><tt>enum</tt> UTimeZoneNameType::UTZNM_SHORT_GENERIC</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto"><tt>enum</tt> UTimeZoneNameType::UTZNM_SHORT_STANDARD</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto"><tt>enum</tt> UTimeZoneNameType::UTZNM_UNKNOWN</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">icu::TimeZoneNames::MatchInfoCollection::MatchInfoCollection()</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">icu::TimeZoneNames::MatchInfoCollection::~MatchInfoCollection()</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">icu::TimeZoneNames::~TimeZoneNames()</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">int32_t icu::TimeZoneNames::MatchInfoCollection::getMatchLengthAt(int32_t)</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">int32_t icu::TimeZoneNames::MatchInfoCollection::size()</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto"><tt>static</tt> TimeZoneNames* icu::TimeZoneNames::createInstance(const Locale&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tznames.h</td><td class="proto">void icu::TimeZoneNames::MatchInfoCollection::addMetaZone(UTimeZoneNameType, int32_t, const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tznames.h</td><td class="proto">void icu::TimeZoneNames::MatchInfoCollection::addZone(UTimeZoneNameType, int32_t, const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">Internal</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_OTHER_PROPERTY_LIMIT</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>4.6</td>
-</tr>
-<tr class="row0">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_OTHER_PROPERTY_START</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>4.6</td>
-</tr>
-<tr class="row1">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_SCRIPT_EXTENSIONS</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>4.6</td>
-</tr>
-<tr class="row0">
-<td class="file">ucnv.h</td><td class="proto"><tt>enum</tt> UConverterType::UCNV_COMPOUND_TEXT</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>4.8</td>
-</tr>
-<tr class="row1">
-<td class="file">ucol.h</td><td class="proto"><tt>enum</tt> UColAttribute::UCOL_HIRAGANA_QUATERNARY_MODE</td><td class="stabchange">Stable<br>2.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">ucol.h</td><td class="proto"><tt>enum</tt> UColAttribute::UCOL_NUMERIC_COLLATION</td><td class="stabchange">Stable<br>2.0</td><td>Stable<br>
-<span class="verchange"><span>2.8</span>
-<br>
-<b class="bigwarn" title="A stable API changed version.">(changed)</b></span></td>
-</tr>
-<tr class="row1">
-<td class="file">uconfig.h</td><td class="proto"><tt>#define</tt> UCONFIG_FORMAT_FASTPATHS_49</td><td class=""></td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_ABBR_STANDALONE_MONTH</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_HOUR_GENERIC_TZ</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_HOUR_MINUTE_GENERIC_TZ</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_HOUR_MINUTE_TZ</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_HOUR_TZ</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_STANDALONE_MONTH</td><td class="stabchange">Stable<br>4.0</td><td>Deprecated<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatStyle::UDAT_IGNORE</td><td class="stabchange">Stable<br>2.6</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">unistr.h</td><td class="proto"><tt>#define</tt> U_STRING_CASE_MAPPER_DEFINED</td><td class=""></td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">ustring.h</td><td class="proto"><tt>#define</tt> UBRK_TYPEDEF_UBREAK_ITERATOR</td><td class="stabchange">Stable<br>2.1</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-</table>
-<P></P>
-<a href="#_top">(jump back to top)</a>
-<hr>
-<a name="promoted"></a>
-<h2>Promoted to stable in 50</h2>
-<table BORDER="1" class="genTable">
-<THEAD>
-<tr>
-<th>File</th><th>API</th><th>49</th><th>50</th>
-</tr>
-</THEAD>
-<tr class="row1">
-<td class="file">coll.h</td><td class="proto">CollationKey&amp; icu::Collator::getCollationKey(const UChar*, int32_t, CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">coll.h</td><td class="proto">CollationKey&amp; icu::Collator::getCollationKey(const UnicodeString&amp;, CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">coll.h</td><td class="proto">uint32_t icu::Collator::setVariableTop(const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">coll.h</td><td class="proto">void icu::Collator::setVariableTop(uint32_t, UErrorCode&amp;)</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">UBool icu::CollationKey::isBogus()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">UBool icu::CollationKey::operator!=(const CollationKey&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">UBool icu::CollationKey::operator==(const CollationKey&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">UClassID icu::CollationKey::getDynamicClassID()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.2</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">UCollationResult icu::CollationKey::compareTo(const CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.6</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">const CollationKey&amp; icu::CollationKey::operator=(const CollationKey&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">const uint8_t* icu::CollationKey::getByteArray(int32_t&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">icu::CollationKey::CollationKey()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">icu::CollationKey::CollationKey(const CollationKey&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">icu::CollationKey::CollationKey(const uint8_t*, int32_t)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto">icu::CollationKey::~CollationKey()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">sortkey.h</td><td class="proto">int32_t icu::CollationKey::hashCode()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">sortkey.h</td><td class="proto"><tt>static</tt> UClassID icu::CollationKey::getStaticClassID()</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.2</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">CollationKey&amp; icu::RuleBasedCollator::getCollationKey(const UChar*, int32_t, CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tblcoll.h</td><td class="proto">CollationKey&amp; icu::RuleBasedCollator::getCollationKey(const UnicodeString&amp;, CollationKey&amp;, UErrorCode&amp;)</td><td class="">Deprecated</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">uint32_t icu::RuleBasedCollator::setVariableTop(const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tblcoll.h</td><td class="proto">void icu::RuleBasedCollator::setVariableTop(uint32_t, UErrorCode&amp;)</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UGraphemeClusterBreak::U_GCB_REGIONAL_INDICATOR</td><td class="">None</td><td>Stable<br>
-<span class=""><span>3.4</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> ULineBreak::U_LB_REGIONAL_INDICATOR</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.2</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_OTHER_PROPERTY_LIMIT</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>4.6</td>
-</tr>
-<tr class="row1">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_OTHER_PROPERTY_START</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>4.6</td>
-</tr>
-<tr class="row0">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UProperty::UCHAR_SCRIPT_EXTENSIONS</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>4.6</td>
-</tr>
-<tr class="row1">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UWordBreakValues::U_WB_REGIONAL_INDICATOR</td><td class="">None</td><td>Stable<br>
-<span class=""><span>3.4</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">ucnv.h</td><td class="proto"><tt>enum</tt> UConverterType::UCNV_COMPOUND_TEXT</td><td class="" colspan="2" align="center">Draft&rarr;Stable<br>4.8</td>
-</tr>
-</table>
-<P></P>
-<a href="#_top">(jump back to top)</a>
-<hr>
-<a name="added"></a>
-<h2>Added in 50</h2>
-<table BORDER="1" class="genTable">
-<THEAD>
-<tr>
-<th>File</th><th>API</th><th>49</th><th>50</th>
-</tr>
-</THEAD>
-<tr class="row1">
-<td class="file">coll.h</td><td class="proto">Locale icu::Collator::getLocale(ULocDataLocaleType, UErrorCode&amp;)</td><td class="">None</td><td>Deprecated<br>
-<span class=""><span>3.0.</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">coll.h</td><td class="proto">uint32_t icu::Collator::setVariableTop(const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">coll.h</td><td class="proto">void icu::Collator::setVariableTop(uint32_t, UErrorCode&amp;)</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">decimfmt.h</td><td class="proto">DecimalFormat&amp; icu::DecimalFormat::setAttribute(UNumberFormatAttribute, int32_t, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">UBool icu::EnumSet&lt; T, minValue, limitValue &gt;::isValidEnum(T)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">decimfmt.h</td><td class="proto">UBool icu::EnumSet&lt; T, minValue, limitValue &gt;::isValidValue(int32_t)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">UnicodeString&amp; icu::DecimalFormat::format(double, UnicodeString&amp;, FieldPosition&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">decimfmt.h</td><td class="proto">UnicodeString&amp; icu::DecimalFormat::format(int32_t, UnicodeString&amp;, FieldPosition&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">UnicodeString&amp; icu::DecimalFormat::format(int64_t, UnicodeString&amp;, FieldPosition&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">decimfmt.h</td><td class="proto">const EnumSet&lt;T,minValue,limitValue&gt;&amp; icu::EnumSet&lt; T, minValue, limitValue &gt;::operator=(const EnumSet&lt;,, limitValue &gt;&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">icu::EnumSet&lt; T, minValue, limitValue &gt;::EnumSet()</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">decimfmt.h</td><td class="proto">icu::EnumSet&lt; T, minValue, limitValue &gt;::EnumSet(const EnumSet&lt;,, limitValue &gt;&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">icu::EnumSet&lt; T, minValue, limitValue &gt;::~EnumSet()</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">decimfmt.h</td><td class="proto">int32_t icu::DecimalFormat::getAttribute(UNumberFormatAttribute, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">int32_t icu::EnumSet&lt; T, minValue, limitValue &gt;::contains(T)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">decimfmt.h</td><td class="proto">int32_t icu::EnumSet&lt; T, minValue, limitValue &gt;::get(T)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">uint32_t icu::EnumSet&lt; T, minValue, limitValue &gt;::getAll()</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">decimfmt.h</td><td class="proto">void icu::EnumSet&lt; T, minValue, limitValue &gt;::add(T)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">void icu::EnumSet&lt; T, minValue, limitValue &gt;::clear()</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">decimfmt.h</td><td class="proto">void icu::EnumSet&lt; T, minValue, limitValue &gt;::remove(T)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">void icu::EnumSet&lt; T, minValue, limitValue &gt;::set(T, int32_t)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">fmtable.h</td><td class="proto">DigitList* icu::Formattable::getInternalDigitList()</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">gender.h</td><td class="proto">UGender icu::GenderInfo::getListGender(const UGender*, int32_t, UErrorCode&amp;)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">gender.h</td><td class="proto">icu::GenderInfo::~GenderInfo()</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">gender.h</td><td class="proto"><tt>static</tt> const GenderInfo* icu::GenderInfo::getInstance(const Locale&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">listformatter.h</td><td class="proto">UnicodeString&amp; icu::ListFormatter::format(const UnicodeString items[], int32_t, UnicodeString&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">listformatter.h</td><td class="proto">icu::ListFormatter::ListFormatter(const ListFormatData&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">listformatter.h</td><td class="proto">icu::ListFormatter::~ListFormatter()</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">listformatter.h</td><td class="proto"><tt>static</tt> ListFormatter* icu::ListFormatter::createInstance(UErrorCode&amp;)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">listformatter.h</td><td class="proto"><tt>static</tt> ListFormatter* icu::ListFormatter::createInstance(const Locale&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">listformatter.h</td><td class="proto"><tt>static</tt> void icu::ListFormatter::getFallbackLocale(const Locale&amp;, Locale&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">locdspnm.h</td><td class="proto">UDisplayContext icu::LocaleDisplayNames::getContext(UDisplayContextType)</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">locdspnm.h</td><td class="proto"><tt>static</tt> LocaleDisplayNames* icu::LocaleDisplayNames::createInstance(const Locale&amp;, UDisplayContext*, int32_t)</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">messagepattern.h</td><td class="proto"><tt>#define</tt> UMSGPAT_ARG_TYPE_HAS_PLURAL_STYLE</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">messagepattern.h</td><td class="proto"><tt>enum</tt> UMessagePatternArgType::UMSGPAT_ARG_TYPE_SELECTORDINAL</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">numfmt.h</td><td class="proto">UnicodeString&amp; icu::NumberFormat::format(double, UnicodeString&amp;, FieldPosition&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">numfmt.h</td><td class="proto">UnicodeString&amp; icu::NumberFormat::format(int32_t, UnicodeString&amp;, FieldPosition&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">numfmt.h</td><td class="proto">UnicodeString&amp; icu::NumberFormat::format(int64_t, UnicodeString&amp;, FieldPosition&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">platform.h</td><td class="proto"><tt>#define</tt> U_ALLOC_SIZE_ATTR2</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">platform.h</td><td class="proto"><tt>#define</tt> U_ALLOC_SIZE_ATTR</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">platform.h</td><td class="proto"><tt>#define</tt> U_GCC_MAJOR_MINOR</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">platform.h</td><td class="proto"><tt>#define</tt> U_MALLOC_ATTR</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">platform.h</td><td class="proto"><tt>#define</tt> __has_attribute</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">plurfmt.h</td><td class="proto">icu::PluralFormat::PluralFormat(const Locale&amp;, UPluralType, UErrorCode&amp;)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">plurfmt.h</td><td class="proto">icu::PluralFormat::PluralFormat(const Locale&amp;, UPluralType, const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">plurfmt.h</td><td class="proto">void icu::PluralFormat::init(const PluralRules*, UPluralType, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">plurrule.h</td><td class="proto"><tt>static</tt> PluralRules* icu::PluralRules::forLocale(const Locale&amp;, UPluralType, UErrorCode&amp;)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">smpdtfmt.h</td><td class="proto">UDisplayContext icu::SimpleDateFormat::getContext(UDisplayContextType, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">smpdtfmt.h</td><td class="proto">void icu::SimpleDateFormat::setContext(UDisplayContext, UErrorCode&amp;)</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">Locale icu::RuleBasedCollator::getLocale(ULocDataLocaleType, UErrorCode&amp;)</td><td class="">None</td><td>Deprecated<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tblcoll.h</td><td class="proto">uint32_t icu::RuleBasedCollator::setVariableTop(const UnicodeString&amp;, UErrorCode&amp;)</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tblcoll.h</td><td class="proto">void icu::RuleBasedCollator::setVariableTop(uint32_t, UErrorCode&amp;)</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.0</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">tzfmt.h</td><td class="proto">uint32_t icu::TimeZoneFormat::getDefaultParseOptions()</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">tzfmt.h</td><td class="proto">void icu::TimeZoneFormat::setDefaultParseOptions(uint32_t)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">ucal.h</td><td class="proto">UBool ucal_getTimeZoneTransitionDate(const UCalendar*, UTimeZoneTransitionType, UDate*, UErrorCode*)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">ucal.h</td><td class="proto"><tt>enum</tt> UTimeZoneTransitionType::UCAL_TZ_TRANSITION_NEXT_INCLUSIVE</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">ucal.h</td><td class="proto"><tt>enum</tt> UTimeZoneTransitionType::UCAL_TZ_TRANSITION_NEXT</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">ucal.h</td><td class="proto"><tt>enum</tt> UTimeZoneTransitionType::UCAL_TZ_TRANSITION_PREVIOUS_INCLUSIVE</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">ucal.h</td><td class="proto"><tt>enum</tt> UTimeZoneTransitionType::UCAL_TZ_TRANSITION_PREVIOUS</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UGraphemeClusterBreak::U_GCB_REGIONAL_INDICATOR</td><td class="">None</td><td>Stable<br>
-<span class=""><span>3.4</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> ULineBreak::U_LB_REGIONAL_INDICATOR</td><td class="">None</td><td>Stable<br>
-<span class=""><span>2.2</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">uchar.h</td><td class="proto"><tt>enum</tt> UWordBreakValues::U_WB_REGIONAL_INDICATOR</td><td class="">None</td><td>Stable<br>
-<span class=""><span>3.4</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">ucol.h</td><td class="proto">UCollationResult ucol_strcollUTF8(const UCollator*, const char*, int32_t, const char*, int32_t, UErrorCode*)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_ABBR_GENERIC_TZ</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_ABBR_QUARTER</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_ABBR_SPECIFIC_TZ</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_ABBR_UTC_TZ</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_ABBR_WEEKDAY</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_GENERIC_TZ</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_HOUR24</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_LOCATION_TZ</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_MINUTE</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_QUARTER</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_SECOND</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_SPECIFIC_TZ</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>#define</tt> UDAT_WEEKDAY</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto">UDisplayContext udat_getContext(UDateFormat*, UDisplayContextType, UErrorCode*)</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatStyle::UDAT_PATTERN</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udat.h</td><td class="proto">void udat_setContext(UDateFormat*, UDisplayContext, UErrorCode*)</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContext::UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContext::UDISPCTX_CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContext::UDISPCTX_CAPITALIZATION_FOR_STANDALONE</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContext::UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContext::UDISPCTX_CAPITALIZATION_NONE</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContext::UDISPCTX_DIALECT_NAMES</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContext::UDISPCTX_STANDARD_NAMES</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContextType::UDISPCTX_TYPE_CAPITALIZATION</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">udisplaycontext.h</td><td class="proto"><tt>enum</tt> UDisplayContextType::UDISPCTX_TYPE_DIALECT_HANDLING</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">uenum.h</td><td class="proto">UEnumeration* uenum_openCharStringsEnumeration(const char*const strings[], int32_t, UErrorCode*)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">uenum.h</td><td class="proto">UEnumeration* uenum_openUCharStringsEnumeration(const UChar*const strings[], int32_t, UErrorCode*)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">ugender.h</td><td class="proto">UGender ugender_getListGender(const UGenderInfo*, const UGender*, int32_t, UErrorCode*)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">ugender.h</td><td class="proto">const UGenderInfo* ugender_getInstance(const char*, UErrorCode*)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">ugender.h</td><td class="proto"><tt>enum</tt> UGender::UGENDER_FEMALE</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">ugender.h</td><td class="proto"><tt>enum</tt> UGender::UGENDER_MALE</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">ugender.h</td><td class="proto"><tt>enum</tt> UGender::UGENDER_OTHER</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">uldnames.h</td><td class="proto">UDisplayContext uldn_getContext(const ULocaleDisplayNames*, UDisplayContextType, UErrorCode*)</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">uldnames.h</td><td class="proto">ULocaleDisplayNames* uldn_openForContext(const char*, UDisplayContext*, int32_t, UErrorCode*)</td><td class="">None</td><td>Internal<br>
-<span class=""><span></span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">unum.h</td><td class="proto"><tt>enum</tt> UNumberFormatAttribute::UNUM_FORMAT_FAIL_IF_MORE_THAN_MAX_DIGITS</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">unum.h</td><td class="proto"><tt>enum</tt> UNumberFormatAttribute::UNUM_LIMIT_BOOLEAN_ATTRIBUTE</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">unum.h</td><td class="proto"><tt>enum</tt> UNumberFormatAttribute::UNUM_MAX_NONBOOLEAN_ATTRIBUTE</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row1">
-<td class="file">unum.h</td><td class="proto"><tt>enum</tt> UNumberFormatAttribute::UNUM_NUMERIC_ATTRIBUTE_COUNT</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">unum.h</td><td class="proto"><tt>enum</tt> UNumberFormatAttribute::UNUM_PARSE_NO_EXPONENT</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">upluralrules.h</td><td class="proto">UPluralRules* uplrules_openForType(const char*, UPluralType, UErrorCode*)</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">upluralrules.h</td><td class="proto"><tt>enum</tt> UPluralType::UPLURAL_TYPE_CARDINAL</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">upluralrules.h</td><td class="proto"><tt>enum</tt> UPluralType::UPLURAL_TYPE_COUNT</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row0">
-<td class="file">upluralrules.h</td><td class="proto"><tt>enum</tt> UPluralType::UPLURAL_TYPE_ORDINAL</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-<tr class="row1">
-<td class="file">utf8.h</td><td class="proto"><tt>#define</tt> U8_COUNT_TRAIL_BYTES_UNSAFE</td><td class="">None</td><td>Internal<br>
-<span class=""></span></td>
-</tr>
-<tr class="row0">
-<td class="file">utrace.h</td><td class="proto"><tt>enum</tt> UTraceFunctionNumber::UTRACE_UCOL_STRCOLLUTF8</td><td class="">None</td><td>Draft<br>
-<span class=""><span>50</span></span></td>
-</tr>
-</table>
-<P></P>
-<a href="#_top">(jump back to top)</a>
-<hr>
-<a name="other"></a>
-<h2>Other existing drafts in 50</h2>
-<div class="other">
-<table BORDER="1" class="genTable">
-<THEAD>
-<tr>
-<th>File</th><th>API</th><th>49</th><th>50</th>
-</tr>
-</THEAD>
-<tr class="row1">
-<td class="file">brkiter.h</td><td class="proto">BreakIterator&amp; icu::BreakIterator::refreshInputText(UText*, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">calendar.h</td><td class="proto">UCalendarWallTimeOption icu::Calendar::getRepeatedWallTimeOption()</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">calendar.h</td><td class="proto">UCalendarWallTimeOption icu::Calendar::getSkippedWallTimeOption()</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">calendar.h</td><td class="proto">const char* icu::Calendar::getType()</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">calendar.h</td><td class="proto">void icu::Calendar::setRepeatedWallTimeOption(UCalendarWallTimeOption)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">calendar.h</td><td class="proto">void icu::Calendar::setSkippedWallTimeOption(UCalendarWallTimeOption)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">decimfmt.h</td><td class="proto">CurrencyAmount* icu::DecimalFormat::parseCurrency(const UnicodeString&amp;, ParsePosition&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">gregocal.h</td><td class="proto">const char* icu::GregorianCalendar::getType()</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">icudataver.h</td><td class="proto"><tt>#define</tt> U_ICU_DATA_KEY</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">icudataver.h</td><td class="proto"><tt>#define</tt> U_ICU_VERSION_BUNDLE</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">icudataver.h</td><td class="proto">void u_getDataVersion(UVersionInfo, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">locid.h</td><td class="proto">void icu::Locale::setKeywordValue(const char*, const char*, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">normalizer2.h</td><td class="proto">UBool icu::FilteredNormalizer2::getRawDecomposition(UChar32, UnicodeString&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">normalizer2.h</td><td class="proto">UBool icu::Normalizer2::getRawDecomposition(UChar32, UnicodeString&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">normalizer2.h</td><td class="proto">UChar32 icu::FilteredNormalizer2::composePair(UChar32, UChar32)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">normalizer2.h</td><td class="proto">UChar32 icu::Normalizer2::composePair(UChar32, UChar32)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">normalizer2.h</td><td class="proto"><tt>static</tt> const Normalizer2* icu::Normalizer2::getNFCInstance(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">normalizer2.h</td><td class="proto"><tt>static</tt> const Normalizer2* icu::Normalizer2::getNFDInstance(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">normalizer2.h</td><td class="proto"><tt>static</tt> const Normalizer2* icu::Normalizer2::getNFKCCasefoldInstance(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">normalizer2.h</td><td class="proto"><tt>static</tt> const Normalizer2* icu::Normalizer2::getNFKCInstance(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">normalizer2.h</td><td class="proto"><tt>static</tt> const Normalizer2* icu::Normalizer2::getNFKDInstance(UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">normalizer2.h</td><td class="proto">uint8_t icu::FilteredNormalizer2::getCombiningClass(UChar32)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">normalizer2.h</td><td class="proto">uint8_t icu::Normalizer2::getCombiningClass(UChar32)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">numfmt.h</td><td class="proto">CurrencyAmount* icu::NumberFormat::parseCurrency(const UnicodeString&amp;, ParsePosition&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">numsys.h</td><td class="proto">const char* icu::NumberingSystem::getName()</td><td class="" colspan="2" align="center">Draft<br>4.6</td>
-</tr>
-<tr class="row0">
-<td class="file">rbbi.h</td><td class="proto">RuleBasedBreakIterator&amp; icu::RuleBasedBreakIterator::refreshInputText(UText*, UErrorCode&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">rbnf.h</td><td class="proto">void icu::RuleBasedNumberFormat::adoptDecimalFormatSymbols(DecimalFormatSymbols*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">rbnf.h</td><td class="proto">void icu::RuleBasedNumberFormat::setDecimalFormatSymbols(const DecimalFormatSymbols&amp;)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">timezone.h</td><td class="proto"><tt>static</tt> const TimeZone&amp; icu::TimeZone::getUnknown()</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">ubrk.h</td><td class="proto">void ubrk_refreshUText(UBreakIterator*, UText*, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">ucal.h</td><td class="proto"><tt>enum</tt> UCalendarAttribute::UCAL_REPEATED_WALL_TIME</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">ucal.h</td><td class="proto"><tt>enum</tt> UCalendarAttribute::UCAL_SKIPPED_WALL_TIME</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">ucal.h</td><td class="proto"><tt>enum</tt> UCalendarWallTimeOption::UCAL_WALLTIME_FIRST</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">ucal.h</td><td class="proto"><tt>enum</tt> UCalendarWallTimeOption::UCAL_WALLTIME_LAST</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">ucal.h</td><td class="proto"><tt>enum</tt> UCalendarWallTimeOption::UCAL_WALLTIME_NEXT_VALID</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">uconfig.h</td><td class="proto"><tt>#define</tt> U_NO_DEFAULT_INCLUDE_UTF_HEADERS</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">ucurr.h</td><td class="proto">int32_t ucurr_getNumericCode(const UChar*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">udat.h</td><td class="proto"><tt>enum</tt> UDateFormatField::UDAT_YEAR_NAME_FIELD</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">uidna.h</td><td class="proto"><tt>enum</tt> (anonymous)::UIDNA_CHECK_CONTEXTO</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">uidna.h</td><td class="proto"><tt>enum</tt> (anonymous)::UIDNA_ERROR_CONTEXTO_DIGITS</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">uidna.h</td><td class="proto"><tt>enum</tt> (anonymous)::UIDNA_ERROR_CONTEXTO_PUNCTUATION</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">unistr.h</td><td class="proto"><tt>#define</tt> UNISTR_FROM_CHAR_EXPLICIT</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">unistr.h</td><td class="proto"><tt>#define</tt> UNISTR_FROM_STRING_EXPLICIT</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">unorm2.h</td><td class="proto">UChar32 unorm2_composePair(const UNormalizer2*, UChar32, UChar32)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">unorm2.h</td><td class="proto">const UNormalizer2* unorm2_getNFCInstance(UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">unorm2.h</td><td class="proto">const UNormalizer2* unorm2_getNFDInstance(UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">unorm2.h</td><td class="proto">const UNormalizer2* unorm2_getNFKCCasefoldInstance(UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">unorm2.h</td><td class="proto">const UNormalizer2* unorm2_getNFKCInstance(UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">unorm2.h</td><td class="proto">const UNormalizer2* unorm2_getNFKDInstance(UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">unorm2.h</td><td class="proto">int32_t unorm2_getRawDecomposition(const UNormalizer2*, UChar32, UChar*, int32_t, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">unorm2.h</td><td class="proto">uint8_t unorm2_getCombiningClass(const UNormalizer2*, UChar32)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">uregex.h</td><td class="proto"><tt>enum</tt> URegexpFlag::UREGEX_CANON_EQ</td><td class="" colspan="2" align="center">Draft<br>2.4</td>
-</tr>
-<tr class="row1">
-<td class="file">uscript.h</td><td class="proto">UBool uscript_hasScript(UChar32, UScriptCode)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">uscript.h</td><td class="proto">int32_t uscript_getScriptExtensions(UChar32, UScriptCode*, int32_t, UErrorCode*)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">ustdio.h</td><td class="proto">UFILE* u_get_stdout()</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row0">
-<td class="file">ustdio.h</td><td class="proto">int32_t u_printf(const char*,...)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-<tr class="row1">
-<td class="file">ustdio.h</td><td class="proto">int32_t u_printf_u(const UChar*,...)</td><td class="" colspan="2" align="center">Draft<br>49</td>
-</tr>
-</table>
-</div>
-<P></P>
-<a href="#_top">(jump back to top)</a>
-<hr>
-<a name="purevirtual"></a>
-<h2>Signature Simplifications</h2>
-<i>This section shows cases where the signature was "simplified" for the sake of comparison. The simplified form is in bold, followed by
-    	all possible variations in "original" form.</i>
-<div class="other">
-<ul>
-<li>
-<b>Collator* icu::Collator::safeClone()</b>
-<br>Collator* icu::Collator::safeClone() const<br>Collator* icu::Collator::safeClone()=0<br>
-</li>
-<li>
-<b>ECollationStrength icu::Collator::getStrength()</b>
-<br>ECollationStrength icu::Collator::getStrength() const<br>ECollationStrength icu::Collator::getStrength() const=0<br>
-</li>
-<li>
-<b>UColAttributeValue icu::Collator::getAttribute(UColAttribute, UErrorCode&amp;)</b>
-<br>UColAttributeValue icu::Collator::getAttribute(UColAttribute, UErrorCode&amp;) const=0<br>UColAttributeValue icu::Collator::getAttribute(UColAttribute, UErrorCode&amp;)=0<br>
-</li>
-</ul>
-</div>
-<P></P>
-<a href="#_top">(jump back to top)</a>
-<hr>
-<p>
-<i><font size="-1">Contents generated by StableAPI (r32649M) tool on Wed Oct 17 17:01:17 PDT 2012<br>Copyright (C) 2012, International Business Machines Corporation, All Rights Reserved.</font></i>
-</p>
-</body>
-</html>
--- a/intl/icu/SVN-INFO
+++ b/intl/icu/SVN-INFO
@@ -1,10 +1,9 @@
-Path: release-50-1-2
-URL: http://source.icu-project.org/repos/icu/icu/tags/release-50-1-2
+Path: release-52-1
+URL: http://source.icu-project.org/repos/icu/icu/tags/release-52-1
 Repository Root: http://source.icu-project.org/repos/icu
 Repository UUID: 251d0590-4201-4cf1-90de-194747b24ca1
-Revision: 33305
 Node Kind: directory
-Last Changed Author: mow
-Last Changed Rev: 33098
-Last Changed Date: 2013-01-30 15:54:50 -0800 (Wed, 30 Jan 2013)
+Last Changed Author: srl
+Last Changed Rev: 34523
+Last Changed Date: 2013-10-07 20:40:18 +0000 (Mon, 07 Oct 2013)
 
deleted file mode 100644
--- a/intl/icu/as_is/bomlist.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/python
-
-# Copyright (C) 2011 IBM Corporation and Others. All Rights Reserved.
-#
-# run in icu/
-# will create file icu/as_is/bomlist.txt
-#
-# Usage: 
-#   ( python as_is/bomlist.py > as_is/bomlist.txt ) || rm -f as_is/bomlist.txt
-
-import os
-import codecs
-
-tree = os.walk(".")
-
-nots=0
-notutf8=0
-noprops=0
-utf8=0
-fixed=0
-tfiles=0
-bom=codecs.BOM_UTF8
-
-
-for ent in tree:
-    (path,dirs,files) = ent
-    if(path.find("/.svn") != -1):
-        continue
-    for file in files:
-        tfiles=tfiles+1
-        fp = (path + "/" + file)
-        if not os.path.isfile(fp):
-            continue
-        f = open(fp, 'rb')
-        bytes=f.read(3)
-        if bytes and (bytes == bom):
-            print 'icu/'+fp[2::]
-        f.close()
deleted file mode 100644
--- a/intl/icu/as_is/os390/unpax-icu.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2001-2010, International Business Machines
-#   Corporation and others.  All Rights Reserved.
-#
-# Authors:
-# Ami Fixler
-# Steven R. Loomis
-# George Rhoten
-#
-# Shell script to unpax ICU and convert the files to an EBCDIC codepage.
-# After extracting to EBCDIC, binary files are re-extracted without the
-# EBCDIC conversion, thus restoring them to original codepage.
-#
-# Set the following variable to the list of binary file suffixes (extensions)
-
-#binary_suffixes='ico ICO bmp BMP jpg JPG gif GIF brk BRK'
-#ICU specific binary files
-binary_suffixes='brk BRK bin BIN res RES cnv CNV dat DAT icu ICU spp SPP xml XML nrm NRM'
-
-usage()
-{
-    echo "Enter archive filename as a parameter: $0 icu-archive.tar"
-}
-# first make sure we at least one arg and it's a file we can read
-if [ $# -eq 0 ]; then
-    usage
-    exit
-fi
-tar_file=$1
-if [ ! -r $tar_file ]; then
-    echo "$tar_file does not exist or cannot be read."
-    usage
-    exit
-fi
-
-echo ""
-echo "Extracting from $tar_file ..."
-echo ""
-# extract files while converting them to EBCDIC
-pax -rvf $tar_file -o to=IBM-1047,from=ISO8859-1 -o setfiletag
-
-echo ""
-echo "Determining binary files ..."
-echo ""
-
-# When building in ASCII mode, text files are converted as ASCII
-if [ "${ICU_ENABLE_ASCII_STRINGS}" -eq 1 ]; then
-    binary_suffixes="$binary_suffixes txt TXT ucm UCM"
-else
-	for file in `find ./icu \( -name \*.txt -print \) | sed -e 's/^\.\///'`; do
-		bom8=`head -c 3 $file|\
-			od -t x1|\
-			head -n 1|\
-			sed 's/  */ /g'|\
-			cut -f2-4 -d ' '|\
-			tr 'A-Z' 'a-z'`;
-		#Find a converted UTF-8 BOM
-		if [ "$bom8" = "57 8b ab" ]
-		then
-			binary_files="$binary_files $file";
-		fi
-	done
-fi
-
-for i in $(pax -f $tar_file 2>/dev/null)
-do
-	case $i in
-	*/) ;;		# then this entry is a directory
-	*.*)		# then this entry has a dot in the filename
-		for j in $binary_suffixes
-		do
-			# We substitute the suffix more than once
-			# to handle files like NormalizationTest-3.2.0.txt
-			suf=${i#*.*}
-			suf=${suf#*.*}
-			suf=${suf#*.*}
-			if [ "$suf" = "$j" ]
-			then
-				binary_files="$binary_files $i"
-				break
-			fi
-		done
-		;;
-	*) ;;		# then this entry does not have a dot in it
-    esac
-done
-
-# now see if a re-extract of binary files is necessary
-if [ ${#binary_files} -eq 0 ]; then
-    echo ""
-    echo "There are no binary files to restore."
-else
-    echo "Restoring binary files ..."
-    echo ""
-    rm $binary_files
-    pax -rvf $tar_file $binary_files
-    # Tag the files as binary for proper interaction with the _BPXK_AUTOCVT
-    # environment setting
-    chtag -b $binary_files
-fi
-echo ""
-echo "$0 has completed extracting ICU from $tar_file."
deleted file mode 100644
--- a/intl/icu/as_is/os400/bldiculd.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#  /* Copyright (C) 2011-2012 IBM Corporation and Others. All Rights Reserved */
-icc -o iculd iculd.c
-icc -o cxxfilt cxxfilt.cpp
-
-
deleted file mode 100644
--- a/intl/icu/as_is/os400/convertConfigure.sed
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2006-2011, International Business Machines Corporation
-# and others.  All Rights Reserved.
-#
-# Use "test -x" instead of "test -f" most of the time.
-# due to how executables are created in a different file system.
-s/as_executable_p="test -f"/as_executable_p="test -x"/g
-s/test -f "$ac_file"/test -x "$ac_file"/g
-s/test -f $ac_dir\/install-sh/test -x $ac_dir\/install-sh/g
-s/test -f $ac_dir\/install.sh/test -x $ac_dir\/install.sh/g
-s/test -f $ac_dir\/shtool/test -x $ac_dir\/shtool/g
-# Use the more efficient del instead of rm command.
-s/rm[ ]*-r[ ]*-f/del -f/g
-s/rm[ ]*-f[ ]*-r/del -f/g
-s/rm[ ]*-rf/del -f/g
-s/rm[ ]*-fr/del -f/g
-s/rm[ ]*-f/del -f/g
-##don't clean up some awks for debugging
-#s/[ ]*del -f [^ ]*.awk/#&/
-# Borne shell isn't always available on i5/OS
-s/\/bin\/sh/\/usr\/bin\/qsh/g
-# no diff in qsh the equivalent is cmp
-s/ diff / cmp -s /g
-## srl
-# trouble w/ redirects.
-s% >&$3%%g
-s% >&$4% >$4%g
-s%^ac_cr=%# AWK reads ASCII, not EBCDIC\
-touch -C 819 $tmp/defines.awk $tmp/subs.awk $tmp/subs1.awk conf$$subs.awk\
-\
-&%
-##OBSOLETE
-#(REPLACED BY CPP in runConfigureICU) Use -c qpponly instead of -E to enable the preprocessor on the compiler
-#s/\$CC -E/\$CC -c -qpponly/g
deleted file mode 100644
--- a/intl/icu/as_is/os400/cxxfilt.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 2012 IBM Corporation and Others. All Rights Reserved */
-
-#include <stdio.h>
-#include <demangle.h>
-
-void showSym(char *str) {
-  char *rest;
-  struct Name *name = Demangle(str, rest); // "f__1XFi"
-
-  printf("# '%s'\n", str);
-  if(*rest) printf("\trest: '%s'\n", rest);
-  if(name->Kind() == MemberFunction) {
-    //((MemberFunctionName *) name)->Scope()->Text() is "X"
-    //((MemberFunctionName *) name)->RootName() is "f"
-    //((MemberFunctionName *) name)->Text() is "X::f(int)"
-    printf("\t=> %s\n", ((MemberFunctionName *) name)->Text());
-  } else {
-    printf("\t(not MemberFunction)\n");
-  }
-}
-
-
-
-
-
-int main(int argc, /*const*/ char *argv[]) {
-  if(argc>1) {
-    for(int i=1;i<argc;i++) {
-       showSym(argv[i]);
-    }
-  } else {
-    printf("Usage: %s <symbol> ...\n", argv[0]);
-  }
-
-
-
-}
deleted file mode 100644
--- a/intl/icu/as_is/os400/fixup-icu.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/qsh
-#   Copyright (C) 2000-2011, International Business Machines
-#   Corporation and others.  All Rights Reserved.
-#
-# Authors:
-# Ami Fixler
-# Barry Novinger
-# Steven R. Loomis
-# George Rhoten
-# Jason Spieth
-#
-#
-# This script detects if any UTF-8 files were incorrectly converted to EBCDIC, and 
-# converts them back.
-
-if [ -z "$QSH_VERSION" ];
-then
-	QSH=0
-    echo "QSH not detected (QSH_VERSION not set) - just testing."
-else
-	QSH=1
-	#echo "QSH version $QSH_VERSION"
-fi
-export QSH
-
-tar_file=$1
-echo ""
-echo "Determining binary files by BOM ..."
-echo ""
-bin_count=0
-binary_files=""
-# Process BOMs
-   for file in `find ./icu/source/data/unidata \( -name \*.txt -print \)`; do
-    bom8=`od -t x1 -N 3 $file|\
-          head -n 1|\
-          cut -c10-18`;
-    #Find a converted UTF-8 BOM
-    echo "file $file bom /${bom8}/"
-    if [ "$bom8" = "57 8b ab" ]
-    then
-        file="`echo $file | cut -d / -f2-`"
-        echo "converting ${file}"
-        if [ `echo $binary_files | wc -w` -lt 200 ]
-        then
-            bin_count=`expr $bin_count + 1`
-            binary_files="$binary_files $file";
-        else
-            echo "Restoring binary files by BOM ($bin_count)..."
-            rm $binary_files;
-            pax -C 819 -rvf $tar_file $binary_files;
-            echo "Determining binary files by BOM ($bin_count)..."
-            binary_files="$file";
-            bin_count=`expr $bin_count + 1`
-        fi
-    fi
-  done
-    if [ `echo $binary_files | wc -w` -gt 0 ]
-      then
-        echo restoring
-        rm $binary_files
-               pax -C 819 -rvf $tar_file $binary_files
-       fi
-
-
-
deleted file mode 100644
--- a/intl/icu/as_is/os400/iculd.c
+++ /dev/null
@@ -1,249 +0,0 @@
-/* Copyright (C) 2011 IBM Corporation and Others. All Rights Reserved */
-
-/**
-   Input:
-       -o makeconv  makeconv.o ucnvstat.o ../../lib/libicuuc48.so -qOPTION='*DUPPROC *DUPVAR*'
-
-CRTPGM PGM(SRLICU/MAKECONV) MODULE(SRLICU/MAKECONV  SRLICU/UCNVSTAT SRLICU/GENMBCS SRLICU/GENCNVEX) BNDSRVPGM(SRLICU/LIBICUUC48 SRLICU/LIBICUTU48 SRLICU/LIBICUIN48) OPTION(*DUPPROC *DUPVAR) REPLACE(*YES) 
-
-Handles  .o ( modules ), .so ( srvpgm ), .a ( bnddir ).
-
-TODO:
-
- - cleanup
- - much better error handling
- - factor common code
- - instead of caring about .o vs .so vs .a, just read the link - if it ends in .srvpgm then treat it as a service program, etc.  
-
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#ifndef TEST_MODE
-#define TEST_MODE 0
-#endif
-
-
-#if !TEST_MODE
-#include <qp0z1170.h>
-#else
-static int Qp0zSystem(const char *cmd) {
-  printf("CL: %s\n", cmd);
-  return 0;
-}
-#endif
-
-static int runcmd(const char *cmd) {
-  int rc;
-  printf("%s\n", cmd);
-  rc = Qp0zSystem(cmd);
-  if(rc==0) {
-    printf("..ok\n");
-    return 0;
-  } else if(rc<0){
-    printf("..Qp0zSystem failed.\n");
-    return 1;
-  } else {
-    printf("..System call failed.\n");
-    return 1;
-  }
-}
-
-int main(int argc, const char *argv[]) {
-  int i;
-
-  char buf[8048];
-  char opt[4100];
-  char objs[4024];
-  char libs[4024];
-  char bnddirs[4024];
-  const char *prog="";
-  const char *progshort=prog;
-  const char *outputdir=getenv("OUTPUTDIR");
-
-  printf("# OUTPUTDIR=%s ",outputdir);
-  for(i=0;i<argc;i++) {
-    printf("%s ", argv[i]);
-  }
-  printf("\n");
-
-  buf[0]=0;
-  opt[0]=0;
-  objs[0]=0;
-  libs[0]=0;
-  bnddirs[0]=0;
-
-  for(i=1;i<argc;i++) {
-    if(argv[i][0]=='-') {
-      switch(argv[i][1]) {
-      case 'O':
-        printf(".. ignoring optimization: %s\n", argv[i]);
-        break;
-      case 'g':
-        printf(".. ignoring debugging: %s\n", argv[i]);
-        break;
-      case 'l':
-        printf(".. ignoring lib: %s\n", argv[i]);
-        break;
-      case 'v':
-        printf(".. already verbose\n");
-        break;
-      case 'o':
-        i++;
-        prog=argv[i];
-        progshort=strrchr(prog,'/');
-        if(!progshort) {
-          progshort=prog;
-        } else {
-          progshort++; /*  / */
-        }
-        break;
-      case 'q':
-        if(!strncmp(argv[i]+2,"OPTION=",7)) {
-          strcat(opt,argv[i]+9);
-        } else {
-          printf("Unknown -q option: %s\n", argv[i]);
-          return 1;
-        }
-        break;
-      default:
-        printf("Unknown option: %s\n", argv[i]);
-        return 1;
-      }
-    } else {
-      int n = strlen(argv[i]);
-      if(argv[i][n-1]=='o' &&
-         argv[i][n-2]=='.') {
-        const char *b = argv[i];
-        char linkbuf[200];
-        char outbuf[100];
-        int nlen = n-2;
-
-        if(nlen >= 10) {
-          nlen = 10;
-        }
-
-        if(readlink(b,linkbuf,200)>0) {
-          /* printf("linkbuf %s for %s\n", linkbuf, b); */
-          /* /qsys.lib/srlicu.lib/currtest.module */
-          char *mend = strrchr(linkbuf,'.');  
-          if(mend) {
-            *mend=0;
-            mend = strrchr(linkbuf,'/');
-            if(mend) {
-              mend++;
-              strcpy(outbuf,mend);
-              b=outbuf;
-              nlen=strlen(b);
-            }
-          }
-        } else {
-          /* perror("readlink");
-             puts(b); */
-        }
-
-        strcat(objs,outputdir);
-        strcat(objs,"/");
-        strncat(objs,b,nlen);
-        strcat(objs, " ");
-      } else if(argv[i][n-1]=='a' &&
-         argv[i][n-2]=='.') {
-        const char *b = argv[i];
-        char linkbuf[200];
-        char outbuf[100];
-        int nlen = n-2;
-
-        if(nlen >= 10) {
-          nlen = 10;
-        }
-
-        if(readlink(b,linkbuf,200)>0) {
-          /* printf("linkbuf %s for %s\n", linkbuf, b); */
-          /* /qsys.lib/srlicu.lib/currtest.srvpgm */
-          char *mend = strrchr(linkbuf,'.');  
-          if(mend) {
-            *mend=0;
-            mend = strrchr(linkbuf,'/');
-            if(mend) {
-              mend++;
-              strcpy(outbuf,mend);
-              b=outbuf;
-              nlen=strlen(b);
-            }
-          }
-        } else {
-          /* perror("readlink");
-             puts(b); */
-        }
-
-        strcat(bnddirs,outputdir);
-        strcat(bnddirs,"/");
-        strncat(bnddirs,b,nlen);
-        strcat(bnddirs, " ");
-      } else if(argv[i][n-1]=='o' &&
-         argv[i][n-2]=='s' &&
-         argv[i][n-3]=='.') {
-        const char *p = strrchr(argv[i],'/');
-        if(!p) {
-          printf("Can't find trailing slash in %s\n", argv[i]);
-          return 1;
-        }
-        strcat(libs,outputdir);
-        strcat(libs,"/");
-        strncat(libs,p+1,strlen(p)-4);
-        strcat(libs," ");
-      } else {
-        printf("Unknown input file: %s\n", argv[i]);
-        return 1;
-      }
-    }
-  }
-
-  if(prog[0]==0) {
-    printf("no program (-o) option specified.\n");
-    return 1;
-  }
-
-  sprintf(buf,"CRTPGM PGM(%s/%s) MODULE(%s) BNDSRVPGM(%s) BNDDIR(%s) OPTION(%s) REPLACE(*YES)",
-          outputdir,progshort,
-
-          objs,
-
-          libs,
-
-          bnddirs,
-
-          opt);
-
-
-  if(runcmd(buf)) {
-    return 1;
-  }
-
-  /* -- OK */
-  {
-    char path1[1000];
-    sprintf(path1,"/qsys.lib/%s.lib/%s.pgm",
-            outputdir,
-            progshort);
-    printf("# ln -s %s %s\n", path1, prog);
-    if((!TEST_MODE) && symlink(path1,prog)) {
-      perror("symlink");
-      if(errno!=EEXIST) { /* ignored */
-        return 1;
-      }
-    }
-  }
-  return 0;
-}
-
-
-
-
-
-
-
-
deleted file mode 100644
--- a/intl/icu/as_is/os400/unpax-icu.sh
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/usr/bin/qsh
-#   Copyright (C) 2000-2011, International Business Machines
-#   Corporation and others.  All Rights Reserved.
-#
-# Authors:
-# Ami Fixler
-# Barry Novinger
-# Steven R. Loomis
-# George Rhoten
-# Jason Spieth
-#
-# Shell script to unpax ICU and convert the files to an EBCDIC codepage.
-# After extracting to EBCDIC, binary files are re-extracted without the
-# EBCDIC conversion, thus restoring them to original codepage.
-
-if [ -z "$QSH_VERSION" ];
-then
-	QSH=0
-    echo "QSH not detected (QSH_VERSION not set) - just testing."
-else
-	QSH=1
-	#echo "QSH version $QSH_VERSION"
-fi
-export QSH
-
-# Set the following variable to the list of binary file suffixes (extensions)
-
-
-#****************************************************************************
-#binary_suffixes='ico ICO bmp BMP jpg JPG gif GIF brk BRK'
-#ICU specific binary files
-#****************************************************************************
-binary_suffixes='brk BRK bin BIN res RES cnv CNV dat DAT icu ICU spp SPP xml XML nrm NRM'
-data_files='icu/source/data/brkitr/* icu/source/data/locales/* icu/source/data/coll/* icu/source/data/rbnf/* icu/source/data/mappings/* icu/source/data/misc/* icu/source/data/translit/* icu/source/data/unidata/* icu/source/test/testdata/*'
-
-#****************************************************************************
-# Function:     usage
-# Description:  Prints out text that describes how to call this script
-# Input:        None
-# Output:       None
-#****************************************************************************
-usage()
-{
-  echo "Enter archive filename as a parameter: $0 icu-archive.tar"
-}
-
-#****************************************************************************
-# first make sure we at least one arg and it's a file we can read
-#****************************************************************************
-
-# check for no arguments
-if [ $# -eq 0 ]; then
-  usage
-  exit
-fi
-
-# tar file is argument 1
-tar_file=$1
-
-# check that the file is valid
-if [ ! -r $tar_file ]; then
-  echo "$tar_file does not exist or cannot be read."
-  usage
-  exit
-fi
-
-# treat all data files as ebcdic
-ebcdic_data=$data_files
-
-#****************************************************************************
-# Extract files.  We do this in two passes.  One pass for 819 files and a
-# second pass for 37 files
-#****************************************************************************
-echo ""
-echo "Extracting from $tar_file ..."
-echo ""
-
-# extract everything as iso-8859-1 except these directories
-pax -C 819 -rcvf $tar_file $ebcdic_data
-
-# extract files while converting them to EBCDIC
-echo ""
-echo "Extracting files which must be in ibm-37 ..."
-echo ""
-pax -C 37 -rvf $tar_file $ebcdic_data
-
-#****************************************************************************
-# For files we have restored as CCSID 37, check the BOM to see if they    
-# should be processed as 819.  Also handle files with special paths. Files
-# that match will be added to binary files lists.  The lists will in turn
-# be processed to restore files as 819.
-#****************************************************************************
-echo ""
-echo "Determining binary files by BOM ..."
-echo ""
-bin_count=0
-# Process BOMs
-if [ -f icu/as_is/bomlist.txt ];
-then
-    echo "Using icu/as_is/bomlist.txt"
-    pax -C 819 -rvf $tar_file `cat icu/as_is/bomlist.txt`
-else 
-   for file in `find ./icu \( -name \*.txt -print \)`; do
-    bom8=`head -n 1 $file|\
-          od -t x1|\
-          head -n 1|\
-          sed 's/  */ /g'|\
-          cut -f2-4 -d ' '|\
-          tr 'A-Z' 'a-z'`;
-    #Find a converted UTF-8 BOM
-    if [ "$bom8" = "057 08b 0ab" -o "$bom8" = "57 8b ab" ]
-    then
-        file="`echo $file | cut -d / -f2-`"
-
-        if [ `echo $binary_files | wc -w` -lt 200 ]
-        then
-            bin_count=`expr $bin_count + 1`
-            binary_files="$binary_files $file";
-        else
-            echo "Restoring binary files by BOM ($bin_count)..."
-            rm $binary_files;
-            pax -C 819 -rvf $tar_file $binary_files;
-            echo "Determining binary files by BOM ($bin_count)..."
-            binary_files="$file";
-            bin_count=`expr $bin_count + 1`
-        fi
-    fi
-  done
-  # now see if a re-extract of binary files is necessary
-  if [ `echo $binary_files | wc -w` -gt 0 ]
-  then
-      echo "Restoring binary files ($bin_count) ..."
-      rm $binary_files
-      pax -C 819 -rvf $tar_file $binary_files
-  fi
-fi
-
-echo "# Processing special paths."
-# Process special paths
-more_bin_files=$(find icu -type f \( -name '*.zzz' `echo $binary_suffixes | sed -e 's%[a-zA-Z]*%-o -name \*.&%g'` \)  -print)
-echo "Restoring binary files by special paths ($bin_count) ..."
-rm $more_bin_files
-pax -C 819 -rvf $tar_file $more_bin_files
-
-#****************************************************************************
-# Generate and run the configure script
-#****************************************************************************
-
-echo ""
-echo "Generating qsh compatible configure ..."
-echo ""
-
-sed -f icu/as_is/os400/convertConfigure.sed icu/source/configure > icu/source/configureTemp
-del -f icu/source/configure
-mv icu/source/configureTemp icu/source/configure
-chmod 755 icu/source/configure
-
-echo ""
-echo "$0 has completed extracting ICU from $tar_file - $bin_count binary files extracted."
-
deleted file mode 100644
--- a/intl/icu/icu4c.css
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
- * Default CSS style sheet for the ICU4C Open Source readme
- * Copyright (C) 2005-2011, International Business Machines
- * Corporation and others.  All Rights Reserved.
- */
-
-/* Global styles */
-
-body,p,li,ol,ul,th,td {
-	font-size: 1em;
-	font-family: "Arial", "Helvetica", sans-serif;
-}
-
-body {
-	margin: 1em;
-}
-
-body.draft {
-	background-image: url(images/draftbg.png);
-}
-
-.mainbody {
-	padding: 1em;
-}
-
-/*
- * Customize the headers to have less space around them than usual
- */
-
-h1 {
-	margin-bottom: .5em;
-	margin-top: .5em;
-	padding-bottom: .5em;
-	padding-top: .5em;
-	font-weight: 700;
-	font-size: 20pt;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	border-width: 2px;
-	border-style: solid;
-	text-align: center;
-	width: 100%;
-	font-size: 200%;
-	font-weight: bold;
-}
-
-h2 {
-	border-top: 2px solid #22d;
-	border-left: 2px solid #22d;
-	margin-bottom: 0.5em;
-	padding-left: 4px;
-	margin-top: 12pt;
-	font-weight: 700;
-	font-size: 2em;
-	font-family: Georgia, "Times New Roman", Times, serif;
-	background-color: #eee;
-	page-break-before: always;
-}
-
-h2 a {
-	text-decoration: none;
-	color: black;
-}
-
-h2 a:hover {
-	color: blue;
-	text-decoration: underline;
-}
-
-h3 {
-	border-top: 1px solid gray;
-	color: #1e1c46;
-	margin-bottom: 0pt;
-	margin-top: 12pt;
-	padding-left: 0;
-	margin-left: 1em;
-	margin-top: 0.2em;
-	padding-bottom: 0.4em;
-	font-size: 1.5em;
-	font-family: Georgia, "Times New Roman", Times, serif;
-}
-
-h3 a {
-	text-decoration: none;
-	color: black;
-}
-
-h3 a:hover {
-	color: blue;
-	text-decoration: underline;
-}
-
-h4 {
-	margin-left: 1.5em;
-	margin-bottom: 0pt;
-	margin-top: 12pt;
-	font-size: 1.0em;
-	font-weight: bolder;
-	font-family: Georgia, "Times New Roman", Times, serif;
-}
-
-h4 a {
-	text-decoration: none;
-	color: black;
-}
-
-h4 a:hover {
-	color: blue;
-	text-decoration: underline;
-}
-
-h5, h6 {
-	margin-left: 1.8em;
-	margin-bottom: 0pt;
-	margin-top: 12pt;
-	padding-left: 0.75em;
-	font-size: x-small;
-	font-family: Georgia, "Times New Roman", Times, serif;
-}
-
-p,pre,table,ul,ol,dl {
-	margin-left: 2em;
-}
-
-/*
- * Navigation sidebar on the left hand of most pages
- */
-
-td.sidebar1 {
-	background-color: #99CCFF;
-	font-weight: 700;
-	margin-top: 0px;
-	margin-bottom: 0px;
-	padding-top: 1em;
-	padding-left: 0.2em;
-	white-space: nowrap;
-}
-
-td.sidebar2 {
-	background-color: #99CCFF;
-	margin-top: 0px;
-	margin-bottom: 0px;
-	margin-left: 0px;
-	padding-top: 1px;
-	padding-bottom: 1px;
-	padding-left: 1px;
-	padding-right: 0.5em;
-	white-space: nowrap;
-	text-decoration: none;
-	display: block;
-}
-
-td.sidebar2:hover {
-	background-color: #EEEEFF;
-	padding-top: 1px;
-	padding-bottom: 1px;
-	padding-left: 1px;
-	padding-right: 0.5em;
-}
-
-a.sidebar2 {
-	text-decoration: none;
-	display: block;
-	width: 100%;
-}
-
-a.sidebar2:link {
-	color: #000099;
-	display: block;
-}
-
-a.sidebar2:hover {
-	background-color: #EEEEFF;
-	display: block;
-}
-
-.underlinehover:hover {
-	background-color: #EEEEFF;
-	text-decoration: underline;
-}
-
-/* This is the faded header at the top */
-
-td.fadedtop {
-	background-color: #006699;
-	background-image: url(http://www.icu-project.org/images/gr100.gif);
-}
-
-/* Related site on the left */
-
-p.relatedsite {
-	color: White;
-	font-weight: 700;
-	font-size: 10pt;
-	margin-top: 1em;
-	margin-bottom: 0;
-	padding-left: 0.2em;
-	white-space: nowrap;
-}
-
-/* Related site on the left */
-
-p.sidebar3 {
-	margin-top: 0.75em;
-	margin-bottom: 0;
-	padding-left: 0.8em;
-}
-
-a.sidebar3 {
-	font-size: 0.9em;
-	text-decoration: none;
-}
-
-a.sidebar3:link {
-	text-decoration: none;
-	color: White;
-}
-
-a.sidebar3:hover {
-	text-decoration: underline;
-}
-
-/* FAQ */
-
-li.faq_contents {
-	font-weight: 500;
-}
-
-p.faq_q {
-	font-weight: 700;
-	margin-bottom: 0px;
-}
-
-p.faq_a {
-	margin-top: 0px;
-}
-
-/* News items */
-
-table.newsItem {
-	padding-left: 1em;
-	padding-right: 1em;
-	border-width: medium;
-}
-
-th.newsItem {
-	background-color: #666666;
-	color: White;
-}
-
-td.newsItem {
-	background-color: #CCCCCC;
-}
-
-td.release-line,th.release-line {
-	padding-left: 0.5em;
-	padding-right: 0.5em;
-	white-space: nowrap;
-	border: 1px;
-}
-
-.note {
-	font-style: italic;
-	font-size: small;
-	margin-left: 1em;
-}
-
-samp {
-	margin-left: 1em;
-	margin-right: 2em;
-	border-style: groove;
-	padding: 1em;
-	display: block;
-	background-color: #EEEEEE
-}
-
-table.rtable caption {
-	margin-left: 2px;
-	margin-right: 2px;
-	padding: 3px;
-	font-weight: bold;
-	background-color: #dee2ff;
-	text-align: left;
-}
-
-table.rtable tr th {
-	background-color: #dee2ff;
-	text-align: left;
-}
-
-table.rtable tr td {
-	background-color: #c0c0fd;
-	padding: 3px;
-}
-
-table.rtable tr.broken td {
-	background-color: #fbb;
-	border: 1px dashed gray;
-	padding: 3px;
-	font-weight: bold;
-}
-
-table.rtable tr.rarely td {
-	background-color: #efe9c2;
-	padding: 3px;
-	font-style: italic;
-}
-
-/*  APIChangeReport specific things */
-
-.row0 {
-	background-color: white;
-}
-
-.row1 {
-	background-color: #dfd;
-}
-
-.verchange {
-	color: red;
-	font-weight: bold;
-	font-size: large;
-}
-
-.stabchange {
-	color: red;
-	font-size: large;
-}
-
-.bigwarn {
-	color: red;
-	background-color: white;
-	font-size: large;
-	margin: 0.5 em;
-}
-
-
-td.bornstable {
-	
-}
-td.bornstable .bigwarn {
-	font-size: small;
-	white-space: nowrap;
-}
-
-table.genTable {
-	border-collapse: collapse;
-	border: 1px solid black;
-}
-
-/* 'everything inc version */
-
-table.gentable td {
-	border: 1px solid gray;
-	padding: 0.25em;
-	font-size: small;
-}
-
-/* not version */
-
-table.genTable td.file,
-table.genTable td.proto {
-	border: none;
-	font-size: medium;
-}
-
-table.genTable td.file {
-	font-family: monospace;
-	font-weight: bold;
-}
-
-div.other .row0 {
-	background-color: white;
-}
-
-div.other .row1 {
-	background-color: #ddf;
-}
-
-table.docTable {
-	border-collapse: collapse;
-	border: 1px solid black;
-}
-
-/* 'everything inc version */
-
-table.docTable td,
-table.docTable th {
-	border: 1px solid gray;
-	padding: 0.25em;
-	font-size: small;
-}
-
-/* not version */
-
-table.docTable td.file,
-table.docTable td.proto {
-	border: none;
-	font-size: medium;
-}
-
-table.docTable td.file {
-	font-family: monospace;
-	font-weight: bold;
-}
-
-abbr {
-	border-bottom: 1px dashed #0B0;
-}
-
-h2.TOC {
-	page-break-before: auto;
-}
-
-body.readme {
-	
-}
-
-caption {
-	font-weight: bold;
-	text-align: left
-}
-
-div.indent {
-	margin-left: 2em
-}
-
-ul.TOC {
-	list-style-type: none;
-	padding-left: 1em;
-	font-size: larger;
-}
-
-ul.TOC li a {
-	font-weight: bold;
-}
-
-ul.TOC li ul li a {
-	font-weight: normal;
-	list-style-type: none;
-	font-size: small;
-}
-
-ul.TOC li ul {
-	margin-left: 0;
-	padding-left: 2em;
-	font-weight: normal;
-	list-style-type: none;
-}
-
-pre.samp,samp {
-	margin-left: 1em;
-	border-style: groove;
-	padding: 1em;
-	display: block;
-	background-color: #EEEEEE
-}
-
-td.proto {
-	font-size: smaller;
-}
-
-
-
-@media print {
-	div#toc {
-		display: none;
-	}
-	
-	table,tr,td,div {
-		page-break-inside: auto;
-	}
-}
deleted file mode 100644
--- a/intl/icu/license.html
+++ /dev/null
@@ -1,307 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-<title>ICU License - ICU 1.8.1 and later</title>
-</head>
-
-<body BGCOLOR="#ffffff">
-<h2>ICU License - ICU 1.8.1 and later</h2>
-
-<p>COPYRIGHT AND PERMISSION NOTICE</p>
-
-<p>
-Copyright (c) 1995-2012 International Business Machines Corporation and others
-</p>
-<p>
-All rights reserved.
-</p>
-<p>
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, and/or sell
-copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies
-of the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-</p>
-<p>
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL
-THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM,
-OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
-USE OR PERFORMANCE OF THIS SOFTWARE.
-</p>
-<p>
-Except as contained in this notice, the name of a copyright holder shall not be
-used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization of the copyright holder.
-</p>
-
-<hr style="color:gray;background-color:gray">
-<p><small>
-All trademarks and registered trademarks mentioned herein are the property of their respective owners.
-</small></p>
-
-<hr style="height:3px;color:black;background-color:black">
-
-<h2>Third-Party Software Licenses</h2>
-This section contains third-party software notices and/or additional terms for licensed
-third-party software components included within ICU libraries.
-
-<h3>1. Unicode Data Files and Software</h3>
-
-<h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br>
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE</h3>
-<blockquote>
-<p>Unicode Data Files include all data files under the directories 
-<a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>, 
-<a href="http://www.unicode.org/reports/">http://www.unicode.org/reports/</a>, 
-and
-<a title="http://www.unicode.org/cldr/data/" onClick="return top.js.OpenExtLink(window,event,this)" target="_blank" href="http://www.unicode.org/cldr/data/">
-http://www.unicode.org/cldr/data/</a>. Unicode Data Files do not include PDF online code charts under the directory  <a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>. Software includes any source code 
-published in the Unicode Standard or under the directories <a href="http://www.unicode.org/Public/">http://www.unicode.org/Public/</a>,
-<a href="http://www.unicode.org/reports/">http://www.unicode.org/reports/</a>, 
-and
-<a title="http://www.unicode.org/cldr/data/" onClick="return top.js.OpenExtLink(window,event,this)" target="_blank" href="http://www.unicode.org/cldr/data/">
-http://www.unicode.org/cldr/data/</a>.</p>
-
-<p>NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.</p>
-<p>COPYRIGHT AND PERMISSION NOTICE</p>
-
-<p>Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in 
-<a href="http://www.unicode.org/copyright.html">http://www.unicode.org/copyright.html</a>.</p>
-
-<p>Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and 
-any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear 
-with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.</p>
-
-<p>THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.</p>
-
-<p>Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.</p>
-
-            <hr width="80%">
-
-<p>Unicode and the Unicode logo are trademarks of Unicode, Inc. in the United States and other countries. All third party trademarks referenced herein are the property of their respective owners.</p>
-
-
-</blockquote>
-
-<h3>2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)</h3>
-<pre>
- #    The Google Chrome software developed by Google is licensed under the BSD license. Other software included in this distribution is provided under other licenses, as set forth below.
- #	
- #	The BSD License
- #	http://opensource.org/licenses/bsd-license.php 
- #	Copyright (C) 2006-2008, Google Inc.
- #	
- #	All rights reserved.
- #	
- #	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- #	
- #	Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- #	Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- #	Neither the name of  Google Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
- #	 
- #	
- #	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #	
- #	                                             
- #	The word list in cjdict.txt are generated by combining three word lists listed
- #	below with further processing for compound word breaking. The frequency is generated
- #	with an iterative training against Google web corpora. 
- #	
- #	* Libtabe (Chinese)
- #	  - https://sourceforge.net/project/?group_id=1519
- #	  - Its license terms and conditions are shown below.
- #	
- #	* IPADIC (Japanese)
- #	  - http://chasen.aist-nara.ac.jp/chasen/distribution.html
- #	  - Its license terms and conditions are shown below.
- #	
- #	---------COPYING.libtabe ---- BEGIN--------------------
- #	
- #	/*
- #	 * Copyrighy (c) 1999 TaBE Project.
- #	 * Copyright (c) 1999 Pai-Hsiang Hsiao.
- #	 * All rights reserved.
- #	 *
- #	 * Redistribution and use in source and binary forms, with or without
- #	 * modification, are permitted provided that the following conditions
- #	 * are met:
- #	 *
- #	 * . Redistributions of source code must retain the above copyright
- #	 *   notice, this list of conditions and the following disclaimer.
- #	 * . Redistributions in binary form must reproduce the above copyright
- #	 *   notice, this list of conditions and the following disclaimer in
- #	 *   the documentation and/or other materials provided with the
- #	 *   distribution.
- #	 * . Neither the name of the TaBE Project nor the names of its
- #	 *   contributors may be used to endorse or promote products derived
- #	 *   from this software without specific prior written permission.
- #	 *
- #	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- #	 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- #	 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- #	 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- #	 * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- #	 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- #	 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- #	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- #	 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- #	 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- #	 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- #	 * OF THE POSSIBILITY OF SUCH DAMAGE.
- #	 */
- #	
- #	/*
- #	 * Copyright (c) 1999 Computer Systems and Communication Lab,
- #	 *                    Institute of Information Science, Academia Sinica.
- #	 * All rights reserved.
- #	 *
- #	 * Redistribution and use in source and binary forms, with or without
- #	 * modification, are permitted provided that the following conditions
- #	 * are met:
- #	 *
- #	 * . Redistributions of source code must retain the above copyright
- #	 *   notice, this list of conditions and the following disclaimer.
- #	 * . Redistributions in binary form must reproduce the above copyright
- #	 *   notice, this list of conditions and the following disclaimer in
- #	 *   the documentation and/or other materials provided with the
- #	 *   distribution.
- #	 * . Neither the name of the Computer Systems and Communication Lab
- #	 *   nor the names of its contributors may be used to endorse or
- #	 *   promote products derived from this software without specific
- #	 *   prior written permission.
- #	 *
- #	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- #	 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- #	 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- #	 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- #	 * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- #	 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- #	 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- #	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- #	 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- #	 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- #	 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- #	 * OF THE POSSIBILITY OF SUCH DAMAGE.
- #	 */
- #	
- #	Copyright 1996 Chih-Hao Tsai @ Beckman Institute, University of Illinois
- #	c-tsai4@uiuc.edu  http://casper.beckman.uiuc.edu/~c-tsai4
- #	
- #	---------------COPYING.libtabe-----END------------------------------------
- #	
- #	
- #	---------------COPYING.ipadic-----BEGIN------------------------------------
- #	
- #	Copyright 2000, 2001, 2002, 2003 Nara Institute of Science
- #	and Technology.  All Rights Reserved.
- #	
- #	Use, reproduction, and distribution of this software is permitted.
- #	Any copy of this software, whether in its original form or modified,
- #	must include both the above copyright notice and the following
- #	paragraphs.
- #	
- #	Nara Institute of Science and Technology (NAIST),
- #	the copyright holders, disclaims all warranties with regard to this
- #	software, including all implied warranties of merchantability and
- #	fitness, in no event shall NAIST be liable for
- #	any special, indirect or consequential damages or any damages
- #	whatsoever resulting from loss of use, data or profits, whether in an
- #	action of contract, negligence or other tortuous action, arising out
- #	of or in connection with the use or performance of this software.
- #	
- #	A large portion of the dictionary entries
- #	originate from ICOT Free Software.  The following conditions for ICOT
- #	Free Software applies to the current dictionary as well.
- #	
- #	Each User may also freely distribute the Program, whether in its
- #	original form or modified, to any third party or parties, PROVIDED
- #	that the provisions of Section 3 ("NO WARRANTY") will ALWAYS appear
- #	on, or be attached to, the Program, which is distributed substantially
- #	in the same form as set out herein and that such intended
- #	distribution, if actually made, will neither violate or otherwise
- #	contravene any of the laws and regulations of the countries having
- #	jurisdiction over the User or the intended distribution itself.
- #	
- #	NO WARRANTY
- #	
- #	The program was produced on an experimental basis in the course of the
- #	research and development conducted during the project and is provided
- #	to users as so produced on an experimental basis.  Accordingly, the
- #	program is provided without any warranty whatsoever, whether express,
- #	implied, statutory or otherwise.  The term "warranty" used herein
- #	includes, but is not limited to, any warranty of the quality,
- #	performance, merchantability and fitness for a particular purpose of
- #	the program and the nonexistence of any infringement or violation of
- #	any right of any third party.
- #	
- #	Each user of the program will agree and understand, and be deemed to
- #	have agreed and understood, that there is no warranty whatsoever for
- #	the program and, accordingly, the entire risk arising from or
- #	otherwise connected with the program is assumed by the user.
- #	
- #	Therefore, neither ICOT, the copyright holder, or any other
- #	organization that participated in or was otherwise related to the
- #	development of the program and their respective officials, directors,
- #	officers and other employees shall be held liable for any and all
- #	damages, including, without limitation, general, special, incidental
- #	and consequential damages, arising out of or otherwise in connection
- #	with the use or inability to use the program or any product, material
- #	or result produced or otherwise obtained by using the program,
- #	regardless of whether they have been advised of, or otherwise had
- #	knowledge of, the possibility of such damages at any time during the
- #	project or thereafter.  Each user will be deemed to have agreed to the
- #	foregoing by his or her commencement of use of the program.  The term
- #	"use" as used herein includes, but is not limited to, the use,
- #	modification, copying and distribution of the program and the
- #	production of secondary products from the program.
- #	
- #	In the case where the program, whether in its original form or
- #	modified, was distributed or delivered to or received by a user from
- #	any person, organization or entity other than ICOT, unless it makes or
- #	grants independently of ICOT any specific warranty to the user in
- #	writing, such person, organization or entity, will also be exempted
- #	from and not be held liable to the user for any such damages as noted
- #	above as far as the program is concerned.
- #	
- #	---------------COPYING.ipadic-----END------------------------------------
-</pre>
-
-<h3>3. Time Zone Database</h3>
-<p>ICU uses the public domain data and code derived from <a href="http://www.iana.org/time-zones">
-Time Zone Database</a> for its time zone support. The ownership of the TZ database is explained
-in <a href="http://tools.ietf.org/html/rfc6557">BCP 175: Procedure for Maintaining the Time Zone
-Database</a> section 7.<p>
-
-<pre>
-7.  Database Ownership
-
-   The TZ database itself is not an IETF Contribution or an IETF
-   document.  Rather it is a pre-existing and regularly updated work
-   that is in the public domain, and is intended to remain in the public
-   domain.  Therefore, BCPs 78 [RFC5378] and 79 [RFC3979] do not apply
-   to the TZ Database or contributions that individuals make to it.
-   Should any claims be made and substantiated against the TZ Database,
-   the organization that is providing the IANA Considerations defined in
-   this RFC, under the memorandum of understanding with the IETF,
-   currently ICANN, may act in accordance with all competent court
-   orders.  No ownership claims will be made by ICANN or the IETF Trust
-   on the database or the code.  Any person making a contribution to the
-   database or code waives all rights to future claims in that
-   contribution or in the TZ Database.
-
-</pre>
-
-
-</body>
-</html>
deleted file mode 100644
--- a/intl/icu/packaging/PACKAGES
+++ /dev/null
@@ -1,159 +0,0 @@
-Copyright (C) 2000-2003, International Business Machines
-Corporation and others.  All Rights Reserved.
-ICU is packaged into a number of small, interdependent packages. This
-file describes what these packages are, what their name should be
-like, and what their contents are. It is useful as a reference and a
-guide when packaging ICU on a new system.
-
-+ List of ICU packages.
-
-ICU is distributed as the following packages:
-
-- ICU libraries. This package contains the runtime libraries needed by
-applications that use ICU. All the other packages require this package
-to be installed.
-- ICU. This package contains the converters data, the timezones data,
-and all the ICU tools.
-- ICU locales. This package adds locales and break data.
-- ICU development. This package contains the files necessary to build
-applications that use ICU, i.e. header files, links to shared
-libraries used by the linker, static libraries, etc... It also
-contains sample applications and documentation.
-- ICU docs. This package contains further documentation for ICU,
-including a complete API reference.
-- ICU data. This package contains the source for the compiled data
-contained by the ICU package.
-- ICU international data. This package contains the source for the
-compiled data contained by the ICU locales package.
-
-In this file, we will refer to Autoconf variables as in $(bindir). In
-addition to these, we will use the following variables to denote
-ICU-specific directories or information:
-
-  VERSION       ICU's dotted version number, e.g. 1.6.0.1 as of this
-		writing.
-
-  ICUDATADIR	The directory where portable ICU data are. This is
-	        defined as $(datadir)/icu/$(VERSION).
-  ICULIBDIR	The directory where platform-specific ICU data
-		are. This is defined as $(libdir)/icu/$(VERSION).
-  ICUSYSCONFDIR	The directory where ICU configuration files are. This
-		is defined as $(sysconfdir)/icu.
-
-When referring to libraries, .so will be used to denote the extension
-of a shared library, and .a to denote the extension of a static
-library. These extensions will actually be different on some platforms.
-
-+ Configuration and compilation of ICU
-
-ICU should be configured with the following options:
-
-  --with-data-packaging=files
-  --disable-rpath
-  --enable-shared
-  --enable-static
-  --without-samples
-
-in addition to platform-specific settings (like a specific mandir or
-sysconfdir). Note that the use of --disable-rpath assumes that the
-packaging is made for a standard location, or that the package
-installation/deinstallation will correctly manage the configuration
-of the system's dyanmic loader. This is the right way of doing things.
-
-The configure script invokation should also be done with
-
-  CFLAGS="-O2"
-
-set, as in:
-
-  $ CFLAGS="-O2" ./configure ...
-
-The files packaging mode is chosen because it offers the maximum
-flexibility. Packages can be split easily, and system administrators
-can add converters, aliases, and other resources with little
-effort. Ideally, the ICU build will be modified to allow for distributing a
-libicudata.so with all the converters and locales, but indexes and aliases
-as separate files. But for now, this is the easiest way to get started.
-
-+ The ICU libraries package
-
-The ICU libraries package is typically named `libicuXX' where XX is
-the major number of ICU's libraries. This number is ICU's version
-number multiplied by 10 and rounded down to the nearest integer (it is
-also the value of the LIB_VERSION_MAJOR configure substitution
-variable). For example, for ICU 1.6.0.1, it is 16, so the package name
-is `libicu16'. The major version is part of the package name to allow
-for the simultaneous installation of different ICU releases.
-
-This package contains:
-
-- All the shared libraries, and their major number symbolic link, but
-not the .so symbolic link that is only used at link time (this one is
-part of the development package). These are $(libdir)/libicu*.so.* and
-$(libdir)/libustdio.so.* at the time of this writing.
-
-+ The ICU package
-
-The ICU package is simply named `icu'.  It provides data used by the ICU
-libraries package and commands to create and manipulate that data.
-
-This package contains:
-
-- The Unicode data files (uprops.dat and unames.dat as of this writing).
-- The time zones data files (tz.dat).
-- All the binary data files for converters (.cnv files).
-- All the ICU commands.
-- The manual pages for ICU commands and file formats.
-
-+ The ICU locales package
-
-The ICU locales package is named `icu-locales'. It provides data used by
-internationalization support in ICU.
-
-This package contains:
-
-- All the data for locales in ICU (.dat files).
-- All the break data for specific locales (.brk files).
-
-+ The ICU development package
-
-The ICU developpment package is named `libicu-dev'. It provides all
-the files necessary to write applications that use ICU, along with
-examples and some documentation.
-
-This package contains:
-
-- The /usr/include/unicode directory which contains all the ICU
-headers.
-- The .so symbolic links used by the linker to link against the
-latest version of the libraries.
-- A sample Makefile fragment that can be included by applications
-using ICU, to faciliate their building, along with a platform-specific
-configuration file included by this fragment.
-- The sample applications from the ICU source tree, in an appropriate
-location for the system that the package is installed on (for example,
-on Debian, in /usr/share/doc/libicu-dev/examples).
-
-This package depends on the ICU libraries package with the exact same
-version, since it provides .so symbolic links to the latest libraries.
-
-+ The ICU docs package
-
-The ICU docs package is named `libicu-doc'. It contains the files
-generated by doxygen when the `make doc' command is executed, in a
-location appropriate for the system that the package is installed on.
-
-+ The ICU data package
-
-The ICU data package is named `icu-data'. It contains source files for
-the data found in the ICU package. These files are installed in
-$(ICUDATADIR).
-
-+ The ICU international data package
-
-The ICU data package is named `icu-i18ndata'. It contains source files for
-the dat founf in the ICU locales package. These files are installed in
-$(ICUDATADIR).
-
-----
-Yves Arrouye <yves@realnames.com>
deleted file mode 100644
--- a/intl/icu/packaging/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright (C) 2000-2003, International Business Machines
-Corporation and others.  All Rights Reserved.
-
-This directory contains information, input files and scripts for
-packaging ICU using specific packaging tools. We assume that the
-packager is familiar with the tools and procedures needed to build a
-package for a given packaging method (for example, how to use
-dpkg-buildpackage(1) on Debian GNU/Linux, or rpm(8) on distributions that
-use RPM packages).
-
-Please read the file PACKAGES if you are interested in packaging ICU
-yourself. It describes what the different packages should be, and what
-their contents are.
deleted file mode 100644
--- a/intl/icu/packaging/rpm/icu.spec
+++ /dev/null
@@ -1,228 +0,0 @@
-#   Copyright (C) 2000-2005, International Business Machines
-#   Corporation and others.  All Rights Reserved.
-#
-# RPM specification file for ICU.
-#
-# Neal Probert <nprobert@walid.com> is the current maintainer.
-# Yves Arrouye <yves@realnames.com> is the original author.
-
-# This file can be freely redistributed under the same license as ICU.
-
-Name: icu
-Version: 3.4
-Release: 1
-Requires: libicu34 >= %{version}
-Summary: International Components for Unicode
-Packager: Ian Holsman (CNET Networks) <ianh@cnet.com>
-Copyright: X License
-Group: System Environment/Libraries
-Source: icu-%{version}.tgz
-BuildRoot: /var/tmp/%{name}-%{version}
-%description
-ICU is a set of C and C++ libraries that provides robust and full-featured
-Unicode and locale support. The library provides calendar support, conversions
-for many character sets, language sensitive collation, date
-and time formatting, support for many locales, message catalogs
-and resources, message formatting, normalization, number and currency
-formatting, time zones support, transliteration, word, line and
-sentence breaking, etc.
-
-This package contains the Unicode character database and derived
-properties, along with converters and time zones data.
-
-This package contains the runtime libraries for ICU. It does
-not contain any of the data files needed at runtime and present in the
-`icu' and `icu-locales` packages.
-
-%package -n libicu34
-Summary: International Components for Unicode (libraries)
-Group: Development/Libraries
-%description -n libicu34
-ICU is a set of C and C++ libraries that provides robust and full-featured
-Unicode support. This package contains the runtime libraries for ICU. It does
-not contain any of the data files needed at runtime and present in the
-`icu' and `icu-locales` packages.
-
-%package -n libicu-devel
-Summary: International Components for Unicode (development files)
-Group: Development/Libraries
-Requires: libicu34 = %{version}
-%description -n libicu-devel
-ICU is a set of C and C++ libraries that provides robust and full-featured
-Unicode support. This package contains the development files for ICU.
-
-%package locales
-Summary: Locale data for ICU
-Group: System Environment/Libraries
-Requires: libicu34 >= %{version}
-%description locales
-The locale data are used by ICU to provide localization (l10n), 
-internationalization (i18n) and timezone support to ICU applications.
-This package also contains break data for various languages,
-and transliteration data.
-
-%post
-# Adjust the current ICU link in /usr/lib/icu
-
-icucurrent=`2>/dev/null ls -dp /usr/lib/icu/* | sed -n 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1`
-cd /usr/lib/icu
-rm -f /usr/lib/icu/current
-if test x"$icucurrent" != x
-then
-    ln -s "$icucurrent" current
-fi
-
-#ICU_DATA=/usr/share/icu/%{version}
-#export ICU_DATA
-
-%preun
-# Adjust the current ICU link in /usr/lib/icu
-
-icucurrent=`2>/dev/null ls -dp /usr/lib/icu/* | sed -n -e '/\/%{version}\//d' -e 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1`
-cd /usr/lib/icu
-rm -f /usr/lib/icu/current
-if test x"$icucurrent" != x
-then
-    ln -s "$icucurrent" current
-fi
-
-%post -n libicu34
-ldconfig
-
-# Adjust the current ICU link in /usr/lib/icu
-
-icucurrent=`2>/dev/null ls -dp /usr/lib/icu/* | sed -n 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1`
-cd /usr/lib/icu
-rm -f /usr/lib/icu/current
-if test x"$icucurrent" != x
-then
-    ln -s "$icucurrent" current
-fi
-
-%preun -n libicu34
-# Adjust the current ICU link in /usr/lib/icu
-
-icucurrent=`2>/dev/null ls -dp /usr/lib/icu/* | sed -n -e '/\/%{version}\//d' -e 's,.*/\([^/]*\)/$,\1,p'| sort -rn | head -1`
-cd /usr/lib/icu
-rm -f /usr/lib/icu/current
-if test x"$icucurrent" != x
-then
-    ln -s "$icucurrent" current
-fi
-
-%prep
-%setup -q -n icu
-
-%build
-cd source
-chmod a+x ./configure
-CFLAGS="-O3" CXXFLAGS="-O" ./configure --prefix=/usr --sysconfdir=/etc --with-data-packaging=files --enable-shared --enable-static --disable-samples
-echo 'CPPFLAGS += -DICU_DATA_DIR=\"/usr/share/icu/%{version}\"' >> icudefs.mk
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS"
-
-%install
-rm -rf $RPM_BUILD_ROOT
-cd source
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%doc readme.html
-%doc license.html
-/usr/share/icu/%{version}/license.html
-/usr/share/icu/%{version}/icudt34l/*.cnv
-/usr/share/icu/%{version}/icudt34l/*.icu
-/usr/share/icu/%{version}/icudt34l/*.spp
-
-/usr/bin/derb
-/usr/bin/genbrk
-/usr/bin/gencnval
-/usr/bin/genrb
-/usr/bin/icu-config
-/usr/bin/makeconv
-/usr/bin/pkgdata
-/usr/bin/uconv
-
-/usr/sbin/decmn
-/usr/sbin/genccode
-/usr/sbin/gencmn
-/usr/sbin/gensprep
-/usr/sbin/genuca
-/usr/sbin/icuswap
-/usr/share/icu/%{version}/mkinstalldirs
-
-/usr/man/man1/derb.1.*
-/usr/man/man1/gencnval.1.*
-/usr/man/man1/genrb.1.*
-/usr/man/man1/icu-config.1.*
-/usr/man/man1/makeconv.1.*
-/usr/man/man1/pkgdata.1.*
-/usr/man/man1/uconv.1.*
-/usr/man/man8/decmn.8.*
-/usr/man/man8/genccode.8.*
-/usr/man/man8/gencmn.8.*
-/usr/man/man8/gensprep.8.*
-/usr/man/man8/genuca.8.*
-
-%files -n icu-locales
-/usr/share/icu/%{version}/icudt34l/*.brk
-/usr/share/icu/%{version}/icudt34l/*.res
-/usr/share/icu/%{version}/icudt34l/coll/*.res
-/usr/share/icu/%{version}/icudt34l/rbnf/*.res
-/usr/share/icu/%{version}/icudt34l/translit/*.res
-
-%files -n libicu34
-%doc license.html
-/usr/lib/libicui18n.so.34
-/usr/lib/libicui18n.so.34.0
-/usr/lib/libicutu.so.34
-/usr/lib/libicutu.so.34.0
-/usr/lib/libicuuc.so.34
-/usr/lib/libicuuc.so.34.0
-/usr/lib/libicudata.so.34
-/usr/lib/libicudata.so.34.0
-/usr/lib/libicuio.so.34
-/usr/lib/libicuio.so.34.0
-/usr/lib/libiculx.so.34
-/usr/lib/libiculx.so.34.0
-/usr/lib/libicule.so.34
-/usr/lib/libicule.so.34.0
-
-%files -n libicu-devel
-%doc readme.html
-%doc license.html
-/usr/lib/libicui18n.so
-/usr/lib/libsicui18n.a
-/usr/lib/libicuuc.so
-/usr/lib/libsicuuc.a
-/usr/lib/libicutu.so
-/usr/lib/libsicutu.a
-/usr/lib/libicuio.so
-/usr/lib/libsicuio.a
-/usr/lib/libicudata.so
-/usr/lib/libsicudata.a
-/usr/lib/libicule.so
-/usr/lib/libsicule.a
-/usr/lib/libiculx.so
-/usr/lib/libsiculx.a
-/usr/include/unicode/*.h
-/usr/include/layout/*.h
-/usr/lib/icu/%{version}/Makefile.inc
-/usr/lib/icu/Makefile.inc
-/usr/share/icu/%{version}/config
-/usr/share/doc/icu-%{version}/*
-
-%changelog
-* Mon Jun 07 2004 Alexei Dets <adets@idsk.com>
-- update to 3.0
-* Tue Aug 16 2003 Steven Loomis <srl@jtcsv.com>
-- update to 2.6.1 - include license
-* Thu Jun 05 2003 Steven Loomis <srl@jtcsv.com>
-- Update to 2.6
-* Fri Dec 27 2002 Steven Loomis <srl@jtcsv.com>
-- Update to 2.4 spec
-* Fri Sep 27 2002 Steven Loomis <srl@jtcsv.com>
-- minor updates to 2.2 spec. Rpath is off by default, don't pass it as an option.
-* Mon Sep 16 2002 Ian Holsman <ian@holsman.net> 
-- update to icu 2.2
-
deleted file mode 100644
--- a/intl/icu/readme.html
+++ /dev/null
@@ -1,1773 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html lang="en-US" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US">
-  <head>
-    <title>ReadMe for ICU 50.1.2</title>
-    <meta name="COPYRIGHT" content=
-    "Copyright (c) 1997-2013 IBM Corporation and others. All Rights Reserved." />
-    <meta name="KEYWORDS" content=
-    "ICU; International Components for Unicode; ICU4C; what's new; readme; read me; introduction; downloads; downloading; building; installation;" />
-    <meta name="DESCRIPTION" content=
-    "The introduction to the International Components for Unicode with instructions on building, installation, usage and other information about ICU." />
-    <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
-	<link type="text/css" href="./icu4c.css" rel="stylesheet"/>
-  </head>
-
-  <body class="draft">
-    <h1>International Components for Unicode<br />
-     <abbr title="International Components for Unicode">ICU</abbr> 50.1.2 ReadMe</h1>
-
-    <!--<p><b>Note:</b> This is a development milestone release of ICU4C 50.
-    This milestone is intended for those wishing to get an early look at ICU 50 new features and API changes.
-    It is not recommended for production use.</p>-->
-    <!--<p><b>Note:</b> This is a release candidate version of ICU4C 50.
-    It is not recommended for production use.</p>-->
-
-    <p>Last updated: 2013-Jan-10<br />
-     Copyright &copy; 1997-2013 International Business Machines Corporation and
-    others. All Rights Reserved.</p>
-    <!-- Remember that there is a copyright at the end too -->
-    <hr />
-
-    <h2 class="TOC">Table of Contents</h2>
-
-    <ul class="TOC">
-      <li><a href="#Introduction">Introduction</a></li>
-
-      <li><a href="#GettingStarted">Getting Started</a></li>
-
-      <li><a href="#News">What Is New In This release?</a></li>
-
-      <li><a href="#Download">How To Download the Source Code</a></li>
-
-      <li><a href="#SourceCode">ICU Source Code Organization</a></li>
-
-      <li>
-        <a href="#HowToBuild">How To Build And Install ICU</a> 
-
-        <ul >
-          <li><a href="#RecBuild">Recommended Build Options</a></li>
-
-          <li><a href="#UserConfig">User-Configurable Settings</a></li>
-
-          <li><a href="#HowToBuildWindows">Windows</a></li>
-
-          <li><a href="#HowToBuildCygwin">Cygwin</a></li>
-
-          <li><a href="#HowToBuildUNIX">UNIX</a></li>
-
-          <li><a href="#HowToBuildZOS">z/OS (os/390)</a></li>
-
-          <li><a href="#HowToBuildOS400">IBM i family (IBM i, i5/OS, OS/400)</a></li>
-
-		  <li><a href="#HowToCrossCompileICU">How to Cross Compile ICU</a></li>
-        </ul>
-      </li>
-
-
-      <li><a href="#HowToPackage">How To Package ICU</a></li>
-
-      <li>
-        <a href="#ImportantNotes">Important Notes About Using ICU</a> 
-
-        <ul >
-          <li><a href="#ImportantNotesMultithreaded">Using ICU in a Multithreaded
-          Environment</a></li>
-
-          <li><a href="#ImportantNotesWindows">Windows Platform</a></li>
-
-          <li><a href="#ImportantNotesUNIX">UNIX Type Platforms</a></li>
-        </ul>
-      </li>
-
-      <li>
-        <a href="#PlatformDependencies">Platform Dependencies</a> 
-
-        <ul >
-          <li><a href="#PlatformDependenciesNew">Porting To A New
-          Platform</a></li>
-
-          <li><a href="#PlatformDependenciesImpl">Platform Dependent
-          Implementations</a></li>
-        </ul>
-      </li>
-    </ul>
-    <hr />
-
-    <h2><a name="Introduction" href="#Introduction" id=
-    "Introduction">Introduction</a></h2>
-
-    <p>Today's software market is a global one in which it is desirable to
-    develop and maintain one application (single source/single binary) that
-    supports a wide variety of languages. The International Components for
-    Unicode (ICU) libraries provide robust and full-featured Unicode services on
-    a wide variety of platforms to help this design goal. The ICU libraries
-    provide support for:</p>
-
-    <ul>
-      <li>The latest version of the Unicode standard</li>
-
-      <li>Character set conversions with support for over 220 codepages</li>
-
-      <li>Locale data for more than 290 locales</li>
-
-      <li>Language sensitive text collation (sorting) and searching based on the
-      Unicode Collation Algorithm (=ISO 14651)</li>
-
-      <li>Regular expression matching and Unicode sets</li>
-
-      <li>Transformations for normalization, upper/lowercase, script
-      transliterations (50+ pairs)</li>
-
-      <li>Resource bundles for storing and accessing localized information</li>
-
-      <li>Date/Number/Message formatting and parsing of culture specific
-      input/output formats</li>
-
-      <li>Calendar specific date and time manipulation</li>
-
-      <li>Complex text layout for Arabic, Hebrew, Indic and Thai</li>
-
-      <li>Text boundary analysis for finding characters, word and sentence
-      boundaries</li>
-    </ul>
-
-    <p>ICU has a sister project ICU4J that extends the internationalization
-    capabilities of Java to a level similar to ICU. The ICU C/C++ project is also
-    called ICU4C when a distinction is necessary.</p>
-
-    <h2><a name="GettingStarted" href="#GettingStarted" id=
-    "GettingStarted">Getting started</a></h2>
-
-    <p>This document describes how to build and install ICU on your machine. For
-    other information about ICU please see the following table of links.<br />
-     The ICU homepage also links to related information about writing
-    internationalized software.</p>
-
-    <table class="docTable" summary="These are some useful links regarding ICU and internationalization in general.">
-      <caption>
-        Here are some useful links regarding ICU and internationalization in
-        general.
-      </caption>
-
-      <tr>
-        <td>ICU, ICU4C &amp; ICU4J Homepage</td>
-
-        <td><a href=
-        "http://icu-project.org/">http://icu-project.org/</a></td>
-      </tr>
-
-      <tr>
-        <td>FAQ - Frequently Asked Questions about ICU</td>
-
-        <td><a href=
-        "http://userguide.icu-project.org/icufaq">http://userguide.icu-project.org/icufaq</a></td>
-      </tr>
-
-      <tr>
-        <td>ICU User's Guide</td>
-
-        <td><a href=
-        "http://userguide.icu-project.org/">http://userguide.icu-project.org/</a></td>
-      </tr>
-
-      <tr>
-        <td>How To Use ICU</td>
-
-        <td><a href="http://userguide.icu-project.org/howtouseicu">http://userguide.icu-project.org/howtouseicu</a></td>
-      </tr>
-
-      <tr>
-        <td>Download ICU Releases</td>
-
-        <td><a href=
-        "http://site.icu-project.org/download">http://site.icu-project.org/download</a></td>
-      </tr>
-
-      <tr>
-        <td>ICU4C API Documentation Online</td>
-
-        <td><a href=
-        "http://icu-project.org/apiref/icu4c/">http://icu-project.org/apiref/icu4c/</a></td>
-      </tr>
-
-      <tr>
-        <td>Online ICU Demos</td>
-
-        <td><a href=
-        "http://demo.icu-project.org/icu-bin/icudemos">http://demo.icu-project.org/icu-bin/icudemos</a></td>
-      </tr>
-
-      <tr>
-        <td>Contacts and Bug Reports/Feature Requests</td>
-
-        <td><a href=
-        "http://site.icu-project.org/contacts">http://site.icu-project.org/contacts</a></td>
-      </tr>
-    </table>
-
-    <p><strong>Important:</strong> Please make sure you understand the <a href=
-    "license.html">Copyright and License Information</a>.</p>
-
-    <h2><a name="News" href="#News" id="News">What is new in this
-    release?</a></h2>
-
-    <p>To see which APIs are new or changed in this release, view the <a href="APIChangeReport.html">ICU4C API Change Report</a>. </p>
-
-    <p>The following list concentrates on <em>changes that affect existing
-    applications migrating from previous ICU releases</em>.
-    For more news about this release, see the
-    <!--
-    <a href="http://site.icu-project.org/download/">ICU download page</a>.
-    -->
-    <a href="http://site.icu-project.org/download/milestone">ICU milestone download page</a>.
-    </p>
-
-    <h3>Thread safety support cannot be removed</h3>
-    <p>ICU4C 50 dropped support for the --enable-threads/--disable-threads configure option
-    and the uconfig.h <code>ICU_USE_THREADS</code> switch.
-    ICU4C 50 and higher is always built with multi-threading safety support.
-    ICU4C has never created threads in its libraries.</p>
-
-    <p>If you need to prevent ICU from using thread safe mutexes when your application does
-    not create threads, then you can use the --enable-weak-threads configure option.
-    The --enable-weak-threads configure option will cause ICU to weakly reference the
-    pthread mutex functions, and the stub implementations in the C runtime will be used.
-    If this configure option does not work on your platform, then you can call
-    <code>u_setMutexFunctions()</code> and <code>u_setAtomicIncDecFunctions()</code>
-    with your own empty implementations.</p>
-
-    <h3>The default compilers have changed</h3>
-    <p>ICU has changed the compilers chosen by default. If the clang and clang++ compilers
-    are available, those will be used instead of gcc and g++. If the clang compilers
-    are not available, then gcc and g++ will be used just as before. The clang++ compiler
-    provides C++11 support and some optimizations that are helpful to ICU. The API
-    remains the same between these two sets of compilers, but ICU can internally leverage
-    language features and optimizations that are available in clang++.</p>
-
-    <p>If you need to force ICU to compile with gcc and g++, then you can use the following
-    from the command line in the source directory:</p>
-
-<pre>
-<samp>./configure CC=gcc CXX=g++ CFLAGS=-O3 CXXFLAGS=-O3</samp>
-</pre>
-
-    <h3>C++ Collator subclassing-API breaking changes</h3>
-    <p>We have made some changes to the C++ Collator API for ICU 50
-    that will make it easier to use and implement the Collator but
-    which are incompatible for subclasses.
-    If there are subclasses, they will have to be modified as well.
-    It will be easy to adapt subclass source code, if there is any.
-    We think it is unlikely (or at least rare) that users write subclasses of the C++ Collator,
-    given the number of virtual methods and the complexities of a collation implementation.</p>
-
-    <p>For details see the email "ICU4C C++ Collator subclassing-API breaking changes"
-    sent on 2012-jul-25 to the icu-design and icu-support
-    <a href="http://site.icu-project.org/contacts">mailing lists</a>,
-    and <a href="http://bugs.icu-project.org/trac/ticket/9346">ICU ticket #9346</a>,
-    including the <a href="http://bugs.icu-project.org/trac/review/9346">changes for that ticket</a>.</p>
-
-    <p>In particular, the <code>class TestCollator</code> in
-    <a href="http://bugs.icu-project.org/trac/browser/icu/trunk/source/test/intltest/apicoll.cpp"><code>source/test/intltest/apicoll.cpp</code></a>
-    <a href="http://bugs.icu-project.org/trac/changeset/32100#file5">illustrates how a subclass needs to be changed</a>.
-    However, note that the TestCollator was also simplified slightly;
-    not all changes made there were strictly required for the API signature changes.</p>
-
-    <h2><a name="Download" href="#Download" id="Download">How To Download the
-    Source Code</a></h2>
-
-    <p>There are two ways to download ICU releases:</p>
-
-    <ul>
-      <li><strong>Official Release Snapshot:</strong><br />
-       If you want to use ICU (as opposed to developing it), you should download
-      an official packaged version of the ICU source code. These versions are
-      tested more thoroughly than day-to-day development builds of the system,
-      and they are packaged in zip and tar files for convenient download. These
-      packaged files can be found at <a href=
-      "http://site.icu-project.org/download">http://site.icu-project.org/download</a>.<br />
-       The packaged snapshots are named <strong>icu-nnnn.zip</strong> or
-      <strong>icu-nnnn.tgz</strong>, where nnnn is the version number. The .zip
-      file is used for Windows platforms, while the .tgz file is preferred on
-      most other platforms.<br />
-       Please unzip this file. </li>
-
-      <li><strong>Subversion Source Repository:</strong><br />
-       If you are interested in developing features, patches, or bug fixes for
-      ICU, you should probably be working with the latest version of the ICU
-      source code. You will need to check the code out of our Subversion repository to
-      ensure that you have the most recent version of all of the files. See our
-      <a href="http://site.icu-project.org/repository">source
-      repository</a> for details.</li>
-    </ul>
-
-    <h2><a name="SourceCode" href="#SourceCode" id="SourceCode">ICU Source Code
-    Organization</a></h2>
-
-    <p>In the descriptions below, <strong><i>&lt;ICU&gt;</i></strong> is the full
-    path name of the ICU directory (the top level directory from the distribution
-    archives) in your file system. You can also view the <a href=
-    "http://userguide.icu-project.org/design">ICU Architectural
-    Design</a> section of the User's Guide to see which libraries you need for
-    your software product. You need at least the data (<code>[lib]icudt</code>)
-    and the common (<code>[lib]icuuc</code>) libraries in order to use ICU.</p>
-
-    <table class="docTable" summary="The following files describe the code drop.">
-      <caption>
-        The following files describe the code drop.
-      </caption>
-
-      <tr>
-        <th scope="col">File</th>
-
-        <th scope="col">Description</th>
-      </tr>
-
-      <tr>
-        <td>readme.html</td>
-
-        <td>Describes the International Components for Unicode (this file)</td>
-      </tr>
-
-      <tr>
-        <td>license.html</td>
-
-        <td>Contains the text of the ICU license</td>
-      </tr>
-    </table>
-
-    <p><br />
-    </p>
-
-    <table class="docTable" summary=
-    "The following directories contain source code and data files.">
-      <caption>
-        The following directories contain source code and data files.
-      </caption>
-
-      <tr>
-        <th scope="col">Directory</th>
-
-        <th scope="col">Description</th>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>common</b>/</td>
-
-        <td>The core Unicode and support functionality, such as resource bundles,
-        character properties, locales, codepage conversion, normalization,
-        Unicode properties, Locale, and UnicodeString.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>i18n</b>/</td>
-
-        <td>Modules in i18n are generally the more data-driven, that is to say
-        resource bundle driven, components. These deal with higher-level
-        internationalization issues such as formatting, collation, text break
-        analysis, and transliteration.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>layout</b>/</td>
-
-        <td>Contains the ICU layout engine (not a rasterizer).</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>io</b>/</td>
-
-        <td>Contains the ICU I/O library.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>data</b>/</td>
-
-        <td>
-          <p>This directory contains the source data in text format, which is
-          compiled into binary form during the ICU build process. It contains
-          several subdirectories, in which the data files are grouped by
-          function. Note that the build process must be run again after any
-          changes are made to this directory.</p>
-
-          <p>If some of the following directories are missing, it's probably
-          because you got an official download. If you need the data source files
-          for customization, then please download the ICU source code from <a
-          href="http://site.icu-project.org/repository">subversion</a>.</p>
-
-          <ul>
-            <li><b>in/</b> A directory that contains a pre-built data library for
-            ICU. A standard source code package will contain this file without
-            several of the following directories. This is to simplify the build
-            process for the majority of users and to reduce platform porting
-            issues.</li>
-
-            <li><b>brkitr/</b> Data files for character, word, sentence, title
-            casing and line boundary analysis.</li>
-
-            <li><b>locales/</b> These .txt files contain ICU language and
-            culture-specific localization data. Two special bundles are
-            <b>root</b>, which is the fallback data and parent of other bundles,
-            and <b>index</b>, which contains a list of installed bundles. The
-            makefile <b>resfiles.mk</b> contains the list of resource bundle
-            files.</li>
-
-            <li><b>mappings/</b> Here are the code page converter tables. These
-            .ucm files contain mappings to and from Unicode. These are compiled
-            into .cnv files. <b>convrtrs.txt</b> is the alias mapping table from
-            various converter name formats to ICU internal format and vice versa.
-            It produces cnvalias.icu. The makefiles <b>ucmfiles.mk,
-            ucmcore.mk,</b> and <b>ucmebcdic.mk</b> contain the list of
-            converters to be built.</li>
-
-            <li><b>translit/</b> This directory contains transliterator rules as
-            resource bundles, a makefile <b>trnsfiles.mk</b> containing the list
-            of installed system translitaration files, and as well the special
-            bundle <b>translit_index</b> which lists the system transliterator
-            aliases.</li>
-
-            <li><b>unidata/</b> This directory contains the Unicode data files.
-            Please see <a href=
-            "http://www.unicode.org/">http://www.unicode.org/</a> for more
-            information.</li>
-
-            <li><b>misc/</b> The misc directory contains other data files which
-            did not fit into the above categories. Currently it only contains
-            time zone information, and a name preperation file for <a href=
-            "http://www.ietf.org/rfc/rfc3490.txt">IDNA</a>.</li>
-
-            <li><b>out/</b> This directory contains the assembled memory mapped
-            files.</li>
-
-            <li><b>out/build/</b> This directory contains intermediate (compiled)
-            files, such as .cnv, .res, etc.</li>
-          </ul>
-
-          <p>If you are creating a special ICU build, you can set the ICU_DATA
-          environment variable to the out/ or the out/build/ directories, but
-          this is generally discouraged because most people set it incorrectly.
-          You can view the <a href=
-          "http://userguide.icu-project.org/icudata">ICU Data
-          Management</a> section of the ICU User's Guide for details.</p>
-        </td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/test/<b>intltest</b>/</td>
-
-        <td>A test suite including all C++ APIs. For information about running
-        the test suite, see the build instructions specific to your platform
-        later in this document.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/test/<b>cintltst</b>/</td>
-
-        <td>A test suite written in C, including all C APIs. For information
-        about running the test suite, see the build instructions specific to your
-        platform later in this document.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/test/<b>iotest</b>/</td>
-
-        <td>A test suite written in C and C++ to test the icuio library. For
-        information about running the test suite, see the build instructions
-        specific to your platform later in this document.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/test/<b>testdata</b>/</td>
-
-        <td>Source text files for data, which are read by the tests. It contains
-        the subdirectories <b>out/build/</b> which is used for intermediate
-        files, and <b>out/</b> which contains <b>testdata.dat.</b></td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>tools</b>/</td>
-
-        <td>Tools for generating the data files. Data files are generated by
-        invoking <i>&lt;ICU&gt;</i>/source/data/build/makedata.bat on Win32 or
-        <i>&lt;ICU&gt;</i>/source/make on UNIX.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>samples</b>/</td>
-
-        <td>Various sample programs that use ICU</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>extra</b>/</td>
-
-        <td>Non-supported API additions. Currently, it contains the 'uconv' tool
-        to perform codepage conversion on files.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/<b>packaging</b>/</td>
-
-        <td>This directory contain scripts and tools for packaging the final
-        ICU build for various release platforms.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>config</b>/</td>
-
-        <td>Contains helper makefiles for platform specific build commands. Used
-        by 'configure'.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/source/<b>allinone</b>/</td>
-
-        <td>Contains top-level ICU workspace and project files, for instance to
-        build all of ICU under one MSVC project.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/<b>include</b>/</td>
-
-        <td>Contains the headers needed for developing software that uses ICU on
-        Windows.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/<b>lib</b>/</td>
-
-        <td>Contains the import libraries for linking ICU into your Windows
-        application.</td>
-      </tr>
-
-      <tr>
-        <td><i>&lt;ICU&gt;</i>/<b>bin</b>/</td>
-
-        <td>Contains the libraries and executables for using ICU on Windows.</td>
-      </tr>
-    </table>
-    <!-- end of ICU structure ==================================== -->
-
-    <h2><a name="HowToBuild" href="#HowToBuild" id="HowToBuild">How To Build And
-    Install ICU</a></h2>
-
-    <h3><a name="RecBuild" href="#RecBuild" id=
-    "RecBuild">Recommended Build Options</a></h3>
-
-    <p>Depending on the platform and the type of installation,
-    we recommend a small number of modifications and build options.</p>
-    <ul>
-      <li><b>Namespace:</b> By default, unicode/uversion.h has
-        "using namespace icu;" which defeats much of the purpose of the namespace.
-        (This is for historical reasons: Originally, ICU4C did not use namespaces,
-        and some compilers did not support them. The default "using" statement
-        preserves source code compatibility.)<br />
-        We recommend you turn this off via <code>-DU_USING_ICU_NAMESPACE=0</code>
-        or by modifying unicode/uversion.h:
-<pre>Index: source/common/unicode/uversion.h
-===================================================================
---- source/common/unicode/uversion.h    (revision 26606)
-+++ source/common/unicode/uversion.h    (working copy)
-@@ -180,7 +180,8 @@
- #   define U_NAMESPACE_QUALIFIER U_ICU_NAMESPACE::
-
- #   ifndef U_USING_ICU_NAMESPACE
--#       define U_USING_ICU_NAMESPACE 1
-+        // Set to 0 to force namespace declarations in ICU usage.
-+#       define U_USING_ICU_NAMESPACE 0
- #   endif
- #   if U_USING_ICU_NAMESPACE
-         U_NAMESPACE_USE
-</pre>
-        ICU call sites then either qualify ICU types explicitly,
-        for example <code>icu::UnicodeString</code>,
-        or do <code>using icu::UnicodeString;</code> where appropriate.</li>
-      <li><b>Hardcode the default charset to UTF-8:</b> On platforms where
-        the default charset is always UTF-8,
-        like MacOS X and some Linux distributions,
-        we recommend hardcoding ICU's default charset to UTF-8.
-        This means that some implementation code becomes simpler and faster,
-        and statically linked ICU libraries become smaller.
-        (See the <a href="http://icu-project.org/apiref/icu4c/utypes_8h.html#0a33e1edf3cd23d9e9c972b63c9f7943">U_CHARSET_IS_UTF8</a>
-        API documentation for more details.)<br />
-        You can <code>-DU_CHARSET_IS_UTF8=1</code> or
-        modify unicode/utypes.h (in ICU 4.8 and below)
-        or modify unicode/platform.h (in ICU 49 and higher):
-<pre>Index: source/common/unicode/utypes.h
-===================================================================
---- source/common/unicode/utypes.h      (revision 26606)
-+++ source/common/unicode/utypes.h      (working copy)
-@@ -160,7 +160,7 @@
-  * @see UCONFIG_NO_CONVERSION
-  */
- #ifndef U_CHARSET_IS_UTF8
--#   define U_CHARSET_IS_UTF8 0
-+#   define U_CHARSET_IS_UTF8 1
- #endif
-
- /*===========================================================================*/
-</pre></li>
-      <li><b>UnicodeString constructors:</b> The UnicodeString class has
-        several single-argument constructors that are not marked "explicit"
-        for historical reasons.
-        This can lead to inadvertent construction of a <code>UnicodeString</code>
-        with a single character by using an integer,
-        and it can lead to inadvertent dependency on the conversion framework
-        by using a C string literal.<br />
-        Beginning with ICU 49, you should do the following:
-        <ul>
-          <li>Consider marking the from-<code>UChar</code>
-            and from-<code>UChar32</code> constructors explicit via
-            <code>-DUNISTR_FROM_CHAR_EXPLICIT=explicit</code> or similar.</li>
-          <li>Consider marking the from-<code>const char*</code> and
-            from-<code>const UChar*</code> constructors explicit via
-            <code>-DUNISTR_FROM_STRING_EXPLICIT=explicit</code> or similar.</li>
-        </ul>
-        Note: The ICU test suites cannot be compiled with these settings.
-      </li>
-      <li><b>utf.h, utf8.h, utf16.h, utf_old.h:</b>
-        By default, utypes.h (and thus almost every public ICU header)
-        includes all of these header files.
-        Often, none of them are needed, or only one or two of them.
-        All of utf_old.h is deprecated or obsolete.<br />
-        Beginning with ICU 49,
-        you should define <code>U_NO_DEFAULT_INCLUDE_UTF_HEADERS</code> to 1
-        (via -D or uconfig.h, as above)
-        and include those header files explicitly that you actually need.<br />
-        Note: The ICU test suites cannot be compiled with this setting.</li>
-      <li><b>.dat file:</b> By default, the ICU data is built into
-        a shared library (DLL). This is convenient because it requires no
-        install-time or runtime configuration,
-        but the library is platform-specific and cannot be modified.
-        A .dat package file makes the opposite trade-off:
-        Platform-portable (except for endianness and charset family, which
-        can be changed with the icupkg tool)
-        and modifiable (also with the icupkg tool).
-        If a path is set, then single data files (e.g., .res files)
-        can be copied to that location to provide new locale data
-        or conversion tables etc.<br />
-        The only drawback with a .dat package file is that the application
-        needs to provide ICU with the file system path to the package file
-        (e.g., by calling <code>u_setDataDirectory()</code>)
-        or with a pointer to the data (<code>udata_setCommonData()</code>)
-        before other ICU API calls.
-        This is usually easy if ICU is used from an application where
-        <code>main()</code> takes care of such initialization.
-        It may be hard if ICU is shipped with
-        another shared library (such as the Xerces-C++ XML parser)
-        which does not control <code>main()</code>.<br />
-        See the <a href="http://userguide.icu-project.org/icudata">User Guide ICU Data</a>
-        chapter for more details.<br />
-        If possible, we recommend building the .dat package.
-        Specify <code>--with-data-packaging=archive</code>
-        on the configure command line, as in<br />
-        <code>runConfigureICU Linux --with-data-packaging=archive</code><br />
-        (Read the configure script's output for further instructions.
-        On Windows, the Visual Studio build generates both the .dat package
-        and the data DLL.)<br />
-        Be sure to install and use the tiny stubdata library
-        rather than the large data DLL.</li>
-      <li><b>Static libraries:</b> It may make sense to build the ICU code
-        into static libraries (.a) rather than shared libraries (.so/.dll).
-        Static linking reduces the overall size of the binary by removing
-        code that is never called.<br />
-        Example configure command line:<br />
-        <code>runConfigureICU Linux --enable-static --disable-shared</code></li>
-      <li><b>Out-of-source build:</b> It is usually desirable to keep the ICU
-        source file tree clean and have build output files written to
-        a different location. This is called an "out-of-source build".
-        Simply invoke the configure script from the target location:
-<pre>~/icu$ svn export http://source.icu-project.org/repos/icu/icu/trunk
-~/icu$ mkdir trunk-dev
-~/icu$ cd trunk-dev
-~/icu/trunk-dev$ ../trunk/source/runConfigureICU Linux
-~/icu/trunk-dev$ make check</pre></li>
-    </ul>
-    <h4>ICU as a System-Level Library</h4>
-    <p>If ICU is installed as a system-level library, there are further
-      opportunities and restrictions to consider.
-      For details, see the <em>Using ICU as an Operating System Level Library</em>
-      section of the <a href="http://userguide.icu-project.org/design">User Guide ICU Architectural Design</a> chapter.</p>
-    <ul>
-      <li><b>Data path:</b> For a system-level library, it is best to load
-        ICU data from the .dat package file because the file system path
-        to the .dat package file can be hardcoded. ICU will automatically set
-        the path to the final install location using U_ICU_DATA_DEFAULT_DIR.
-        Alternatively, you can set <code>-DICU_DATA_DIR=/path/to/icu/data</code>
-        when building the ICU code. (Used by source/common/putil.c.)<br />
-        Consider also setting <code>-DICU_NO_USER_DATA_OVERRIDE</code>
-        if you do not want the "ICU_DATA" environment variable to be used.
-        (An application can still override the data path via
-        <code>u_setDataDirectory()</code> or
-        <code>udata_setCommonData()</code>.</li>
-      <li><b>Hide draft API:</b> API marked with <code>@draft</code>
-        is new and not yet stable. Applications must not rely on unstable
-        APIs from a system-level library.
-        Define <code>U_HIDE_DRAFT_API</code>, <code>U_HIDE_INTERNAL_API</code>
-        and <code>U_HIDE_SYSTEM_API</code>
-        by modifying unicode/utypes.h before installing it.</li>
-      <li><b>Only C APIs:</b> Applications must not rely on C++ APIs from a
-        system-level library because binary C++ compatibility
-        across library and compiler versions is very hard to achieve.
-        Most ICU C++ APIs are in header files that contain a comment with
-        <code>\brief C++ API</code>.
-        Consider not installing these header files.</li>
-      <li><b>Disable renaming:</b> By default, ICU library entry point names
-        have an ICU version suffix. Turn this off for a system-level installation,
-        to enable upgrading ICU without breaking applications. For example:<br />
-        <code>runConfigureICU Linux --disable-renaming</code><br />
-        The public header files from this configuration must be installed
-        for applications to include and get the correct entry point names.</li>
-    </ul>
-
-    <h3><a name="UserConfig" href="#UserConfig" id="UserConfig">User-Configurable Settings</a></h3>
-    <p>ICU4C can be customized via a number of user-configurable settings.
-    Many of them are controlled by preprocessor macros which are
-    defined in the <code>source/common/unicode/uconfig.h</code> header file.
-    Some turn off parts of ICU, for example conversion or collation,
-    trading off a smaller library for reduced functionality.
-    Other settings are recommended (see previous section)
-    but their default values are set for better source code compatibility.</p>
-
-    <p>In order to change such user-configurable settings, you can
-    either modify the <code>uconfig.h</code> header file by adding
-    a specific <code>#define ...</code> for one or more of the macros
-    before they are first tested,
-    or set the compiler's preprocessor flags (<code>CPPFLAGS</code>) to include
-    an equivalent <code>-D</code> macro definition.</p>
-
-    <h3><a name="HowToBuildWindows" href="#HowToBuildWindows" id=
-    "HowToBuildWindows">How To Build And Install On Windows</a></h3>
-
-    <p>Building International Components for Unicode requires:</p>
-
-    <ul>
-      <li>Microsoft Windows</li>
-
-      <li>Microsoft Visual C++</li>
-
-      <li><a href="#HowToBuildCygwin">Cygwin</a> is required when other versions
-      of Microsoft Visual C++ and other compilers are used to build ICU.</li>
-    </ul>
-
-    <p>The steps are:</p>
-
-    <ol>
-      <li>Unzip the icu-XXXX.zip file into any convenient location. Using command
-      line zip, type "unzip -a icu-XXXX.zip -d drive:\directory", or just use
-      WinZip.</li>
-
-      <li>Be sure that the ICU binary directory, <i>&lt;ICU&gt;</i>\bin\, is
-      included in the <strong>PATH</strong> environment variable. The tests will
-      not work without the location of the ICU DLL files in the path.</li>
-
-      <li>Open the "<i>&lt;ICU&gt;</i>\source\allinone\allinone.sln" workspace
-      file in Microsoft Visual Studio. (This solution includes all the
-      International Components for Unicode libraries, necessary ICU building
-      tools, and the test suite projects). Please see the <a href=
-      "#HowToBuildWindowsCommandLine">command line note below</a> if you want to
-      build from the command line instead.</li>
-
-      <li>Set the active platform to "Win32" or "x64" (See <a href="#HowToBuildWindowsPlatform">Windows platform note</a> below) 
-      and configuration to "Debug" or "Release" (See <a href="#HowToBuildWindowsConfig">Windows configuration note</a> below).</li>
-
-      <li>Choose the "Build" menu and select "Rebuild Solution". If you want to
-      build the Debug and Release at the same time, see the <a href=
-      "#HowToBuildWindowsBatch">batch configuration note</a> below.</li>
-
-
-      <li>Run the tests. They can be run from the command line or from within Visual Studio.
-
-	 <h4>Running the Tests from the Windows Command Line (cmd)</h4>
-	<ul>
-	   <li>For x86 (32 bit) and Debug, use: <br />
-
-	<tt><i>&lt;ICU&gt;</i>\source\allinone\icucheck.bat  <i>Platform</i> <i>Configuration</i>
-		</tt> <br />
-       </li>
-	<li>So, for example:
-				 <br />
-		<tt><i>&lt;ICU&gt;</i>\source\allinone\icucheck.bat  <b>x86</b> <b>Debug</b>
-		</tt>
-				<br/>  or <br />
-		<tt><i>&lt;ICU&gt;</i>\source\allinone\icucheck.bat  <b>x86</b> <b>Release</b>
-		</tt>
-				<br/>  or <br />
-		<tt><i>&lt;ICU&gt;</i>\source\allinone\icucheck.bat  <b>x64</b> <b>Release</b>
-		</tt></li>
-	</ul>	
-
-         <h4>Running the Tests from within Visual Studio</h4>
-
-	<ol>
-      <li>Run the C++ test suite, "intltest". To do this: set the active startup
-      project to "intltest", and press Ctrl+F5 to run it. Make sure that it
-      passes without any errors.</li>
-
-      <li>Run the C test suite, "cintltst". To do this: set the active startup
-      project to "cintltst", and press Ctrl+F5 to run it. Make sure that it
-      passes without any errors.</li>
-
-      <li>Run the I/O test suite, "iotest". To do this: set the active startup
-      project to "iotest", and press Ctrl+F5 to run it. Make sure that it passes
-      without any errors.</li>
-
-	</ol>
-
-	</li>
-
-      <li>You are now able to develop applications with ICU by using the
-      libraries and tools in <i>&lt;ICU&gt;</i>\bin\. The headers are in
-      <i>&lt;ICU&gt;</i>\include\ and the link libraries are in
-      <i>&lt;ICU&gt;</i>\lib\. To install the ICU runtime on a machine, or ship
-      it with your application, copy the needed components from
-      <i>&lt;ICU&gt;</i>\bin\ to a location on the system PATH or to your
-      application directory.</li>
-    </ol>
-
-    <p><a name="HowToBuildWindowsCommandLine" id=
-    "HowToBuildWindowsCommandLine"><strong>Using MSDEV At The Command Line
-    Note:</strong></a> You can build ICU from the command line. Assuming that you
-    have properly installed Microsoft Visual C++ to support command line
-    execution, you can run the following command, 'devenv.com
-    <i>&lt;ICU&gt;</i>\source\allinone\allinone.sln /build "Win32|Release"'. You can also
-    use Cygwin with this compiler to build ICU, and you can refer to the <a href=
-    "#HowToBuildCygwin">How To Build And Install On Windows with Cygwin</a>
-    section for more details.</p>
-    
-    <p><a name="HowToBuildWindowsPlatform" id=
-    "HowToBuildWindowsPlatform"><strong>Setting Active Platform
-    Note:</strong></a> Even though you are able to select "x64" as the active platform, if your operating system is 
-    not a 64 bit version of Windows, the build will fail. To set the active platform, two different possibilities are:</p>
-
-    <ul>
-      <li>Choose "Build" menu, select "Configuration Manager...", and select
-      "Win32" or "x64" for the Active Platform Solution.</li>
-
-      <li>Another way is to select the desired build configuration from "Solution
-      Platforms" dropdown menu from the standard toolbar. It will say
-      "Win32" or "x64" in the dropdown list.</li>
-    </ul>
-
-    <p><a name="HowToBuildWindowsConfig" id=
-    "HowToBuildWindowsConfig"><strong>Setting Active Configuration
-    Note:</strong></a> To set the active configuration, two different
-    possibilities are:</p>
-
-    <ul>
-      <li>Choose "Build" menu, select "Configuration Manager...", and select
-      "Release" or "Debug" for the Active Configuration Solution.</li>
-
-      <li>Another way is to select the desired build configuration from "Solution
-      Configurations" dropdown menu from the standard toolbar. It will say
-      "Release" or "Debug" in the dropdown list.</li>
-    </ul>
-
-    <p><a name="HowToBuildWindowsBatch" id="HowToBuildWindowsBatch"><strong>Batch
-    Configuration Note:</strong></a> If you want to build the Win32 and x64 platforms and 
-    Debug and Release configurations at the same time, choose "Build" menu, and select "Batch
-    Build...". Click the "Select All" button, and then click the "Rebuild"
-    button.</p>
-
-    <h3><a name="HowToBuildCygwin" href="#HowToBuildCygwin" id=
-    "HowToBuildCygwin">How To Build And Install On Windows with Cygwin</a></h3>
-
-    <p>Building International Components for Unicode with this configuration
-    requires:</p>
-
-    <ul>
-      <li>Microsoft Windows</li>
-
-      <li>Microsoft Visual C++ (when gcc isn't used).</li>
-
-      <li>
-        Cygwin with the following installed: 
-
-        <ul>
-          <li>bash</li>
-
-          <li>GNU make</li>
-
-          <li>ar</li>
-
-          <li>ranlib</li>
-
-          <li>man (if you plan to look at the man pages)</li>
-        </ul>
-      </li>
-    </ul>
-
-    <p>There are two ways you can build ICU with Cygwin. You can build with gcc
-    or Microsoft Visual C++. If you use gcc, the resulting libraries and tools
-    will depend on the Cygwin environment. If you use Microsoft Visual C++, the
-    resulting libraries and tools do not depend on Cygwin and can be more easily
-    distributed to other Windows computers (the generated man pages and shell
-    scripts still need Cygwin). To build with gcc, please follow the "<a href=
-    "#HowToBuildUNIX">How To Build And Install On UNIX</a>" instructions, while
-    you are inside a Cygwin bash shell. To build with Microsoft Visual C++,
-    please use the following instructions:</p>
-
-    <ol>
-      <li>Start the Windows "Command Prompt" window. This is different from the
-      gcc build, which requires the Cygwin Bash command prompt. The Microsoft
-      Visual C++ compiler will not work with a bash command prompt.</li>
-
-      <li>If the computer isn't set up to use Visual C++ from the command line,
-      you need to run vcvars32.bat.<br />For example:<br />"<tt>C:\Program Files\Microsoft
-      Visual Studio 8\VC\bin\vcvars32.bat</tt>" can be used for 32-bit builds
-      <strong>or</strong> <br />"<tt>C:\Program Files (x86)\Microsoft Visual Studio
-      8\VC\bin\amd64\vcvarsamd64.bat</tt>" can be used for 64-bit builds on
-      Windows x64.</li>
-
-      <li>Unzip the icu-XXXX.zip file into any convenient location. Using command
-      line zip, type "unzip -a icu-XXXX.zip -d drive:\directory", or just use
-      WinZip.</li>
-
-      <li>Change directory to "icu/source", which is where you unzipped ICU.</li>
-
-      <li>Run "<tt>bash <a href="source/runConfigureICU">./runConfigureICU</a>
-      Cygwin/MSVC</tt>" (See <a href="#HowToWindowsConfigureICU">Windows
-      configuration note</a> and non-functional configure options below).</li>
-
-      <li>Type <tt>"make"</tt> to compile the libraries and all the data files.
-      This make command should be GNU make.</li>
-
-      <li>Optionally, type <tt>"make check"</tt> to run the test suite, which
-      checks for ICU's functionality integrity (See <a href=
-      "#HowToTestWithoutGmake">testing note</a> below).</li>
-
-      <li>Type <tt>"make install"</tt> to install ICU. If you used the --prefix=
-      option on configure or runConfigureICU, ICU will be installed to the
-      directory you specified. (See <a href="#HowToInstallICU">installation
-      note</a> below).</li>
-    </ol>
-
-    <p><a name="HowToWindowsConfigureICU" id=
-    "HowToWindowsConfigureICU"><strong>Configuring ICU on Windows
-    NOTE:</strong></a> </p>
-    <p>
-    Ensure that the order of the PATH is MSVC, Cygwin, and then other PATHs. The configure 
-    script needs certain tools in Cygwin (e.g. grep).
-    </p>
-    <p>
-    Also, you may need to run <tt>"dos2unix.exe"</tt> on all of the scripts (e.g. configure)
-    in the top source directory of ICU. To avoid this issue, you can download
-    the ICU source for Unix platforms (icu-xxx.tgz).
-    </p>
-    <p>In addition to the Unix <a href=
-    "#HowToConfigureICU">configuration note</a> the following configure options
-    currently do not work on Windows with Microsoft's compiler. Some options can
-    work by manually editing <tt>icu/source/common/unicode/pwin32.h</tt>, but
-    manually editing the files is not recommended.</p>
-
-    <ul>
-      <li><tt>--disable-renaming</tt></li>
-
-      <li><tt>--enable-tracing</tt></li>
-
-      <li><tt>--enable-rpath</tt></li>
-
-      <li><tt>--enable-static</tt> (Requires that U_STATIC_IMPLEMENTATION be
-      defined in user code that links against ICU's static libraries.)</li>
-
-      <li><tt>--with-data-packaging=files</tt> (The pkgdata tool currently does
-      not work in this mode. Manual packaging is required to use this mode.)</li>
-    </ul>
-
-    <h3><a name="HowToBuildUNIX" href="#HowToBuildUNIX" id="HowToBuildUNIX">How
-    To Build And Install On UNIX</a></h3>
-
-    <p>Building International Components for Unicode on UNIX requires:</p>
-
-    <ul>
-      <li>A C++ compiler installed on the target machine (for example: gcc, CC,
-      xlC_r, aCC, cxx, etc...).</li>
-
-      <li>An ANSI C compiler installed on the target machine (for example:
-      cc).</li>
-
-      <li>A recent version of GNU make (3.80+).</li>
-
-      <li>For a list of z/OS tools please view the <a href="#HowToBuildZOS">z/OS
-      build section</a> of this document for further details.</li>
-    </ul>
-
-    <p>Here are the steps to build ICU:</p>
-
-    <ol>
-      <li>Decompress the icu-<i>X</i>.<i>Y</i>.tgz (or
-      icu-<i>X</i>.<i>Y</i>.tar.gz) file. For example, <tt>"gunzip -d &lt;
-      icu-<i>X</i>.<i>Y</i>.tgz | tar xvf -"</tt></li>
-
-      <li>Change directory to the "icu/source".</li>
-
-      <li>Run <span style='font-family: monospace;'>"chmod +x runConfigureICU configure install-sh"</span> because
-      these files may have the wrong permissions.</li>
-
-      <li>Run the <span style='font-family: monospace;'><a href="source/runConfigureICU">runConfigureICU</a></span>
-      script for your platform. (See <a href="#HowToConfigureICU">configuration
-      note</a> below).</li>
-
-      <li>Type <span style='font-family: monospace;'>"gmake"</span> (or "make" if GNU make is the default make on
-      your platform) to compile the libraries and all the data files. The proper
-      name of the GNU make command is printed at the end of the configuration
-      run, as in "You must use gmake to compile ICU".
-      <br/>
-      Note that the compilation command output may be simplified on your platform.  If this is the case, you will see just:
-      <blockquote><p style='background-color: #ddd; font-family: monospace; font-size: small'>gcc ... stubdata.c</p></blockquote>
-      rather than
-      <blockquote><p style='background-color: #ddd; font-family: monospace; font-size: small'>gcc  -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1 -D_REENTRANT -I../common -DU_ATTRIBUTE_DEPRECATED= -O2 -Wall -std=c99 -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -c -DPIC -fPIC -o stubdata.o stubdata.c</p></blockquote>
-      .<br/>
-      If you need to see the whole compilation line,  use <span style='font-family: monospace;'>"gmake VERBOSE=1"</span>. The full compilation line will print if an error occurs.
-      </li>
-
-      <li>Optionally, type <span style='font-family: monospace;'>"gmake check"</span> to run the test suite, which
-      checks for ICU's functionality integrity (See <a href=
-      "#HowToTestWithoutGmake">testing note</a> below).</li>
-
-      <li>Type <span style='font-family: monospace;'>"gmake install"</span> to install ICU. If you used the --prefix=
-      option on configure or runConfigureICU, ICU will be installed to the
-      directory you specified. (See <a href="#HowToInstallICU">installation
-      note</a> below).</li>
-    </ol>
-
-    <p><a name="HowToConfigureICU" id="HowToConfigureICU"><strong>Configuring ICU
-    NOTE:</strong></a> Type <tt>"./runConfigureICU --help"</tt> for help on how
-    to run it and a list of supported platforms. You may also want to type
-    <tt>"./configure --help"</tt> to print the available configure options that
-    you may want to give runConfigureICU. If you are not using the
-    runConfigureICU script, or your platform is not supported by the script, you
-    may need to set your CC, CXX, CFLAGS and CXXFLAGS environment variables, and
-    type <tt>"./configure"</tt>. 
-    HP-UX users, please see this <a href="#ImportantNotesHPUX">note regarding
-    HP-UX multithreaded build issues</a> with newer compilers. Solaris users,
-    please see this <a href="#ImportantNotesSolaris">note regarding Solaris
-    multithreaded build issues</a>.</p>
-
-    <p>ICU is built with strict compiler warnings enabled by default.  If this
-    causes excessive numbers of warnings on your platform, use the --disable-strict
-    option to configure to reduce the warning level.</p>
-
-    <p><a name="HowToTestWithoutGmake" id="HowToTestWithoutGmake"><strong>Running
-    The Tests From The Command Line NOTE:</strong></a> You may have to set
-    certain variables if you with to run test programs individually, that is
-    apart from "gmake check". The environment variable <strong>ICU_DATA</strong>
-    can be set to the full pathname of the data directory to indicate where the
-    locale data files and conversion mapping tables are when you are not using
-    the shared library (e.g. by using the .dat archive or the individual data
-    files). The trailing "/" is required after the directory name (e.g.
-    "$Root/source/data/out/" will work, but the value "$Root/source/data/out" is
-    not acceptable). You do not need to set <strong>ICU_DATA</strong> if the
-    complete shared data library is in your library path.</p>
-
-    <p><a name="HowToInstallICU" id="HowToInstallICU"><strong>Installing ICU
-    NOTE:</strong></a> Some platforms use package management tools to control the
-    installation and uninstallation of files on the system, as well as the
-    integrity of the system configuration. You may want to check if ICU can be
-    packaged for your package management tools by looking into the "packaging"
-    directory. (Please note that if you are using a snapshot of ICU from Subversion, it
-    is probable that the packaging scripts or related files are not up to date
-    with the contents of ICU at this time, so use them with caution).</p>
-
-    <h3><a name="HowToBuildZOS" href="#HowToBuildZOS" id="HowToBuildZOS">How To
-    Build And Install On z/OS (OS/390)</a></h3>
-
-    <p>You can install ICU on z/OS or OS/390 (the previous name of z/OS), but IBM
-    tests only the z/OS installation. You install ICU in a z/OS UNIX system
-    services file system such as HFS or zFS. On this platform, it is important
-    that you understand a few details:</p>
-
-    <ul>
-      <li>The makedep and GNU make tools are required for building ICU. If it
-      is not already installed on your system, it is available at the <a href=
-      "http://www-03.ibm.com/servers/eserver/zseries/zos/unix/bpxa1toy.html">z/OS UNIX -
-      Tools and Toys</a> site. The PATH environment variable should be updated to
-      contain the location of this executable prior to build. Failure to add these
-      tools to your PATH will cause ICU build failures or cause pkgdata to fail
-      to run.</li>
-
-      <li>Since USS does not support using the mmap() function over NFS, it is
-      recommended that you build ICU on a local filesystem. Once ICU has been
-      built, you should not have this problem while using ICU when the data
-      library has been built as a shared library, which is this is the default
-      setting.</li>
-
-      <li>Encoding considerations: The source code assumes that it is compiled
-      with codepage ibm-1047 (to be exact, the UNIX System Services variant of
-      it). The pax command converts all of the source code files from ASCII to
-      codepage ibm-1047 (USS) EBCDIC. However, some files are binary files and
-      must not be converted, or must be converted back to their original state.
-      You can use the <a href="as_is/os390/unpax-icu.sh">unpax-icu.sh</a> script
-      to do this for you automatically. It will unpackage the tar file and
-      convert all the necessary files for you automatically.</li>
-
-      <li>z/OS supports both native S/390 hexadecimal floating point and (with
-      OS/390 2.6 and later) IEEE 754 binary floating point. This is a compile
-      time option. Applications built with IEEE should use ICU DLLs that are
-      built with IEEE (and vice versa). The environment variable IEEE390=0 will
-      cause the z/OS version of ICU to be built without IEEE floating point
-      support and use the native hexadecimal floating point. By default ICU is
-      built with IEEE 754 support. Native floating point support is sufficient
-      for codepage conversion, resource bundle and UnicodeString operations, but
-      the Format APIs require IEEE binary floating point.</li>
-
-      <li>z/OS introduced the concept of Extra Performance Linkage (XPLINK) to
-      bring performance improvement opportunities to call-intensive C and C++
-      applications such as ICU. XPLINK is enabled on a DLL-by-DLL basis, so if
-      you are considering using XPLINK in your application that uses ICU, you
-      should consider building the XPLINK-enabled version of ICU. You need to
-      set ICU's environment variable <code>OS390_XPLINK=1</code> prior to
-      invoking the make process to produce binaries that are enabled for
-      XPLINK. The XPLINK option, which is available for z/OS 1.2 and later,
-      requires the PTF PQ69418 to build XPLINK enabled binaries.</li>
-
-      <li>ICU requires XPLINK for the icuio library. If you want to use the
-      rest of ICU without XPLINK, then you must use the --disable-icuio
-      configure option.</li>
-
-      <li>The latest versions of z/OS use <a
-      href="http://www.ibm.com/support/docview.wss?uid=swg2120240">XPLINK
-      version (C128) of the C++ standard library</a> by default. You may see <a
-      href="http://www.ibm.com/support/docview.wss?uid=swg21376279">an
-      error</a> when running with XPLINK disabled. To avoid this error,
-      set the following environment variable or similar:
-
-<pre><samp>export _CXX_PSYSIX="CEE.SCEELIB(C128N)":"CBC.SCLBSID(IOSTREAM,COMPLEX)"</samp></pre>
-      </li>
-      
-
-      <li>The rest of the instructions for building and testing ICU on z/OS with
-      UNIX System Services are the same as the <a href="#HowToBuildUNIX">How To
-      Build And Install On UNIX</a> section.</li>
-    </ul>
-
-    <h4>z/OS (Batch/PDS) support outside the UNIX system services
-    environment</h4>
-
-    <p>By default, ICU builds its libraries into the UNIX file system (HFS). In
-    addition, there is a z/OS specific environment variable (OS390BATCH) to build
-    some libraries into the z/OS native file system. This is useful, for example,
-    when your application is externalized via Job Control Language (JCL).</p>
-
-    <p>The OS390BATCH environment variable enables non-UNIX support including the
-    batch environment. When OS390BATCH is set, the libicui18n<i>XX</i>.dll,
-    libicuuc<i>XX</i>.dll, and libicudt<i>XX</i>e.dll binaries are built into
-    data sets (the native file system). Turning on OS390BATCH does not turn off
-    the normal z/OS UNIX build. This means that the z/OS UNIX (HFS) DLLs will
-    always be created.</p>
-
-    <p>Two additional environment variables indicate the names of the z/OS data
-    sets to use. The LOADMOD environment variable identifies the name of the data
-    set that contains the dynamic link libraries (DLLs) and the LOADEXP
-    environment variable identifies the name of the data set that contains the
-    side decks, which are normally the files with the .x suffix in the UNIX file
-    system.</p>
-
-    <p>A data set is roughly equivalent to a UNIX or Windows file. For most kinds
-    of data sets the operating system maintains record boundaries. UNIX and
-    Windows files are byte streams. Two kinds of data sets are PDS and PDSE. Each
-    data set of these two types contains a directory. It is like a UNIX
-    directory. Each "file" is called a "member". Each member name is limited to
-    eight bytes, normally EBCDIC.</p>
-
-    <p>Here is an example of some environment variables that you can set prior to
-    building ICU:</p>
-<pre>
-<samp>OS390BATCH=1
-LOADMOD=<i>USER</i>.ICU.LOAD
-LOADEXP=<i>USER</i>.ICU.EXP</samp>
-</pre>
-
-    <p>The PDS member names for the DLL file names are as follows:</p>
-<pre>
-<samp>IXMI<i>XX</i>IN --&gt; libicui18n<i>XX</i>.dll
-IXMI<i>XX</i>UC --&gt; libicuuc<i>XX</i>.dll
-IXMI<i>XX</i>DA --&gt; libicudt<i>XX</i>e.dll</samp>
-</pre>
-
-    <p>You should point the LOADMOD environment variable at a partitioned data
-    set extended (PDSE) and point the LOADEXP environment variable at a
-    partitioned data set (PDS). The PDSE can be allocated with the following
-    attributes:</p>
-<pre>
-<samp>Data Set Name . . . : <i>USER</i>.ICU.LOAD
-Management class. . : <i>**None**</i>
-Storage class . . . : <i>BASE</i>
-Volume serial . . . : <i>TSO007</i>
-Device type . . . . : <i>3390</i>
-Data class. . . . . : <i>LOAD</i>
-Organization  . . . : PO
-Record format . . . : U
-Record length . . . : 0
-Block size  . . . . : <i>32760</i>
-1st extent cylinders: 1
-Secondary cylinders : 5
-Data set name type  : LIBRARY</samp>
-</pre>
-
-    <p>The PDS can be allocated with the following attributes:</p>
-<pre>
-<samp>Data Set Name . . . : <i>USER</i>.ICU.EXP
-Management class. . : <i>**None**</i>
-Storage class . . . : <i>BASE</i>
-Volume serial . . . : <i>TSO007</i>
-Device type . . . . : <i>3390</i>
-Data class. . . . . : <i>**None**</i>
-Organization  . . . : PO
-Record format . . . : FB
-Record length . . . : 80
-Block size  . . . . : <i>3200</i>
-1st extent cylinders: 3
-Secondary cylinders : 3
-Data set name type  : PDS</samp>
-</pre>
-
-    <h3><a name="HowToBuildOS400" href="#HowToBuildOS400" id=
-    "HowToBuildOS400">How To Build And Install On The IBM i Family (IBM i, i5/OS OS/400)</a></h3>
-
-    <p>Before you start building ICU, ICU requires the following:</p>
-
-    <ul>
-      <li>QSHELL interpreter installed (install base option 30, operating system)
-      <!--li>QShell Utilities, PRPQ 5799-XEH (not required for V4R5)</li--></li>
-
-      <li>ILE C/C++ Compiler installed on the system</li>
-
-      <li>The latest IBM tools for Developers for IBM i &mdash;
-        <a href='http://www.ibm.com/servers/enable/site/porting/tools/'>http://www.ibm.com/servers/enable/site/porting/tools/</a>
-        <!-- formerly: http://www.ibm.com/servers/enable/site/porting/iseries/overview/gnu_utilities.html -->
-      </li>
-    </ul>
-
-    <p>The following describes how to setup and build ICU. For background
-    information, you should look at the <a href="#HowToBuildUNIX">UNIX build
-    instructions</a>.</p>
-
-    <ol>
-      <li>
-        Create target library. This library will be the target for the
-        resulting modules, programs and service programs. You will specify this
-        library on the OUTPUTDIR environment variable.
-<pre>
-<samp>CRTLIB LIB(<i>libraryname</i>)
-ADDENVVAR ENVVAR(OUTPUTDIR) VALUE('<i>libraryname</i>') REPLACE(*YES)   </samp>
-</pre>
-      </li>
-
-      <li>
-      Set up the following environment variables and job characteristics in your build process
-<pre>
-<samp>ADDENVVAR ENVVAR(MAKE) VALUE('gmake') REPLACE(*YES)
-CHGJOB CCSID(37)</samp>
-</pre></li>
-
-      <li>Run <tt>'QSH'</tt></li>
-      
-      <li>Run: <br /><tt>export PATH=/QIBM/ProdData/DeveloperTools/qsh/bin:$PATH:/QOpenSys/usr/bin</tt>
-      </li>
-
-      <li>Run <b><tt>gzip -d</tt></b> on the ICU source code compressed tar archive
-      (icu-<i>X</i>.<i>Y</i>.tgz).</li>
-
-      <li>Run <a href='as_is/os400/unpax-icu.sh'>unpax-icu.sh</a> on the tar file generated from the previous step.</li>
-
-      <li>Change your current directory to icu/as_is/os400.</li>
-      <li>Run <tt>qsh bldiculd.sh</tt> to build the program ICULD which ICU will use for linkage.</li>
-
-      <li>Change your current directory to icu/source.</li>
-
-      <li>Run <tt>'./runConfigureICU IBMi'</tt>  (See <a href="#HowToConfigureICU">configuration
-      note</a> for details). Note that --with-data-packaging=archive and setting the --prefix are recommended, building in default (dll) mode is currently not supported.</li>
-
-      <li>Run <tt>'gmake'</tt> to build ICU. (Do not use the -j option)</li>
-
-      <li>Run <tt>'gmake check QIBM_MULTI_THREADED=Y'</tt> to build and run the tests.
-      You can look at the <a href=
-      "http://publib.boulder.ibm.com/infocenter/iseries/v5r3/index.jsp?topic=/apis/concept4.htm">
-      iSeries Information Center</a> for more details regarding the running of multiple threads
-      on IBM i.</li>
-    </ol>
-
-      <!-- cross -->
-    <h3><a name="HowToCrossCompileICU" href="#HowToCrossCompileICU" id="HowToCrossCompileICU">How To Cross Compile ICU</a></h3>
-		<p>This section will explain how to build ICU on one platform, but to produce binaries intended to run on another. This is commonly known as a cross compile.</p>
-		<p>Normally, in the course of a build, ICU needs to run the tools that it builds in order to generate and package data and test-data.In a cross compilation setting, ICU is built on a different system from that which it eventually runs on. An example might be, if you are building for a small/headless system (such as an embedded device), or a system where you can't easily run the ICU command line tools (any non-UNIX-like system).</p>
-		<p>To reduce confusion, we will here refer to the "A" and the "B" system.System "A" is the actual system we will be running on- the only requirements on it is are it is able to build ICU from the command line targetting itself (with configure or runConfigureICU), and secondly, that it also contain the correct toolchain for compiling and linking for the resultant platform, referred to as the "B" system.</p>
-		<p>The autoconf docs use the term "build" for A, and "host" for B. More details at: <a href="http://www.gnu.org/software/autoconf/manual/html_node/Specifying-Names.html#Specifying-Names">http://www.gnu.org/software/autoconf/manual/html_node/Specifying-Names.html</a></p>
-		<p>Three initially-empty directories will be used in this example:</p>
-		<table summary="Three directories used in this example" class="docTable">
-			<tr>
-				<th align="left">/icu</th><td>a copy of the ICU source</td>
-			</tr>
-			<tr>
-				<th align="left">/buildA</th><td>an empty directory, it will contain ICU built for A<br />(MacOSX in this case)</td>
-			</tr>
-			<tr>
-				<th align="left">/buildB</th><td>an empty directory, it will contain ICU built for B<br />(HaikuOS in this case)</td>
-			</tr>
-		</table>
-		
-		<ol>
-		<li>Check out or unpack the ICU source code into the /icu directory.You will have the directories /icu/source, etc.</li>
-		<li>Build ICU in /buildA normally (using runConfigureICU or configure):
-<pre class="samp">cd /buildA
-sh /icu/source/runConfigureICU <strong>MacOSX</strong>
-gnumake
-</pre>
-		</li>
-		<li>Set PATH or other variables as needed, such as CPPFLAGS.</li>
-		<li>Build ICU in /buildB<br />
-			<div class="note"><b>Note:</b> "<code>--with-cross-build</code>" takes an absolute path.</div>
-<pre class="samp">cd /buildB
-sh /icu/source/configure --host=<strong>i586-pc-haiku</strong> --with-cross-build=<strong>/buildA</strong>
-gnumake</pre>
-		</li>
-		<li>Tests and testdata can be built with "gnumake tests".</li>
-	</ol>
-      <!-- end cross -->
-
-    <!-- end build environment -->
-
-    <h2><a name="HowToPackage" href="#HowToPackage" id="HowToPackage">How To
-    Package ICU</a></h2>
-
-    <p>There are many ways that a person can package ICU with their software
-    products. Usually only the libraries need to be considered for packaging.</p>
-
-    <p>On UNIX, you should use "<tt>gmake install</tt>" to make it easier to
-    develop and package ICU. The bin, lib and include directories are needed to
-    develop applications that use ICU. These directories will be created relative
-    to the "<tt>--prefix=</tt><i>dir</i>" configure option (See the <a href=
-    "#HowToBuildUNIX">UNIX build instructions</a>). When ICU is built on Windows,
-    a similar directory structure is built.</p>
-
-    <p>When changes have been made to the standard ICU distribution, it is
-    recommended that at least one of the following guidelines be followed for
-    special packaging.</p>
-
-    <ol>
-      <li>Add a suffix name to the library names. This can be done with the
-      --with-library-suffix configure option.</li>
-
-      <li>The installation script should install the ICU libraries into the
-      application's directory.</li>
-    </ol>
-
-    <p>Following these guidelines prevents other applications that use a standard
-    ICU distribution from conflicting with any libraries that you need. On
-    operating systems that do not have a standard C++ ABI (name mangling) for
-    compilers, it is recommended to do this special packaging anyway. More
-    details on customizing ICU are available in the <a href=
-    "http://userguide.icu-project.org/">User's Guide</a>. The <a href=
-    "#SourceCode">ICU Source Code Organization</a> section of this readme.html
-    gives a more complete description of the libraries.</p>
-
-    <table class="docTable" summary=
-    "ICU has several libraries for you to use.">
-      <caption>
-        Here is an example of libraries that are frequently packaged.
-      </caption>
-
-      <tr>
-        <th scope="col">Library Name</th>
-
-        <th scope="col">Windows Filename</th>
-
-        <th scope="col">Linux Filename</th>
-
-        <th scope="col">Comment</th>
-      </tr>
-
-      <tr>
-        <td>Data Library</td>
-
-        <td>icudt<i>XY</i>l.dll</td>
-
-        <td>libicudata.so.<i>XY</i>.<i>Z</i></td>
-
-        <td>Data required by the Common and I18n libraries. There are many ways
-        to package and <a href=
-        "http://userguide.icu-project.org/icudata">customize this
-        data</a>, but by default this is all you need.</td>
-      </tr>
-
-      <tr>
-        <td>Common Library</td>
-
-        <td>icuuc<i>XY</i>.dll</td>
-
-        <td>libicuuc.so.<i>XY</i>.<i>Z</i></td>
-
-        <td>Base library required by all other ICU libraries.</td>
-      </tr>
-
-      <tr>
-        <td>Internationalization (i18n) Library</td>
-
-        <td>icuin<i>XY</i>.dll</td>
-
-        <td>libicui18n.so.<i>XY</i>.<i>Z</i></td>
-
-        <td>A library that contains many locale based internationalization (i18n)
-        functions.</td>
-      </tr>
-
-      <tr>
-        <td>Layout Engine</td>
-
-        <td>icule<i>XY</i>.dll</td>
-
-        <td>libicule.so.<i>XY</i>.<i>Z</i></td>
-
-        <td>An optional engine for doing font layout.</td>
-      </tr>
-
-      <tr>
-        <td>Layout Extensions Engine</td>
-
-        <td>iculx<i>XY</i>.dll</td>
-
-        <td>libiculx.so.<i>XY</i>.<i>Z</i></td>
-
-        <td>An optional engine for doing font layout that uses parts of ICU.</td>
-      </tr>
-
-      <tr>
-        <td>ICU I/O (Unicode stdio) Library</td>
-
-        <td>icuio<i>XY</i>.dll</td>
-
-        <td>libicuio.so.<i>XY</i>.<i>Z</i></td>
-
-        <td>An optional library that provides a stdio like API with Unicode
-        support.</td>
-      </tr>
-
-      <tr>
-        <td>Tool Utility Library</td>
-
-        <td>icutu<i>XY</i>.dll</td>
-
-        <td>libicutu.so.<i>XY</i>.<i>Z</i></td>
-
-        <td>An internal library that contains internal APIs that are only used by
-        ICU's tools. If you do not use ICU's tools, you do not need this
-        library.</td>
-      </tr>
-    </table>
-
-    <p>Normally only the above ICU libraries need to be considered for packaging.
-    The versionless symbolic links to these libraries are only needed for easier
-    development. The <i>X</i>, <i>Y</i> and <i>Z</i> parts of the name are the
-    version numbers of ICU. For example, ICU 2.0.2 would have the name
-    libicuuc.so.20.2 for the common library. The exact format of the library
-    names can vary between platforms due to how each platform can handles library
-    versioning.</p>
-
-    <h2><a name="ImportantNotes" href="#ImportantNotes" id=
-    "ImportantNotes">Important Notes About Using ICU</a></h2>
-
-    <h3><a name="ImportantNotesMultithreaded" href="#ImportantNotesMultithreaded"
-    id="ImportantNotesMultithreaded">Using ICU in a Multithreaded
-    Environment</a></h3>
-
-    <p>Some versions of ICU require calling the <code>u_init()</code> function
-    from <code>uclean.h</code> to ensure that ICU is initialized properly. In
-    those ICU versions, <code>u_init()</code> must be called before ICU is used
-    from multiple threads. There is no harm in calling <code>u_init()</code> in a
-    single-threaded application, on a single-CPU machine, or in other cases where
-    <code>u_init()</code> is not required.</p>
-
-    <p>In addition to ensuring thread safety, <code>u_init()</code> also attempts
-    to load at least one ICU data file. Assuming that all data files are packaged
-    together (or are in the same folder in files mode), a failure code from
-    <code>u_init()</code> usually means that the data cannot be found. In this
-    case, the data may not be installed properly, or the application may have
-    failed to call <code>udata_setCommonData()</code> or
-    <code>u_setDataDirectory()</code> which specify to ICU where it can find its
-    data.</p>
-
-    <p>Since <code>u_init()</code> will load only one or two data files, it
-    cannot guarantee that all of the data that an application needs is available.
-    It cannot check for all data files because the set of files is customizable,
-    and some ICU services work without loading any data at all. An application
-    should always check for error codes when opening ICU service objects (using
-    <code>ucnv_open()</code>, <code>ucol_open()</code>, C++ constructors,
-    etc.).</p>
-
-    <h4>ICU 3.4 and later</h4>
-
-    <p>ICU 3.4 self-initializes properly for multi-threaded use. It achieves this
-    without performance penalty by hardcoding the core Unicode properties data,
-    at the cost of some flexibility. (For details see Jitterbug 4497.)</p>
-
-    <p><code>u_init()</code> can be used to check for data loading. It tries to
-    load the converter alias table (<code>cnvalias.icu</code>).</p>
-
-    <h4>ICU 2.6..3.2</h4>
-
-    <p>These ICU versions require a call to <code>u_init()</code> before
-    multi-threaded use. The services that are directly affected are those that
-    don't have a service object and need to be fast: normalization and character
-    properties.</p>
-
-    <p><code>u_init()</code> loads and initializes the data files for
-    normalization and character properties (<code>unorm.icu</code> and
-    <code>uprops.icu</code>) and can therefore also be used to check for data
-    loading.</p>
-
-    <h4>ICU 2.4 and earlier</h4>
-
-    <p>ICU 2.4 and earlier versions were not prepared for multithreaded use on
-    multi-CPU platforms where the CPUs implement weak memory coherency. These
-    CPUs include: Power4, Power5, Alpha, Itanium. <code>u_init()</code> was not
-    defined yet.</p>
-
-    <h4><a name="ImportantNotesHPUX" href="#ImportantNotesHPUX" id=
-    "ImportantNotesHPUX">Using ICU in a Multithreaded Environment on
-    HP-UX</a></h4>
-
-    <p>When ICU is built with aCC on HP-UX, the <a
-    href="http://h21007.www2.hp.com/portal/site/dspp/menuitem.863c3e4cbcdc3f3515b49c108973a801?ciid=eb08b3f1eee02110b3f1eee02110275d6e10RCRD">-AA</a>
-    compiler flag is used. It is required in order to use the latest
-    &lt;iostream&gt; API in a thread safe manner. This compiler flag affects the
-    version of the C++ library being used. Your applications will also need to
-    be compiled with -AA in order to use ICU.</p>
-
-    <h4><a name="ImportantNotesSolaris" href="#ImportantNotesSolaris" id=
-    "ImportantNotesSolaris">Using ICU in a Multithreaded Environment on
-    Solaris</a></h4>
-
-    <h5>Linking on Solaris</h5>
-
-    <p>In order to avoid synchronization and threading issues, developers are
-    <strong>suggested</strong> to strictly follow the compiling and linking
-    guidelines for multithreaded applications, specified in the following
-    document from Sun Microsystems. Most notably, pay strict attention to the
-    following statements from Sun:</p>
-
-    <blockquote>
-      <p>To use libthread, specify -lthread before -lc on the ld command line, or
-      last on the cc command line.</p>
-
-      <p>To use libpthread, specify -lpthread before -lc on the ld command line,
-      or last on the cc command line.</p>
-    </blockquote>
-
-    <p>Failure to do this may cause spurious lock conflicts, recursive mutex
-    failure, and deadlock.</p>
-
-    <p>Source: "<i>Solaris Multithreaded Programming Guide, Compiling and
-    Debugging</i>", Sun Microsystems, Inc., Apr 2004<br />
-     <a href=
-    "http://docs.sun.com/app/docs/doc/816-5137/6mba5vpke?a=view">http://docs.sun.com/app/docs/doc/816-5137/6mba5vpke?a=view</a></p>
-
-    <h3><a name="ImportantNotesWindows" href="#ImportantNotesWindows" id=
-    "ImportantNotesWindows">Windows Platform</a></h3>
-
-    <p>If you are building on the Win32 platform, it is important that you
-    understand a few of the following build details.</p>
-
-    <h4>DLL directories and the PATH setting</h4>
-
-    <p>As delivered, the International Components for Unicode build as several
-    DLLs, which are placed in the "<i>&lt;ICU&gt;</i>\bin" directory. You must
-    add this directory to the PATH environment variable in your system, or any
-    executables you build will not be able to access International Components for
-    Unicode libraries. Alternatively, you can copy the DLL files into a directory
-    already in your PATH, but we do not recommend this. You can wind up with
-    multiple copies of the DLL and wind up using the wrong one.</p>
-
-    <h4><a name="ImportantNotesWindowsPath" id=
-    "ImportantNotesWindowsPath">Changing your PATH</a></h4>
-
-    <p><strong>Windows 2000/XP</strong>: Use the System Icon in the Control
-    Panel. Pick the "Advanced" tab. Select the "Environment Variables..."
-    button. Select the variable PATH in the lower box, and select the lower
-    "Edit..." button. In the "Variable Value" box, append the string
-    ";<i>&lt;ICU&gt;</i>\bin" to the end of the path string. If there is
-    nothing there, just type in "<i>&lt;ICU&gt;</i>\bin". Click the Set button,
-    then the OK button.</p>
-
-    <p>Note: When packaging a Windows application for distribution and
-    installation on user systems, copies of the ICU DLLs should be included with
-    the application, and installed for exclusive use by the application. This is
-    the only way to insure that your application is running with the same version
-    of ICU, built with exactly the same options, that you developed and tested
-    with. Refer to Microsoft's guidelines on the usage of DLLs, or search for the
-    phrase "DLL hell" on <a href=
-    "http://msdn.microsoft.com/">msdn.microsoft.com</a>.</p>
-
-    <h3><a name="ImportantNotesUNIX" href="#ImportantNotesUNIX" id=
-    "ImportantNotesUNIX">UNIX Type Platform</a></h3>
-
-    <p>If you are building on a UNIX platform, and if you are installing ICU in a
-    non-standard location, you may need to add the location of your ICU libraries
-    to your <strong>LD_LIBRARY_PATH</strong> or <strong>LIBPATH</strong>
-    environment variable (or the equivalent runtime library path environment
-    variable for your system). The ICU libraries may not link or load properly
-    without doing this.</p>
-
-    <p>Note that if you do not want to have to set this variable, you may instead
-    use the --enable-rpath option at configuration time. This option will
-    instruct the linker to always look for the libraries where they are
-    installed. You will need to use the appropriate linker options when linking
-    your own applications and libraries against ICU, too. Please refer to your
-    system's linker manual for information about runtime paths. The use of rpath
-    also means that when building a new version of ICU you should not have an
-    older version installed in the same place as the new version's installation
-    directory, as the older libraries will used during the build, instead of the
-    new ones, likely leading to an incorrectly build ICU. This is the proper
-    behavior of rpath.</p>
-
-    <h2><a name="PlatformDependencies" href="#PlatformDependencies" id=
-    "PlatformDependencies">Platform Dependencies</a></h2>
-
-    <h3><a name="PlatformDependenciesNew" href="#PlatformDependenciesNew" id=
-    "PlatformDependenciesNew">Porting To A New Platform</a></h3>
-
-    <p>If you are using ICU's Makefiles to build ICU on a new platform, there are
-    a few places where you will need to add or modify some files. If you need
-    more help, you can always ask the <a href=
-    "http://site.icu-project.org/contacts">icu-support mailing list</a>. Once
-    you have finished porting ICU to a new platform, it is recommended that you
-    contribute your changes back to ICU via the icu-support mailing list. This
-    will make it easier for everyone to benefit from your work.</p>
-
-    <h4>Data For a New Platform</h4>
-
-    <p>For some people, it may not be necessary for completely build ICU. Most of
-    the makefiles and build targets are for tools that are used for building
-    ICU's data, and an application's data (when an application uses ICU resource
-    bundles for its data).</p>
-
-    <p>Data files can be built on a different platform when both platforms share
-    the same endianness and the same charset family. This assertion does not
-    include platform dependent DLLs/shared/static libraries. For details see the
-    User Guide <a href="http://userguide.icu-project.org/icudata">ICU
-    Data</a> chapter.</p>
-
-    <p>ICU 3.6 removes the requirement that ICU be completely built in the native
-    operating environment. It adds the icupkg tool which can be run on any
-    platform to turn binary ICU data files from any one of the three formats into
-    any one of the other data formats. This allows a application to use ICU data
-    built anywhere to be used for any other target platform.</p>
-
-    <p><strong>WARNING!</strong> Building ICU without running the tests is not
-    recommended. The tests verify that ICU is safe to use. It is recommended that
-    you try to completely port and test ICU before using the libraries for your
-    own application.</p>
-
-    <h4>Adapting Makefiles For a New Platform</h4>
-
-    <p>Try to follow the build steps from the <a href="#HowToBuildUNIX">UNIX</a>
-    build instructions. If the configure script fails, then you will need to
-    modify some files. Here are the usual steps for porting to a new
-    platform:<br />
-    </p>
-
-    <ol>
-      <li>Create an mh file in icu/source/config/. You can use mh-linux or a
-      similar mh file as your base configuration.</li>
-
-      <li>Modify icu/source/aclocal.m4 to recognize your platform's mh file.</li>
-
-      <li>Modify icu/source/configure.in to properly set your <b>platform</b> C
-      Macro define.</li>
-
-      <li>Run <a href="http://www.gnu.org/software/autoconf/">autoconf</a> in
-      icu/source/ without any options. The autoconf tool is standard on most
-      Linux systems.</li>
-
-      <li>If you have any optimization options that you want to normally use, you
-      can modify icu/source/runConfigureICU to specify those options for your
-      platform.</li>
-
-      <li>Build and test ICU on your platform. It is very important that you run
-      the tests. If you don't run the tests, there is no guarentee that you have
-      properly ported ICU.</li>
-    </ol>
-
-    <h3><a name="PlatformDependenciesImpl" href="#PlatformDependenciesImpl" id=
-    "PlatformDependenciesImpl">Platform Dependent Implementations</a></h3>
-
-    <p>The platform dependencies have been mostly isolated into the following
-    files in the common library. This information can be useful if you are
-    porting ICU to a new platform.</p>
-
-    <ul>
-      <li>
-        <strong>unicode/platform.h.in</strong> (autoconf'ed platforms)<br />
-         <strong>unicode/p<i>XXXX</i>.h</strong> (others: pwin32.h, ppalmos.h,
-        ..): Platform-dependent typedefs and defines:<br />
-        <br />
-         
-
-        <ul>
-          <li>Generic types like UBool, int8_t, int16_t, int32_t, int64_t,
-          uint64_t etc.</li>
-
-          <li>U_EXPORT and U_IMPORT for specifying dynamic library import and
-          export</li>
-
-          <li>String handling support for the char16_t and wchar_t types.</li>
-        </ul>
-        <br />
-      </li>
-
-      <li>
-        <strong>unicode/putil.h, putil.c</strong>: platform-dependent
-        implementations of various functions that are platform dependent:<br />
-        <br />
-         
-
-        <ul>
-          <li>uprv_isNaN, uprv_isInfinite, uprv_getNaN and uprv_getInfinity for
-          handling special floating point values.</li>
-
-          <li>uprv_tzset, uprv_timezone, uprv_tzname and time for getting
-          platform specific time and time zone information.</li>
-
-          <li>u_getDataDirectory for getting the default data directory.</li>
-
-          <li>uprv_getDefaultLocaleID for getting the default locale
-          setting.</li>
-
-          <li>uprv_getDefaultCodepage for getting the default codepage
-          encoding.</li>
-        </ul>
-        <br />
-      </li>
-
-      <li>
-        <strong>umutex.h, umutex.c</strong>: Code for doing synchronization in
-        multithreaded applications. If you wish to use International Components
-        for Unicode in a multithreaded application, you must provide a
-        synchronization primitive that the classes can use to protect their
-        global data against simultaneous modifications. We already supply working
-        implementations for many platforms that ICU builds on.<br />
-        <br />
-      </li>
-
-      <li><strong>umapfile.h, umapfile.c</strong>: functions for mapping or
-      otherwise reading or loading files into memory. All access by ICU to data
-      from files makes use of these functions.<br />
-      <br />
-      </li>
-
-      <li>Using platform specific #ifdef macros are highly discouraged outside of
-      the scope of these files. When the source code gets updated in the future,
-      these #ifdef's can cause testing problems for your platform.</li>
-    </ul>
-    <hr />
-
-    <p>Copyright &copy; 1997-2012 International Business Machines Corporation and
-    others. All Rights Reserved.<br />
-     IBM Globalization Center of Competency - San Jos&eacute;<br />
-     4400 North First Street<br />
-     San Jos&eacute;, CA 95134<br />
-     USA</p>
-  </body>
-</html>
-
--- a/intl/icu/source/Makefile.in
+++ b/intl/icu/source/Makefile.in
@@ -1,11 +1,11 @@
 #******************************************************************************
 #
-#   Copyright (C) 1998-2012, International Business Machines
+#   Copyright (C) 1998-2013, International Business Machines
 #   Corporation and others.  All Rights Reserved.
 #
 #******************************************************************************
 ## Top-level Makefile.in for ICU
 ## Stephen F. Booth
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -29,16 +29,17 @@ subdir = .
 #AUTOCONF = @AUTOCONF@
 
 ## Optional directory setup
 @LAYOUT_TRUE@LAYOUT = layout layoutex
 @ICUIO_TRUE@ICUIO = io
 @EXTRAS_TRUE@EXTRA = extra
 @TESTS_TRUE@TEST = test
 @SAMPLES_TRUE@SAMPLE = samples
+@TOOLS_TRUE@TOOLS = tools
 
 ## pkgconfig setup. Always have uc and i18n. Others are optional.
 ALL_PKGCONFIG_SUFFIX=uc i18n
 @LAYOUT_TRUE@ALL_PKGCONFIG_SUFFIX+= le lx
 @ICUIO_TRUE@ALL_PKGCONFIG_SUFFIX+= io
 
 DOXYGEN = @DOXYGEN@
 DOCZIP = icu-docs.zip
@@ -47,20 +48,20 @@ DOCZIP = icu-docs.zip
 CLEANFILES = *~
 
 ALL_PKGCONFIG_FILES=$(ALL_PKGCONFIG_SUFFIX:%=$(top_builddir)/config/icu-%.pc)
 
 ## Files built (autoconfed) and installed
 INSTALLED_BUILT_FILES = $(top_builddir)/config/Makefile.inc $(top_builddir)/config/pkgdata.inc $(top_builddir)/config/icu-config @platform_make_fragment@ $(EXTRA_DATA:%=$(DESTDIR)$(pkglibdir)/%) $(ALL_PKGCONFIG_FILES)
 
 ## Files built (autoconfed) but not installed
-LOCAL_BUILT_FILES = icudefs.mk config/icucross.mk
+LOCAL_BUILT_FILES = icudefs.mk config/icucross.mk config/icucross.inc
 
 DOCDIRS = common i18n
-SUBDIRS =  stubdata common i18n $(LAYOUT) tools data $(ICUIO) $(EXTRA) $(SAMPLE) $(TEST)
+SUBDIRS =  stubdata common i18n $(LAYOUT) $(ICUIO) $(TOOLS) data $(EXTRA) $(SAMPLE) $(TEST)
 
 SECTION = 1
 
 MANX_FILES = config/icu-config.$(SECTION)
 
 ALL_MAN_FILES = $(MANX_FILES)
 
 ## Extra files to install [nothing at present]
@@ -84,16 +85,19 @@ clean: clean-recursive-with-twist clean-
 distclean : distclean-recursive distclean-local
 dist: dist-recursive dist-local
 check: all check-recursive
 check-recursive: all
 xcheck: all xcheck-recursive
 xperf: all xperf-recursive
 check-exhaustive: all check-exhaustive-recursive
 
+pcheck: all tests
+	@$(MAKE) -C test pcheck
+
 check-exhaustive-local: check-local
 
 xcheck-recursive: all xcheck-local
 	@$(MAKE) -C test xcheck
 
 xperf-recursive: all tests
 	@$(MAKE) -C test/perf xperf
 
@@ -122,17 +126,17 @@ Doxyfile: $(srcdir)/Doxyfile.in
 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(DOCZIP): doc
 	-$(RMV) $(DOCZIP)
 	( cd doc/html ; zip -r ../../$(DOCZIP) * )
 endif
 
 LOCAL_SUBDIRS = $(SUBDIRS)
-CLEAN_FIRST_SUBDIRS = tools
+CLEAN_FIRST_SUBDIRS = $(TOOLS)
 
 $(LIBDIR) $(BINDIR):
 	-$(MKINSTALLDIRS) $@
 
 ## Recursive targets
 all-recursive install-recursive clean-recursive distclean-recursive dist-recursive check-recursive check-exhaustive-recursive: $(LIBDIR) $(BINDIR)
 	@dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -201,48 +205,53 @@ clean-local:
 	test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES)
 	-$(RMV) "test-*.xml"
 	-$(RMV) "perf-*.xml"
 	-$(RMV) $(ALL_PKGCONFIG_FILES) $(top_builddir)/config/icuinfo.xml
 	$(RMV) Doxyfile doc $(DOCZIP)
 
 distclean-local: clean-local
 	$(RMV) $(top_builddir)/config/Makefile.inc $(top_builddir)/config/pkgdata.inc $(top_builddir)/config/icu-config $(top_builddir)/config/icu.pc $(ALL_PKGCONFIG_FILES)
-	$(RMV) config.cache config.log config.status $(top_builddir)/config/icucross.mk autom4te.cache uconfig.h.prepend
+	$(RMV) config.cache config.log config.status $(top_builddir)/config/icucross.mk $(top_builddir)/config/icucross.inc autom4te.cache uconfig.h.prepend
 	$(RMV) Makefile config/Makefile icudefs.mk $(LIBDIR) $(BINDIR)
 	-$(RMV) dist
 
 check-local: xcheck-local
 	-$(RMV) test-local.xml
 
 xcheck-local: $(top_builddir)/config/icu-config $(top_builddir)/config/Makefile.inc $(top_builddir)/config/pkgdata.inc
 	@echo verifying that icu-config --selfcheck can operate
 	@test "passed" = "$(shell $(top_builddir)/config/icu-config --selfcheck 2>&1)" || (echo "FAIL: icu-config could not run properly." ; exit 1)
 	@echo verifying that $(MAKE) -f Makefile.inc selfcheck can operate
 	@test "passed" = "$(shell $(MAKE) --no-print-directory -f $(top_builddir)/config/Makefile.inc SELFCHECK=1 selfcheck)" || (echo "FAIL: Makefile.inc could not run properly." ; exit 1 )
 	@echo "PASS: config selfcheck OK"
 
-#$(srcdir)/configure : $(srcdir)/configure.in $(top_srcdir)/aclocal.m4
-#	cd $(srcdir) && $(AUTOCONF)
+#$(srcdir)/configure : $(srcdir)/configure.ac $(top_srcdir)/aclocal.m4
+#	cd $(srcdir) && aclocal && $(AUTOCONF)
 
 icudefs.mk: $(srcdir)/icudefs.mk.in  $(top_builddir)/config.status
 	cd $(top_builddir) \
 		&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 config/icucross.mk: $(top_builddir)/icudefs.mk  $(top_builddir)/Makefile
 	@echo rebuilding $@
 	@(echo "CROSS_ICU_VERSION=$(VERSION)" ;\
 	  echo "TOOLEXEEXT=$(EXEEXT)" \
 	   ) > $@
 	@(echo 'TOOLBINDIR=$$(cross_buildroot)/bin' ;\
 	  echo 'TOOLLIBDIR=$$(cross_buildroot)/lib' ;\
 	  echo "INVOKE=$(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)"'$$(TOOLLIBDIR):$$(cross_buildroot)/stubdata:$$(cross_buildroot)/tools/ctestfw:$$$$'"$(LDLIBRARYPATH_ENVVAR)" ;\
 	  echo "PKGDATA_INVOKE=$(LDLIBRARYPATH_ENVVAR)=$(LIBRARY_PATH_PREFIX)"'$$(cross_buildroot)/stubdata:$$(cross_buildroot)/tools/ctestfw:$$(TOOLLIBDIR):$$$$'"$(LDLIBRARYPATH_ENVVAR) " ;\
 	  echo ) >> $@
 
+config/icucross.inc: $(top_builddir)/icudefs.mk  $(top_builddir)/Makefile @platform_make_fragment@
+	@echo rebuilding $@
+	@(grep '^CURR_FULL_DIR' $(top_builddir)/icudefs.mk ; \
+	  grep '^CURR_FULL_DIR' @platform_make_fragment@ || echo ""; \
+	   ) > $@
 
 config/icu.pc: $(srcdir)/config/icu.pc.in
 	cd $(top_builddir) \
 	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 config/icu-uc.pc: config/icu.pc Makefile icudefs.mk
 	@cat config/icu.pc > $@
 	@echo "Description: $(PACKAGE_ICU_DESCRIPTION): Common and Data libraries" >> $@
new file mode 100644
--- /dev/null
+++ b/intl/icu/source/acinclude.m4
@@ -0,0 +1,502 @@
+# Copyright (c) 1999-2013, International Business Machines Corporation and
+# others. All Rights Reserved.
+# acinclude.m4 for ICU
+# Don't edit aclocal.m4, do edit acinclude.m4
+# Stephen F. Booth
+
+# @TOP@
+
+# ICU_CHECK_MH_FRAG
+AC_DEFUN([ICU_CHECK_MH_FRAG], [
+	AC_CACHE_CHECK(
+		[which Makefile fragment to use for ${host}],
+		[icu_cv_host_frag],
+		[
+case "${host}" in
+*-*-solaris*)
+	if test "$GCC" = yes; then	
+		icu_cv_host_frag=mh-solaris-gcc
+	else
+		icu_cv_host_frag=mh-solaris
+	fi ;;
+alpha*-*-linux-gnu)
+	if test "$GCC" = yes; then
+		icu_cv_host_frag=mh-alpha-linux-gcc
+	else
+		icu_cv_host_frag=mh-alpha-linux-cc
+	fi ;;
+powerpc*-*-linux*)
+	if test "$GCC" = yes; then
+		icu_cv_host_frag=mh-linux
+	else
+		icu_cv_host_frag=mh-linux-va
+	fi ;;
+*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
+*-*-cygwin|*-*-mingw32|*-*-mingw64)
+	if test "$GCC" = yes; then
+		AC_TRY_COMPILE([
+#ifndef __MINGW32__
+#error This is not MinGW
+#endif], [], AC_TRY_COMPILE([
+#ifndef __MINGW64__
+#error This is not MinGW64
+#endif], [], icu_cv_host_frag=mh-mingw64, icu_cv_host_frag=mh-mingw), icu_cv_host_frag=mh-cygwin)
+	else
+		case "${host}" in
+		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
+		*-*-mingw32|*-*-mingw64) icu_cv_host_frag=mh-msys-msvc ;;
+		esac
+	fi ;;
+*-*-*bsd*|*-*-dragonfly*) 	icu_cv_host_frag=mh-bsd-gcc ;;
+*-*-aix*)
+	if test "$GCC" = yes; then
+		icu_cv_host_frag=mh-aix-gcc
+	else
+		icu_cv_host_frag=mh-aix-va
+	fi ;;
+*-*-hpux*)
+	if test "$GCC" = yes; then
+		icu_cv_host_frag=mh-hpux-gcc
+	else
+		case "$CXX" in
+		*aCC)    icu_cv_host_frag=mh-hpux-acc ;;
+		esac
+	fi ;;
+*-*ibm-openedition*|*-*-os390*)	icu_cv_host_frag=mh-os390 ;;
+*-*-os400*)	icu_cv_host_frag=mh-os400 ;;
+*-apple-rhapsody*)	icu_cv_host_frag=mh-darwin ;;
+*-apple-darwin*)	icu_cv_host_frag=mh-darwin ;;
+*-*-beos)       icu_cv_host_frag=mh-beos ;; 
+*-*-haiku)      icu_cv_host_frag=mh-haiku ;; 
+*-*-irix*)	icu_cv_host_frag=mh-irix ;;
+*-dec-osf*) icu_cv_host_frag=mh-alpha-osf ;;
+*-*-nto*)	icu_cv_host_frag=mh-qnx ;;
+*-ncr-*)	icu_cv_host_frag=mh-mpras ;;
+*) 		icu_cv_host_frag=mh-unknown ;;
+esac
+		]
+	)
+])
+
+# ICU_CONDITIONAL - similar example taken from Automake 1.4
+AC_DEFUN([ICU_CONDITIONAL],
+[AC_SUBST($1_TRUE)
+if $2; then
+  $1_TRUE=
+else
+  $1_TRUE='#'
+fi])
+
+# ICU_PROG_LINK - Make sure that the linker is usable
+AC_DEFUN([ICU_PROG_LINK],
+[
+case "${host}" in
+    *-*-cygwin*|*-*-mingw*)
+        if test "$GCC" != yes && test -n "`link --version 2>&1 | grep 'GNU coreutils'`"; then
+            AC_MSG_ERROR([link.exe is not a valid linker. Your PATH is incorrect.
+                  Please follow the directions in ICU's readme.])
+        fi;;
+    *);;
+esac])
+
+# AC_SEARCH_LIBS_FIRST(FUNCTION, SEARCH-LIBS [, ACTION-IF-FOUND
+#            [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
+# Search for a library defining FUNC, then see if it's not already available.
+
+AC_DEFUN([AC_SEARCH_LIBS_FIRST],
+[AC_PREREQ([2.13])
+AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
+[ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_$1="no"
+for i in $2; do
+LIBS="-l$i $5 $ac_func_search_save_LIBS"
+AC_TRY_LINK_FUNC([$1],
+[ac_cv_search_$1="-l$i"
+break])
+done
+if test "$ac_cv_search_$1" = "no"; then
+AC_TRY_LINK_FUNC([$1], [ac_cv_search_$1="none required"])
+fi
+LIBS="$ac_func_search_save_LIBS"])
+if test "$ac_cv_search_$1" != "no"; then
+  test "$ac_cv_search_$1" = "none required" || LIBS="$ac_cv_search_$1 $LIBS"
+  $3
+else :
+  $4
+fi])
+
+
+
+# Check if we can build and use 64-bit libraries
+AC_DEFUN([AC_CHECK_64BIT_LIBS],
+[
+    BITS_REQ=nochange
+    ENABLE_64BIT_LIBS=unknown
+    ## revisit this for cross-compile.
+    
+    AC_ARG_ENABLE(64bit-libs,
+        [  --enable-64bit-libs     (deprecated, use --with-library-bits) build 64-bit libraries [default= platform default]],
+        [echo "note, use --with-library-bits instead of --*-64bit-libs"
+         case "${enableval}" in
+            no|false|32) with_library_bits=32;  ;;
+            yes|true|64) with_library_bits=64else32 ;;
+            nochange) with_library_bits=nochange; ;;
+            *) AC_MSG_ERROR(bad value ${enableval} for '--*-64bit-libs') ;;
+            esac]    )
+    
+
+    AC_ARG_WITH(library-bits,
+        [  --with-library-bits=bits specify how many bits to use for the library (32, 64, 64else32, nochange) [default=nochange]],
+        [case "${withval}" in
+            ""|nochange) BITS_REQ=$withval ;;
+            32|64|64else32) BITS_REQ=$withval ;;
+            *) AC_MSG_ERROR(bad value ${withval} for --with-library-bits) ;;
+            esac])
+        
+    # don't use these for cross compiling
+    if test "$cross_compiling" = "yes" -a "${BITS_REQ}" != "nochange"; then
+        AC_MSG_ERROR([Don't specify bitness when cross compiling. See readme.html for help with cross compilation., and set compiler options manually.])
+    fi
+    AC_CHECK_SIZEOF([void *])
+    AC_MSG_CHECKING([whether runnable 64 bit binaries are built by default])
+    case $ac_cv_sizeof_void_p in
+        8) DEFAULT_64BIT=yes ;;
+        4) DEFAULT_64BIT=no ;;
+        *) DEFAULT_64BIT=unknown
+    esac
+    BITS_GOT=unknown
+    
+    # 'OK' here means, we can exit any further checking, everything's copa
+    BITS_OK=yes
+
+    # do we need to check for buildable/runnable 32 or 64 bit?
+    BITS_CHECK_32=no
+    BITS_CHECK_64=no
+    
+    # later, can we run the 32/64 bit binaries so made?
+    BITS_RUN_32=no
+    BITS_RUN_64=no
+    
+    if test "$DEFAULT_64BIT" = "yes"; then
+        # we get 64 bits by default.
+        BITS_GOT=64
+        case "$BITS_REQ" in
+            32) 
+                # need to look for 32 bit support. 
+                BITS_CHECK_32=yes
+                # not copa.
+                BITS_OK=no;;
+            # everyone else is happy.
+            nochange) ;;
+            *) ;;
+        esac
+    elif test "$DEFAULT_64BIT" = "no"; then
+        # not 64 bit by default.
+        BITS_GOT=32
+        case "$BITS_REQ" in
+            64|64else32)
+                BITS_CHECK_64=yes
+                #BITS_CHECK_32=yes
+                BITS_OK=no;;
+            nochange) ;;
+            *) ;;
+        esac
+    elif test "$DEFAULT_64BIT" = "unknown"; then
+        # cross compiling.
+        BITS_GOT=unknown
+        case "$BITS_REQ" in
+            64|64else32) BITS_OK=no
+            BITS_CHECK_32=yes
+            BITS_CHECK_64=yes ;;
+            32) BITS_OK=no;;
+            nochange) ;;
+            *) ;;
+        esac
+    fi
+            
+    AC_MSG_RESULT($DEFAULT_64BIT);
+
+    if test "$BITS_OK" != "yes"; then
+        # not copa. back these up.
+        CFLAGS_OLD="${CFLAGS}"
+        CXXFLAGS_OLD="${CXXFLAGS}"
+        LDFLAGS_OLD="${LDFLAGS}"
+        ARFLAGS_OLD="${ARFLAGS}"        
+        
+        CFLAGS_32="${CFLAGS}"
+        CXXFLAGS_32="${CXXFLAGS}"
+        LDFLAGS_32="${LDFLAGS}"
+        ARFLAGS_32="${ARFLAGS}"        
+        
+        CFLAGS_64="${CFLAGS}"
+        CXXFLAGS_64="${CXXFLAGS}"
+        LDFLAGS_64="${LDFLAGS}"
+        ARFLAGS_64="${ARFLAGS}"        
+        
+        CAN_BUILD_64=unknown
+        CAN_BUILD_32=unknown
+        # These results can't be cached because is sets compiler flags.
+        if test "$BITS_CHECK_64" = "yes"; then
+            AC_MSG_CHECKING([how to build 64-bit executables])
+            CAN_BUILD_64=no
+            ####
+            # Find out if we think we can *build* for 64 bit. Doesn't check whether we can run it.
+            #  Note, we don't have to actually check if the options work- we'll try them before using them.
+            #  So, only try actually testing the options, if you are trying to decide between multiple options.
+            # On exit from the following clauses:
+            # if CAN_BUILD_64=yes:
+            #    *FLAGS are assumed to contain the right settings for 64bit
+            # else if CAN_BUILD_64=no: (default)
+            #    *FLAGS are assumed to be trashed, and will be reset from *FLAGS_OLD
+            
+            if test "$GCC" = yes; then
+                CFLAGS="${CFLAGS} -m64"
+                CXXFLAGS="${CXXFLAGS} -m64"
+                AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==64)?0:1;}])],
+                   CAN_BUILD_64=yes, CAN_BUILD_64=no)
+            else
+                case "${host}" in
+                sparc*-*-solaris*)
+                    # 1. try -m64
+                    CFLAGS="${CFLAGS} -m64"
+                    CXXFLAGS="${CXXFLAGS} -m64"
+                    AC_RUN_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==64)?0:1;}])],
+                       CAN_BUILD_64=yes, CAN_BUILD_64=no, CAN_BUILD_64=unknown)
+                    if test "$CAN_BUILD_64" != yes; then
+                        # Nope. back out changes.
+                        CFLAGS="${CFLAGS_OLD}"
+                        CXXFLAGS="${CFLAGS_OLD}"
+                        # 2. try xarch=v9 [deprecated]
+                        ## TODO: cross compile: the following won't work.
+                        SPARCV9=`isainfo -n 2>&1 | grep sparcv9`
+                        SOL64=`$CXX -xarch=v9 2>&1 && $CC -xarch=v9 2>&1 | grep -v usage:`
+                        # "Warning: -xarch=v9 is deprecated, use -m64 to create 64-bit programs"
+                        if test -z "$SOL64" && test -n "$SPARCV9"; then
+                            CFLAGS="${CFLAGS} -xtarget=ultra -xarch=v9"
+                            CXXFLAGS="${CXXFLAGS} -xtarget=ultra -xarch=v9"
+                            LDFLAGS="${LDFLAGS} -xtarget=ultra -xarch=v9"
+                            CAN_BUILD_64=yes
+                        fi
+                    fi
+                    ;;
+                i386-*-solaris*)
+                    # 1. try -m64
+                    CFLAGS="${CFLAGS} -m64"
+                    CXXFLAGS="${CXXFLAGS} -m64"
+                    AC_RUN_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==64)?0:1;}])],
+                       CAN_BUILD_64=yes, CAN_BUILD_64=no, CAN_BUILD_64=unknown)
+                    if test "$CAN_BUILD_64" != yes; then
+                        # Nope. back out changes.
+                        CFLAGS="${CFLAGS_OLD}"
+                        CXXFLAGS="${CXXFLAGS_OLD}"
+                        # 2. try the older compiler option
+                        ## TODO: cross compile problem
+                        AMD64=`isainfo -n 2>&1 | grep amd64`
+                        SOL64=`$CXX -xtarget=generic64 2>&1 && $CC -xtarget=generic64 2>&1 | grep -v usage:`
+                        if test -z "$SOL64" && test -n "$AMD64"; then
+                            CFLAGS="${CFLAGS} -xtarget=generic64"
+                            CXXFLAGS="${CXXFLAGS} -xtarget=generic64"
+                            CAN_BUILD_64=yes
+                        fi
+                    fi
+                    ;;
+                ia64-*-linux*)
+                    # check for ecc/ecpc compiler support
+                    ## TODO: cross compiler problem
+                    if test -n "`$CXX --help 2>&1 && $CC --help 2>&1 | grep -v Intel`"; then
+                        if test -n "`$CXX --help 2>&1 && $CC --help 2>&1 | grep -v Itanium`"; then
+                            CAN_BUILD_64=yes
+                        fi
+                    fi
+                    ;;
+                *-*-cygwin)
+                    # vcvarsamd64.bat should have been used to enable 64-bit builds.
+                    # We only do this check to display the correct answer.
+                    ## TODO: cross compiler problem
+                    if test -n "`$CXX -help 2>&1 | grep 'for x64'`"; then
+                        CAN_BUILD_64=yes
+                    fi
+                    ;;
+                *-*-aix*|powerpc64-*-linux*)
+                    CFLAGS="${CFLAGS} -q64"
+                    CXXFLAGS="${CXXFLAGS} -q64"
+                    LDFLAGS="${LDFLAGS} -q64"
+                    AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==64)?0:1;}])],
+                       CAN_BUILD_64=yes, CAN_BUILD_64=no)
+                    if test "$CAN_BUILD_64" = yes; then
+                        # worked- set other options.
+                        case "${host}" in
+                        *-*-aix*)
+                            # tell AIX what executable mode to use.
+                            ARFLAGS="${ARFLAGS} -X64"
+                        esac
+                    fi
+                    ;;
+                *-*-hpux*)
+                    # First we try the newer +DD64, if that doesn't work,
+                    # try other options.
+
+                    CFLAGS="${CFLAGS} +DD64"
+                    CXXFLAGS="${CXXFLAGS} +DD64"
+                    AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==64)?0:1;}])],
+                        CAN_BUILD_64=yes, CAN_BUILD_64=no)
+                    if test "$CAN_BUILD_64" != yes; then
+                        # reset
+                        CFLAGS="${CFLAGS_OLD}"
+                        CXXFLAGS="${CXXFLAGS_OLD}"
+                        # append
+                        CFLAGS="${CFLAGS} +DA2.0W"
+                        CXXFLAGS="${CXXFLAGS} +DA2.0W"
+                        AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==64)?0:1;}])],
+                            CAN_BUILD_64=yes, CAN_BUILD_64=no)
+                    fi
+                    ;;
+                *-*ibm-openedition*|*-*-os390*)
+                    CFLAGS="${CFLAGS} -Wc,lp64"
+                    CXXFLAGS="${CXXFLAGS} -Wc,lp64"
+                    LDFLAGS="${LDFLAGS} -Wl,lp64"
+                    AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==64)