ICU 56 update step 1

source/data/build.xml

Index: source/data/build.xml
diff --git a/source/data/build.xml b/source/data/build.xml
index de114568bb9b76c29d2b250117b0d9b214dc59ab..4339aa778c12f28ed60f07234099d0d9ebe4af28 100644
--- a/source/data/build.xml
+++ b/source/data/build.xml
@@ -2,11 +2,12 @@
     <!ENTITY icu-config SYSTEM "./icu-config.xml">
     <!ENTITY icu-locale-deprecates SYSTEM "./icu-locale-deprecates.xml">
     <!ENTITY icu-coll-deprecates SYSTEM "./icu-coll-deprecates.xml">
+    <!ENTITY icu-rbnf-deprecates SYSTEM "./icu-rbnf-deprecates.xml">
 ]>
 <!--
 /*
 *******************************************************************************
-* Copyright (C) 2005-2014, International Business Machines Corporation and    *
+* Copyright (C) 2005-2015, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
@@ -56,7 +57,7 @@
         </taskdef>
     </target>
     <!-- target for generating ICU data -->
-    <target name="all" depends="locales, collation, rbnf, supplementalData, metadata, metaZones, windowsZones, likelySubtags, plurals, numberingSystems, translit, brkitr, keyTypeData, genderList, postalCodeData, dayPeriods" />
+    <target name="all" depends="locales, collation, rbnf, supplementalData, metadata, metaZones, windowsZones, likelySubtags, plurals, numberingSystems, translit, brkitr, keyTypeData, genderList, dayPeriods" />
     <!-- parallel target -->
     <target name="pall" depends="init">
         <parallel threadsPerProcessor ="1">
@@ -90,9 +91,6 @@
           	<ant target='genderList'/>
           </sequential>
           <sequential>
-          	<ant target='postalCodeData'/>
-          </sequential>
-          <sequential>
           	<ant target='dayPeriods'/>
           </sequential>
         </parallel>
@@ -113,7 +111,7 @@
 		<remapper>
 		  <remap sourcePath="/Keys" targetDir="lang" />
 		  <remap sourcePath="/Languages" targetDir="lang" />
-		  <remap sourcePath="/LanguagesShort" targetDir="lang" />
+		  <remap sourcePath="/Languages%short" targetDir="lang" />
 		  <remap sourcePath="/Languages%secondary" targetDir="lang" />
 		  <remap sourcePath="/Languages%variant" targetDir="lang" />
 		  <remap sourcePath="/Scripts" targetDir="lang" />
@@ -129,7 +127,7 @@
 		  <remap sourcePath="/localeDisplayPattern" targetDir="lang" />
 		  <remap sourcePath="/Countries" targetDir="region" />
 		  <remap sourcePath="/Countries%variant" targetDir="region" />
-		  <remap sourcePath="/CountriesShort" targetDir="region" />
+		  <remap sourcePath="/Countries%short" targetDir="region" />
 		  <remap sourcePath="/Currencies" targetDir="curr" />
 		  <remap sourcePath="/Currencies%narrow" targetDir="curr" />
 		  <remap sourcePath="/Currencies%variant" targetDir="curr" />
@@ -137,6 +135,7 @@
 		  <remap sourcePath="/CurrencyUnitPatterns" targetDir="curr" />
 		  <remap sourcePath="/currencySpacing" targetDir="curr" />
 		  <remap sourcePath="/zoneStrings" targetDir="zone" />
+		  <remap sourcePath="/durationUnits" targetDir="unit" />
 		  <remap sourcePath="/units" targetDir="unit" />
 		  <remap sourcePath="/unitsShort" targetDir="unit" />
 		  <remap sourcePath="/unitsNarrow" targetDir="unit" />
@@ -175,6 +174,7 @@
                 </args>
                 <!-- http://ant.apache.org/faq.html#xml-entity-include -->
                 &icu-config;
+                &icu-rbnf-deprecates;
             </run>
         </cldr-build>
     </target>
@@ -278,18 +278,6 @@
             </run>
         </cldr-build>
     </target>
-    <target name="postalCodeData" depends="init,setup" description="builds postalCodeData.txt from postalCodeData.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="postalCodeData.txt" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="postalCodeData"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
     <target name="dayPeriods" depends="init,setup" description="builds dayPeriods.txt from dayPeriods.xml">
         <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="dayPeriods.txt" noArgs="true">
             <!-- launch the tool and generate the data after reading the config file -->
@@ -439,9 +427,6 @@
             <fileset id="genderList" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="genderList.txt" />
             </fileset>
-            <fileset id="postalCodeData" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="postalCodeData.txt" />
-            </fileset>
             <fileset id="dayPeriods" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="dayPeriods.txt" />
             </fileset>