[Pkg-isocodes-devel] r1106 - in trunk/iso-codes: . iso_3166/iso_3166_2

[alexisd-guest at alioth.debian.org]

Author: alexisd-guest
Date: 2007-10-21 01:08:15 +0000 (Sun, 21 Oct 2007)
New Revision: 1106

Modified:
   trunk/iso-codes/ChangeLog
   trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml
Log:
Fix ISO 3166-2 as in newsletter I-7

Removed no longer existing province from Indonesia
Reordered entries to match standard


Modified: trunk/iso-codes/ChangeLog
===================================================================
--- trunk/iso-codes/ChangeLog	2007-10-21 01:08:12 UTC (rev 1105)
+++ trunk/iso-codes/ChangeLog	2007-10-21 01:08:15 UTC (rev 1106)
@@ -52,6 +52,8 @@
   * Correct the list with information from the ISO-3166 MA
     newsletter I-6: add accents for Colombia, add counties for Albania
   * Correct the list with information from the ISO-3166 MA
+    newsletter I-7: remove no longer existing province from Indonesia
+  * Correct the list with information from the ISO-3166 MA
     newsletter I-8: remove channel islands and Isle of Man from Great Britain
     and add Jersey as a separate entity, put Rwanda provinces names in french,
     add a missing province (Choiseul) for Solomon Islands, fix typos in Chad

Modified: trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml
===================================================================
--- trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml	2007-10-21 01:08:12 UTC (rev 1105)
+++ trunk/iso-codes/iso_3166/iso_3166_2/iso_3166_2.xml	2007-10-21 01:08:15 UTC (rev 1106)
@@ -1929,10 +1929,6 @@
 </iso_3166_country>
 	<!-- Djibouti -->
 <iso_3166_country code="DJ">
-<iso_3166_subset type="City">   
-	<iso_3166_2_entry
-		code="DJ-DJ"	name="Djibouti" />
-</iso_3166_subset>   
 <iso_3166_subset type="Region">   
 	<iso_3166_2_entry
 		code="DJ-AS"	name="Ali Sabieh" />
@@ -1945,6 +1941,10 @@
 	<iso_3166_2_entry
 		code="DJ-TA"	name="Tadjourah" />
 </iso_3166_subset>   
+<iso_3166_subset type="City">   
+	<iso_3166_2_entry
+		code="DJ-DJ"	name="Djibouti" />
+</iso_3166_subset>   
 </iso_3166_country>
 	<!-- Denmark -->
 <iso_3166_country code="DK">
@@ -4002,6 +4002,26 @@
 </iso_3166_country>
 	<!-- Indonesia -->
 <iso_3166_country code="ID">
+<iso_3166_subset type="Geographical unit">
+	<iso_3166_2_entry
+		code="IJ"	name="Papua" />
+	<iso_3166_2_entry
+		code="JW"	name="Jawa" />
+	<iso_3166_2_entry
+		code="KA"	name="Kalimantan" />
+	<iso_3166_2_entry
+		code="MA"	name="Maluku" />
+	<iso_3166_2_entry
+		code="NU"	name="Nusa Tenggara" />
+	<iso_3166_2_entry
+		code="SL"	name="Sulawesi" />
+	<iso_3166_2_entry
+		code="SM"	name="Sumatera" />
+</iso_3166_subset>
+<iso_3166_subset type="Autonomous Province">
+	<iso_3166_2_entry
+		code="ID-AC"	name="Aceh" />
+</iso_3166_subset>
 <iso_3166_subset type="Province">
 	<iso_3166_2_entry
 		code="ID-BA"	name="Bali" />
@@ -4014,8 +4034,6 @@
 	<iso_3166_2_entry
 		code="ID-GO"	name="Gorontalo" />
 	<iso_3166_2_entry
-		code="ID-IJ"	name="Irian Jaya" />
-	<iso_3166_2_entry
 		code="ID-JA"	name="Jambi" />
 	<iso_3166_2_entry
 		code="ID-JB"	name="Jawa Barat" />
@@ -4063,35 +4081,15 @@
 		code="ID-SS"	name="Sumatra Selatan" />
 	<iso_3166_2_entry
 		code="ID-SU"	name="Sumatera Utara" />
-	</iso_3166_subset>
-	<iso_3166_subset type="Special District">
+</iso_3166_subset>
+<iso_3166_subset type="Special District">
 	<iso_3166_2_entry
 		code="ID-JK"	name="Jakarta Raya" />
 </iso_3166_subset>
-<iso_3166_subset type="Autonomous Province">
-	<iso_3166_2_entry
-		code="ID-AC"	name="Aceh" />
-</iso_3166_subset>
 <iso_3166_subset type="Special Region">
 	<iso_3166_2_entry
 		code="ID-YO"	name="Yogyakarta" />
 </iso_3166_subset>
-<iso_3166_subset type="Geographical unit">
-	<iso_3166_2_entry
-		code="IJ"	name="Irian Jaya" />
-	<iso_3166_2_entry
-		code="JW"	name="Jawa" />
-	<iso_3166_2_entry
-		code="KA"	name="Kalimantan" />
-	<iso_3166_2_entry
-		code="MA"	name="Maluku" />
-	<iso_3166_2_entry
-		code="NU"	name="Nusa Tenggara" />
-	<iso_3166_2_entry
-		code="SL"	name="Sulawesi" />
-	<iso_3166_2_entry
-		code="SM"	name="Sumatera" />
-</iso_3166_subset>
 </iso_3166_country>
 	<!-- Ireland -->
 <iso_3166_country code="IE">