[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. iso-codes/3.20-9-g9b809b5

[Christian PERRIER]

The following commit has been merged in the master branch:
commit 9b809b5257e19e693eb0c17b478d50c831870241
Author: Christian PERRIER <bubulle at debian.org>
Date:   Sat Sep 11 10:16:57 2010 +0200

    Fix code duplicaiton errors

diff --git a/ChangeLog b/ChangeLog
index 7d8c749..7ab2c56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 iso-codes trunk
 ---------------
 
+  [ ISO 3166-2 ]
+  * Copy/paste errors leading to code duplication errors fixed.
+    Thanks to Rand Dusing. Closes: #596368
+
   [ ISO 3166-2 translations ]
   * Polish by Jakub Bogusz (TP)
   * Italian by Milo Casagrande (TP)
diff --git a/iso_3166_2/iso_3166_2.xml b/iso_3166_2/iso_3166_2.xml
index ce45454..9cb927a 100644
--- a/iso_3166_2/iso_3166_2.xml
+++ b/iso_3166_2/iso_3166_2.xml
@@ -2652,7 +2652,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 	<iso_3166_2_entry
 		code="ES-GA"	name="Galicia" />
 	<iso_3166_2_entry
-		code="ES-IB"	name="Illes Balears" />
+		code="ES-PM"	name="Illes Balears" />
 	<iso_3166_2_entry
 		code="ES-RI"	name="La Rioja" />
 	<iso_3166_2_entry
@@ -5776,7 +5776,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 	<iso_3166_2_entry
 		code="LY-JA"	name="Al Jabal al Akhḑar" />
 	<iso_3166_2_entry
-		code="LY-JA"	name="Al Jabal al Gharbī" />
+		code="LY-JG"	name="Al Jabal al Gharbī" />
 	<iso_3166_2_entry
 		code="LY-JI"	name="Al Jifārah" />
 	<iso_3166_2_entry
@@ -5984,10 +5984,6 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 		code="MA-TNG"	name="Tanger-Assilah"	parent="01" />
 	<iso_3166_2_entry
 		code="MA-TET"	name="Tétouan"	parent="01" />
-	<iso_3166_2_entry
-		code="MA-TIZ"	name="Tiznit"	parent="13" />
-	<iso_3166_2_entry
-	   code="MA-ZAG"	name="Zagora"	parent="13" />
 </iso_3166_subset>
 </iso_3166_country>
 	<!-- Moldova -->
@@ -7362,7 +7358,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 	<iso_3166_2_entry
 		code="OM-MU"	name="Musandam" />
 	<iso_3166_2_entry
-		code="OM-MU"	name="Z̧ufār" />
+		code="OM-ZU"	name="Z̧ufār" />
 </iso_3166_subset>
 </iso_3166_country>
 	<!-- Panama -->
@@ -7404,7 +7400,7 @@ Source: <http://www.iso.org/iso/country_codes/background_on_iso_3166/iso_3166-2.
 </iso_3166_subset>
 <iso_3166_subset type="Municipality">
 	<iso_3166_2_entry
-		code="PE-CAL"	name="Municipalidad Metropolitana de Lima" />
+		code="PE-LMA"	name="Municipalidad Metropolitana de Lima" />
 </iso_3166_subset>
 <iso_3166_subset type="Region">
 	<iso_3166_2_entry

-- 
ISO language, territory, currency, script codes and their translations