r2269 - in packages/liblocale-codes-perl/trunk: . debian lib/Locale t

Krzysztof Krzyzaniak eloy at costa.debian.org
Tue Mar 7 16:14:13 UTC 2006


Author: eloy
Date: 2006-03-07 16:14:12 +0000 (Tue, 07 Mar 2006)
New Revision: 2269

Added:
   packages/liblocale-codes-perl/trunk/META.yml
Modified:
   packages/liblocale-codes-perl/trunk/ChangeLog
   packages/liblocale-codes-perl/trunk/MANIFEST
   packages/liblocale-codes-perl/trunk/Makefile.PL
   packages/liblocale-codes-perl/trunk/README
   packages/liblocale-codes-perl/trunk/debian/changelog
   packages/liblocale-codes-perl/trunk/debian/control
   packages/liblocale-codes-perl/trunk/lib/Locale/Constants.pm
   packages/liblocale-codes-perl/trunk/lib/Locale/Constants.pod
   packages/liblocale-codes-perl/trunk/lib/Locale/Country.pm
   packages/liblocale-codes-perl/trunk/lib/Locale/Country.pod
   packages/liblocale-codes-perl/trunk/lib/Locale/Currency.pm
   packages/liblocale-codes-perl/trunk/lib/Locale/Currency.pod
   packages/liblocale-codes-perl/trunk/lib/Locale/Language.pm
   packages/liblocale-codes-perl/trunk/lib/Locale/Language.pod
   packages/liblocale-codes-perl/trunk/lib/Locale/Script.pm
   packages/liblocale-codes-perl/trunk/lib/Locale/Script.pod
   packages/liblocale-codes-perl/trunk/t/country.t
   packages/liblocale-codes-perl/trunk/t/currency.t
   packages/liblocale-codes-perl/trunk/t/language.t
Log:
eloy: new upstream changes


Modified: packages/liblocale-codes-perl/trunk/ChangeLog
===================================================================
--- packages/liblocale-codes-perl/trunk/ChangeLog	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/ChangeLog	2006-03-07 16:14:12 UTC (rev 2269)
@@ -1,6 +1,34 @@
 
 		ChangeLog for Locale-Codes Distribution
 
+2.07  2004-06-10 neilb
+	* made $_ local in the initialisation code for each module
+		change back-propagated from Perl distribution
+	* removed two non ISO-8859-1 characters from language names
+		change back-propagated from Perl distribution
+	* added the following aliases, with a test case for each
+		- Burma added to Myanmar
+		- French Southern and Antarctic Lands to
+		  French Southern Territories
+	  patch from TJ Mather
+	* "Canadian Dollar" was mis-spelled as "Candian Dollar"
+		- noted by Nick Cabatoff, patch from Michael Hennecke
+	* Changes to Locale::Country reflecting changes in ISO 3166
+		- added Aland Islands (ax, ala, 248)
+		- YUGOSLAVIA is now SERBIA AND MONTENEGRO
+			YU => CS
+			YUG => SCG
+			891 => 891 (unchanged)
+			(YUGOSLAVIA retained as an alias)
+		- EAST TIMOR changed to TIMOR-LESTE
+			(old name retained as an alias)
+		- three letter code for Romania changed from ROM to ROU
+	* ZAIRE is now CONGO, THE DEMOCRATIC REPUBLIC OF THE
+			ZR  => CD
+			ZAR => COD
+			180 => 180 (unchanged)
+			(ZAIRE retained as alias)
+
 2.06  2002-07-15 neilb
 
 	* The four modules which have data after __DATA__ weren't

Modified: packages/liblocale-codes-perl/trunk/MANIFEST
===================================================================
--- packages/liblocale-codes-perl/trunk/MANIFEST	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/MANIFEST	2006-03-07 16:14:12 UTC (rev 2269)
@@ -20,3 +20,4 @@
 MANIFEST
 README
 ChangeLog
+META.yml                                 Module meta-data (added by MakeMaker)

Copied: packages/liblocale-codes-perl/trunk/META.yml (from rev 2268, packages/liblocale-codes-perl/branches/upstream/current/META.yml)

Modified: packages/liblocale-codes-perl/trunk/Makefile.PL
===================================================================
--- packages/liblocale-codes-perl/trunk/Makefile.PL	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/Makefile.PL	2006-03-07 16:14:12 UTC (rev 2269)
@@ -16,7 +16,7 @@
 &WriteMakefile(
 		NAME		=> 'Locale-Codes',
 		DISTNAME	=> 'Locale-Codes',
-		VERSION		=> '2.06',
+		VERSION		=> '2.07',
 		AUTHOR		=> 'Neil Bowers <neil at bowers.com>',
 		ABSTRACT	=> 'modules for ISO codes identifying countries, languages, currencies, and scripts',
 		dist		=> {COMPRESS => 'gzip', SUFFIX => 'gz'},

Modified: packages/liblocale-codes-perl/trunk/README
===================================================================
--- packages/liblocale-codes-perl/trunk/README	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/README	2006-03-07 16:14:12 UTC (rev 2269)
@@ -1,7 +1,9 @@
 
 			Locale-Codes Distribution
-				v2.06
+				v2.07
 
+For changes in this release, please see the ChangeLog file.
+
 This distribution contains four Perl modules which can be used to process
 ISO codes for identifying languages, countries, scripts,
 and currencies & funds.

Modified: packages/liblocale-codes-perl/trunk/debian/changelog
===================================================================
--- packages/liblocale-codes-perl/trunk/debian/changelog	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/debian/changelog	2006-03-07 16:14:12 UTC (rev 2269)
@@ -1,3 +1,14 @@
+liblocale-codes-perl (2.07-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+  * debian/control:
+   - Uploaders: added me
+   - Standards-Version: upgraded to 3.6.2.0 without changes
+   - Build-Depends: moved debhelper with increased version (>= 5.0)
+  * debian/watch - added
+
+ -- Krzysztof Krzyzaniak (eloy) <eloy at debian.org>  Tue,  7 Mar 2006 17:11:24 +0100
+
 liblocale-codes-perl (2.06-6) unstable; urgency=low
 
   * Adopting package.

Modified: packages/liblocale-codes-perl/trunk/debian/control
===================================================================
--- packages/liblocale-codes-perl/trunk/debian/control	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/debian/control	2006-03-07 16:14:12 UTC (rev 2269)
@@ -2,9 +2,10 @@
 Section: perl
 Priority: optional
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Daniel Ruoso <daniel at ruoso.com>
-Standards-Version: 3.6.1
-Build-Depends-Indep: debhelper (>= 4.1), perl
+Uploaders: Daniel Ruoso <daniel at ruoso.com>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+Standards-Version: 3.6.2
+Build-Depends: debhelper (>= 5.0)
+Build-Depends-Indep: perl
 
 Package: liblocale-codes-perl
 Section: perl

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Constants.pm
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Constants.pm	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Constants.pm	2006-03-07 16:14:12 UTC (rev 2269)
@@ -1,7 +1,7 @@
 #
 # Locale::Constants - defined constants for identifying codesets
 #
-# $Id: Constants.pm,v 2.1 2002/02/06 04:07:09 neilb Exp $
+# $Id: Constants.pm,v 2.7 2004/06/10 21:19:34 neilb Exp $
 #
 
 package Locale::Constants;
@@ -13,7 +13,7 @@
 #	Public Global Variables
 #-----------------------------------------------------------------------
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION   = sprintf("%d.%02d", q$Revision: 2.1 $ =~ /(\d+)\.(\d+)/);
+$VERSION   = sprintf("%d.%02d", q$Revision: 2.7 $ =~ /(\d+)\.(\d+)/);
 @ISA	= qw(Exporter);
 @EXPORT = qw(LOCALE_CODE_ALPHA_2 LOCALE_CODE_ALPHA_3 LOCALE_CODE_NUMERIC
 		LOCALE_CODE_DEFAULT);

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Constants.pod
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Constants.pod	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Constants.pod	2006-03-07 16:14:12 UTC (rev 2269)
@@ -65,7 +65,7 @@
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002, Neil Bowers.
+Copyright (C) 2002-2004, Neil Bowers.
 
 Copyright (C) 2001, Canon Research Centre Europe (CRE).
 

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Country.pm
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Country.pm	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Country.pm	2006-03-07 16:14:12 UTC (rev 2269)
@@ -1,7 +1,7 @@
 #
 # Locale::Country - ISO codes for country identification (ISO 3166)
 #
-# $Id: Country.pm,v 2.6 2002/07/10 16:33:27 neilb Exp $
+# $Id: Country.pm,v 2.7 2004/06/10 21:19:34 neilb Exp $
 #
 
 package Locale::Country;
@@ -17,7 +17,7 @@
 #	Public Global Variables
 #-----------------------------------------------------------------------
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION   = sprintf("%d.%02d", q$Revision: 2.6 $ =~ /(\d+)\.(\d+)/);
+$VERSION   = sprintf("%d.%02d", q$Revision: 2.7 $ =~ /(\d+)\.(\d+)/);
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2country country2code
                 all_country_codes all_country_names
@@ -264,8 +264,9 @@
 #
 #=======================================================================
 {
-    my ($alpha2, $alpha3, $numeric);
-    my ($country, @countries);
+    my   ($alpha2, $alpha3, $numeric);
+    my   ($country, @countries);
+    local $_;
 
 
     while (<DATA>)
@@ -321,6 +322,7 @@
 at:aut:040:Austria
 au:aus:036:Australia
 aw:abw:533:Aruba
+ax:ala:248:Aland Islands
 az:aze:031:Azerbaijan
 ba:bih:070:Bosnia and Herzegovina
 bb:brb:052:Barbados
@@ -343,6 +345,7 @@
 bz:blz:084:Belize
 ca:can:124:Canada
 cc:cck:166:Cocos (Keeling) Islands
+cd:cod:180:Congo, The Democratic Republic of the:Zaire:Congo, Democratic Republic of the
 cf:caf:140:Central African Republic
 cg:cog:178:Congo:Congo, Republic of the
 ch:che:756:Switzerland
@@ -353,6 +356,7 @@
 cn:chn:156:China
 co:col:170:Colombia
 cr:cri:188:Costa Rica
+cs:scg:891:Serbia and Montenegro:Yugoslavia
 cu:cub:192:Cuba
 cv:cpv:132:Cape Verde
 cx:cxr:162:Christmas Island
@@ -443,7 +447,7 @@
 mh:mhl:584:Marshall Islands
 mk:mkd:807:Macedonia, the Former Yugoslav Republic of:Macedonia, Former Yugoslav Republic of:Macedonia
 ml:mli:466:Mali
-mm:mmr:104:Myanmar
+mm:mmr:104:Myanmar:Burma
 mn:mng:496:Mongolia
 mo:mac:446:Macao:Macau
 mp:mnp:580:Northern Mariana Islands
@@ -486,7 +490,7 @@
 py:pry:600:Paraguay
 qa:qat:634:Qatar
 re:reu:638:Reunion
-ro:rom:642:Romania
+ro:rou:642:Romania
 ru:rus:643:Russian Federation:Russia
 rw:rwa:646:Rwanda
 sa:sau:682:Saudi Arabia
@@ -510,7 +514,7 @@
 sz:swz:748:Swaziland
 tc:tca:796:Turks and Caicos Islands
 td:tcd:148:Chad
-tf:atf:260:French Southern Territories
+tf:atf:260:French Southern Territories:French Southern and Antarctic Lands
 tg:tgo:768:Togo
 th:tha:764:Thailand
 tj:tjk:762:Tajikistan
@@ -518,7 +522,7 @@
 tm:tkm:795:Turkmenistan
 tn:tun:788:Tunisia
 to:ton:776:Tonga
-tl:tls:626:East Timor
+tl:tls:626:Timor-Leste:East Timor
 tr:tur:792:Turkey
 tt:tto:780:Trinidad and Tobago
 tv:tuv:798:Tuvalu
@@ -541,8 +545,6 @@
 ws:wsm:882:Samoa
 ye:yem:887:Yemen
 yt:myt:175:Mayotte
-yu:yug:891:Yugoslavia
 za:zaf:710:South Africa
 zm:zmb:894:Zambia
-zr:zar:180:Zaire:Congo, The Democratic Republic of the:Congo, Democratic Republic of the
 zw:zwe:716:Zimbabwe

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Country.pod
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Country.pod	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Country.pod	2006-03-07 16:14:12 UTC (rev 2269)
@@ -295,7 +295,7 @@
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002, Neil Bowers.
+Copyright (C) 2002-2004, Neil Bowers.
 
 Copyright (c) 1997-2001 Canon Research Centre Europe (CRE).
 

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Currency.pm
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Currency.pm	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Currency.pm	2006-03-07 16:14:12 UTC (rev 2269)
@@ -2,7 +2,7 @@
 # Locale::Currency - ISO three letter codes for currency identification
 #                    (ISO 4217)
 #
-# $Id: Currency.pm,v 2.2 2002/07/10 16:33:27 neilb Exp $
+# $Id: Currency.pm,v 2.7 2004/06/10 21:19:34 neilb Exp $
 #
 
 package Locale::Currency;
@@ -15,7 +15,7 @@
 #	Public Global Variables
 #-----------------------------------------------------------------------
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION      = sprintf("%d.%02d", q$Revision: 2.2 $ =~ /(\d+)\.(\d+)/);
+$VERSION      = sprintf("%d.%02d", q$Revision: 2.7 $ =~ /(\d+)\.(\d+)/);
 @ISA          = qw(Exporter);
 @EXPORT       = qw(&code2currency &currency2code
                    &all_currency_codes &all_currency_names );
@@ -105,8 +105,9 @@
 # initialisation code - stuff the DATA into the CODES hash
 #=======================================================================
 {
-    my $code;
-    my $currency;
+    my    $code;
+    my    $currency;
+    local $_;
 
 
     while (<DATA>)
@@ -160,7 +161,7 @@
 byr:Belarussian Ruble
 bzd:Belize Dollar
 
-cad:Candian Dollar
+cad:Canadian Dollar
 cdf:Franc Congolais
 chf:Swiss Franc
 clf:Unidades de Formento

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Currency.pod
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Currency.pod	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Currency.pod	2006-03-07 16:14:12 UTC (rev 2269)
@@ -179,7 +179,7 @@
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002, Neil Bowers.
+Copyright (C) 2002-2004, Neil Bowers.
 
 Copyright (c) 2001 Michael Hennecke and
 Canon Research Centre Europe (CRE).

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Language.pm
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Language.pm	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Language.pm	2006-03-07 16:14:12 UTC (rev 2269)
@@ -1,7 +1,7 @@
 #
 # Locale::Language - ISO two letter codes for language identification (ISO 639)
 #
-# $Id: Language.pm,v 2.2 2002/07/10 16:33:27 neilb Exp $
+# $Id: Language.pm,v 2.7 2004/06/10 21:19:34 neilb Exp $
 #
 
 package Locale::Language;
@@ -14,7 +14,7 @@
 #	Public Global Variables
 #-----------------------------------------------------------------------
 use vars qw($VERSION @ISA @EXPORT);
-$VERSION      = sprintf("%d.%02d", q$Revision: 2.2 $ =~ /(\d+)\.(\d+)/);
+$VERSION      = sprintf("%d.%02d", q$Revision: 2.7 $ =~ /(\d+)\.(\d+)/);
 @ISA          = qw(Exporter);
 @EXPORT       = qw(&code2language &language2code
                    &all_language_codes &all_language_names );
@@ -104,8 +104,9 @@
 # initialisation code - stuff the DATA into the CODES hash
 #=======================================================================
 {
-    my $code;
-    my $language;
+    my    $code;
+    my    $language;
+    local $_;
 
 
     while (<DATA>)
@@ -231,7 +232,7 @@
 my:Burmese
 
 na:Nauru
-nb:Norwegian Bokmål
+nb:Norwegian Bokmal
 nd:Ndebele, North
 ne:Nepali
 ng:Ndonga
@@ -300,7 +301,7 @@
 uz:Uzbek
 
 vi:Vietnamese
-vo:Volapük
+vo:Volapuk
 
 wo:Wolof
 

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Language.pod
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Language.pod	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Language.pod	2006-03-07 16:14:12 UTC (rev 2269)
@@ -147,7 +147,7 @@
 
 =head1 COPYRIGHT
 
-Copyright (C) 2002, Neil Bowers.
+Copyright (C) 2002-2004, Neil Bowers.
 
 Copyright (c) 1997-2001 Canon Research Centre Europe (CRE).
 

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Script.pm
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Script.pm	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Script.pm	2006-03-07 16:14:12 UTC (rev 2269)
@@ -1,7 +1,7 @@
 #
 # Locale::Script - ISO codes for script identification (ISO 15924)
 #
-# $Id: Script.pm,v 2.2 2002/07/10 16:33:28 neilb Exp $
+# $Id: Script.pm,v 2.7 2004/06/10 21:19:34 neilb Exp $
 #
 
 package Locale::Script;
@@ -17,7 +17,7 @@
 #	Public Global Variables
 #-----------------------------------------------------------------------
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION   = sprintf("%d.%02d", q$Revision: 2.2 $ =~ /(\d+)\.(\d+)/);
+$VERSION   = sprintf("%d.%02d", q$Revision: 2.7 $ =~ /(\d+)\.(\d+)/);
 @ISA       = qw(Exporter);
 @EXPORT    = qw(code2script script2code
                 all_script_codes all_script_names
@@ -157,8 +157,9 @@
 #
 #=======================================================================
 {
-    my ($alpha2, $alpha3, $numeric);
-    my $script;
+    my   ($alpha2, $alpha3, $numeric);
+    my    $script;
+    local $_;
 
 
     while (<DATA>)

Modified: packages/liblocale-codes-perl/trunk/lib/Locale/Script.pod
===================================================================
--- packages/liblocale-codes-perl/trunk/lib/Locale/Script.pod	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/lib/Locale/Script.pod	2006-03-07 16:14:12 UTC (rev 2269)
@@ -244,7 +244,7 @@
 
 =head1 COPYRIGHT
 
-Copyright (c) 2002 Neil Bowers.
+Copyright (c) 2002-2004 Neil Bowers.
 
 This module is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.

Modified: packages/liblocale-codes-perl/trunk/t/country.t
===================================================================
--- packages/liblocale-codes-perl/trunk/t/country.t	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/t/country.t	2006-03-07 16:14:12 UTC (rev 2269)
@@ -52,9 +52,9 @@
  ['country2code("macao")                    eq "mo"', 0],
  ['country2code("macau")                    eq "mo"', 0],
 
- ['code2country("tl", LOCALE_CODE_ALPHA_2) eq "East Timor"', 0],
- ['code2country("tls", LOCALE_CODE_ALPHA_3) eq "East Timor"', 0],
- ['code2country("626", LOCALE_CODE_NUMERIC) eq "East Timor"', 0],
+ ['code2country("tl", LOCALE_CODE_ALPHA_2) eq "Timor-Leste"', 0],
+ ['code2country("tls", LOCALE_CODE_ALPHA_3) eq "Timor-Leste"', 0],
+ ['code2country("626", LOCALE_CODE_NUMERIC) eq "Timor-Leste"', 0],
 
 	#================================================
 	# TESTS FOR country2code
@@ -84,7 +84,7 @@
  ['country2code("Jan Mayen")                eq "sj"', 0],    # alias
  ['country2code("USA")                      eq "us"', 0],    # alias
  ['country2code("United States of America") eq "us"', 0],    # alias
- ['country2code("Great Britain")            eq "gb"', 0],    # alias
+ ['country2code("Great Britain")			eq "gb"', 0],    # alias
 
 	#================================================
 	# TESTS FOR country_code2code
@@ -107,6 +107,27 @@
  ['country_code2code(858, LOCALE_CODE_NUMERIC, LOCALE_CODE_ALPHA_3) eq "ury"', 0],
  ['country_code2code("tr", LOCALE_CODE_ALPHA_2, LOCALE_CODE_NUMERIC) eq "792"', 0],
 
+ #-- tests added for 2.07 release
+ ['country2code("Burma")				eq "mm"', 0],    # alias
+ ['country2code("French Southern and Antarctic Lands")  eq "tf"', 0],    # alias
+ ['code2country("ax") eq "Aland Islands"', 0],
+ ['country2code("Aland Islands")			eq "ax"', 0],
+ ['code2country("ala", LOCALE_CODE_ALPHA_3) eq "Aland Islands"', 0],
+ ['code2country("248", LOCALE_CODE_NUMERIC) eq "Aland Islands"', 0],
+
+ ['country2code("Yugoslavia")				eq "cs"', 0],	# alias (old name)
+ ['country2code("Serbia and Montenegro")		eq "cs"', 0],	# new name
+ ['code2country("scg", LOCALE_CODE_ALPHA_3) eq "Serbia and Montenegro"', 0],
+ ['code2country("891", LOCALE_CODE_NUMERIC) eq "Serbia and Montenegro"', 0],
+
+ ['country2code("East Timor")				eq "tl"', 0],	# alias (provisional name)
+ ['code2country("rou", LOCALE_CODE_ALPHA_3) eq "Romania"', 0],
+
+ ['country2code("Zaire")				eq "cd"', 0],	# alias (old name)
+ ['country2code("Congo, The Democratic Republic of the")	eq "cd"', 0],	# new name
+ ['country2code("Congo, The Democratic Republic of the", LOCALE_CODE_ALPHA_3)	eq "cod"', 0],	# new name
+ ['country2code("Congo, The Democratic Republic of the", LOCALE_CODE_NUMERIC)	eq "180"', 0],	# new name
+
 );
 
 print "1..", int(@TESTS), "\n";

Modified: packages/liblocale-codes-perl/trunk/t/currency.t
===================================================================
--- packages/liblocale-codes-perl/trunk/t/currency.t	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/t/currency.t	2006-03-07 16:14:12 UTC (rev 2269)
@@ -64,6 +64,7 @@
  'currency2code("PULA")            eq "bwp"',
  'currency2code("Andorran Peseta") eq "adp"',       # first in DATA segment
  'currency2code("Zimbabwe Dollar") eq "zwd"',       # last in DATA segment
+ 'currency2code("Canadian Dollar") eq "cad"',       # last in DATA segment
 );
 
 print "1..", int(@TESTS), "\n";

Modified: packages/liblocale-codes-perl/trunk/t/language.t
===================================================================
--- packages/liblocale-codes-perl/trunk/t/language.t	2006-03-07 16:11:15 UTC (rev 2268)
+++ packages/liblocale-codes-perl/trunk/t/language.t	2006-03-07 16:14:12 UTC (rev 2269)
@@ -39,7 +39,7 @@
  'code2language("nd") eq "Ndebele, North"',
  'code2language("ng") eq "Ndonga"',
  'code2language("nn") eq "Norwegian Nynorsk"',
- 'code2language("nb") eq "Norwegian Bokmål"',
+ 'code2language("nb") eq "Norwegian Bokmal"',
  'code2language("ny") eq "Chichewa; Nyanja"',
  'code2language("oc") eq "Occitan (post 1500)"',
  'code2language("os") eq "Ossetian; Ossetic"',




More information about the Pkg-perl-cvs-commits mailing list