r1176 - in glibc-package/trunk/debian/patches: . locale
Author: barbier
Date: 2006-02-15 20:43:09 +0000 (Wed, 15 Feb 2006)
New Revision: 1176
Added:
glibc-package/trunk/debian/patches/locale/cvs-iso4217.diff
glibc-package/trunk/debian/patches/locale/cvs-iso639.diff
Removed:
glibc-package/trunk/debian/patches/locale-iso4217.diff
glibc-package/trunk/debian/patches/locale-iso639.diff
Modified:
glibc-package/trunk/debian/patches/series
Log:
Rename locale-iso4217.diff -> locale/cvs-iso4217.diff
locale-iso639.diff -> locale/cvs-iso639.diff
Copied: glibc-package/trunk/debian/patches/locale/cvs-iso4217.diff (from rev 1172, glibc-package/trunk/debian/patches/locale-iso4217.diff)
Copied: glibc-package/trunk/debian/patches/locale/cvs-iso639.diff (from rev 1172, glibc-package/trunk/debian/patches/locale-iso639.diff)
Deleted: glibc-package/trunk/debian/patches/locale-iso4217.diff
===================================================================
--- glibc-package/trunk/debian/patches/locale-iso4217.diff 2006-02-14 23:37:40 UTC (rev 1175)
+++ glibc-package/trunk/debian/patches/locale-iso4217.diff 2006-02-15 20:43:09 UTC (rev 1176)
@@ -1,49 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: Fix tr_TR localedef breakage.
-# DP: Related bugs: #314855: tr_TR.ISO-8859-9...LC_MONETARY: `int_curr_symbol' does not correspond to valid name
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author:
-# DP: Upstream status: Will be submitted.
-# DP: Status Details:
-# DP: Date: 2006-01-29
-
-PATCHLEVEL=0
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-Index: locale/iso-4217.def
-===================================================================
---- locale/iso-4217.def.orig
-+++ locale/iso-4217.def
-@@ -97,7 +98,7 @@
- DEFINE_INT_CURR("LYD") /* Libyan Arab Jamahiriya Dinar */
- DEFINE_INT_CURR("MAD") /* Moroccan Dirham */
- DEFINE_INT_CURR("MDL") /* Moldova Lei */
--DEFINE_INT_CURR("MGF") /* Madagasy Franc */
-+DEFINE_INT_CURR("MGA") /* Madagasy Ariary */
- DEFINE_INT_CURR("MKD") /* Macedonia Denar */
- DEFINE_INT_CURR("MMK") /* Myanmar Kyat */
- DEFINE_INT_CURR("MNT") /* Mongolia Tugrik */
-@@ -150,7 +151,7 @@
- DEFINE_INT_CURR("TMM") /* Turkmenistan Manet */
- DEFINE_INT_CURR("TND") /* Tunisian Dinar */
- DEFINE_INT_CURR("TOP") /* Tonga Pa'Anga */
--DEFINE_INT_CURR("TRL") /* Turkish Lira */
-+DEFINE_INT_CURR("TRY") /* New Turkish Lira */
- DEFINE_INT_CURR("TTD") /* Trinidad and Tobago */
- DEFINE_INT_CURR("TVD") /* Tuvalu Dollars */
- DEFINE_INT_CURR("TWD") /* Taiwan, Province of China Dollar */
Deleted: glibc-package/trunk/debian/patches/locale-iso639.diff
===================================================================
--- glibc-package/trunk/debian/patches/locale-iso639.diff 2006-02-14 23:37:40 UTC (rev 1175)
+++ glibc-package/trunk/debian/patches/locale-iso639.diff 2006-02-15 20:43:09 UTC (rev 1176)
@@ -1,384 +0,0 @@
-Update to latest CVS
-
-Index: glibc-2.3.5/locale/iso-639.def
-===================================================================
---- glibc-2.3.5.orig/locale/iso-639.def
-+++ glibc-2.3.5/locale/iso-639.def
-@@ -12,7 +12,7 @@
- DEFINE_LANGUAGE_CODE3 ("Achinese", ace, ace)
- DEFINE_LANGUAGE_CODE3 ("Acoli", ach, ach)
- DEFINE_LANGUAGE_CODE3 ("Adangme", ada, ada)
--DEFINE_LANGUAGE_CODE3 ("Adygei", ady, ady)
-+DEFINE_LANGUAGE_CODE3 ("Adyghe; Adygei", ady, ady)
- DEFINE_LANGUAGE_CODE ("Afar", aa, aar, aar)
- DEFINE_LANGUAGE_CODE3 ("Afrihili", afh, afh)
- DEFINE_LANGUAGE_CODE ("Afrikaans", af, afr, afr)
-@@ -21,12 +21,12 @@
- DEFINE_LANGUAGE_CODE3 ("Akkadian", akk, akk)
- DEFINE_LANGUAGE_CODE ("Albanian", sq, sqi, alb)
- DEFINE_LANGUAGE_CODE3 ("Aleut", ale, ale)
--DEFINE_LANGUAGE_CODE3 ("Alonquian languages", alg, alg)
-+DEFINE_LANGUAGE_CODE3 ("Algonquian languages", alg, alg)
- DEFINE_LANGUAGE_CODE3 ("Altaic (Other)", tut, tut)
- DEFINE_LANGUAGE_CODE ("Amharic", am, amh, amh)
--DEFINE_LANGUAGE_CODE3 ("Apache language", apa, apa)
-+DEFINE_LANGUAGE_CODE3 ("Apache languages", apa, apa)
- DEFINE_LANGUAGE_CODE ("Arabic", ar, ara, ara)
--DEFINE_LANGUAGE_CODE ("Argonese", an, arg, arg)
-+DEFINE_LANGUAGE_CODE ("Aragonese", an, arg, arg)
- DEFINE_LANGUAGE_CODE3 ("Aramaic", arc, arc)
- DEFINE_LANGUAGE_CODE3 ("Arapaho", arp, arp)
- DEFINE_LANGUAGE_CODE3 ("Araucanian", arn, arn)
-@@ -64,7 +64,7 @@
- DEFINE_LANGUAGE_CODE3 ("Bikol", bik, bik)
- DEFINE_LANGUAGE_CODE3 ("Bini", bin, bin)
- DEFINE_LANGUAGE_CODE ("Bislama", bi, bis, bis)
--DEFINE_LANGUAGE_CODE3 ("Blin", byn, byn)
-+DEFINE_LANGUAGE_CODE3 ("Blin; Bilin", byn, byn)
- DEFINE_LANGUAGE_CODE ("Bosnian", bs, bos, bos)
- DEFINE_LANGUAGE_CODE3 ("Braj", bra, bra)
- DEFINE_LANGUAGE_CODE ("Breton", br, bre, bre)
-@@ -74,33 +74,34 @@
- DEFINE_LANGUAGE_CODE ("Burmese", my, mya, bur)
- DEFINE_LANGUAGE_CODE3 ("Caddo", cad, cad)
- DEFINE_LANGUAGE_CODE3 ("Carib", car, car)
--DEFINE_LANGUAGE_CODE ("Catalan", ca, cat, cat)
-+DEFINE_LANGUAGE_CODE ("Catalan; Valencian", ca, cat, cat)
- DEFINE_LANGUAGE_CODE3 ("Caucasian (Other)", cau, cau)
- DEFINE_LANGUAGE_CODE3 ("Cebuano", ceb, ceb)
- DEFINE_LANGUAGE_CODE3 ("Celtic (Other)", cel, cel)
- DEFINE_LANGUAGE_CODE3 ("Central American Indian (Other)", cai, cai)
- DEFINE_LANGUAGE_CODE3 ("Chagatai", chg, chg)
--DEFINE_LANGUAGE_CODE3 ("Canmic languages", cmc, cmc)
-+DEFINE_LANGUAGE_CODE3 ("Chamic languages", cmc, cmc)
- DEFINE_LANGUAGE_CODE ("Chamorro", ch, cha, cha)
- DEFINE_LANGUAGE_CODE ("Chechen", ce, che, che)
- DEFINE_LANGUAGE_CODE3 ("Cherokee", chr, chr)
--DEFINE_LANGUAGE_CODE ("Chewa; Chechewa; Nyanja", ny, nya, nya)
- DEFINE_LANGUAGE_CODE3 ("Cheyenne", chy, chy)
- DEFINE_LANGUAGE_CODE3 ("Chibcha", chb, chb)
-+DEFINE_LANGUAGE_CODE ("Chichewa; Chewa; Nyanja", ny, nya, nya)
- DEFINE_LANGUAGE_CODE ("Chinese", zh, zho, chi)
- DEFINE_LANGUAGE_CODE3 ("Chinook jargon", chn, chn)
- DEFINE_LANGUAGE_CODE3 ("Chipewyan", chp, chp)
- DEFINE_LANGUAGE_CODE3 ("Choctaw", cho, cho)
--DEFINE_LANGUAGE_CODE ("Church Slavic", cu, chu, chu)
-+DEFINE_LANGUAGE_CODE ("Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic", cu, chu, chu)
- DEFINE_LANGUAGE_CODE3 ("Chuukese", chk, chk)
- DEFINE_LANGUAGE_CODE ("Chuvash", cv, chv, chv)
-+DEFINE_LANGUAGE_CODE3 ("Classical Newari; Old Newari; Classical Nepal Bhasa", nwc, nwc)
- DEFINE_LANGUAGE_CODE3 ("Coptic", cop, cop)
- DEFINE_LANGUAGE_CODE ("Cornish", kw, cor, cor)
- DEFINE_LANGUAGE_CODE ("Corsican", co, cos, cos)
--DEFINE_LANGUAGE_CODE ("Cree", cr, cre, cre)
- DEFINE_LANGUAGE_CODE3 ("Creek", mus, mus)
-+DEFINE_LANGUAGE_CODE ("Cree", cr, cre, cre)
- DEFINE_LANGUAGE_CODE3 ("Creoles and pidgins (Other)", crp, crp)
--DEFINE_LANGUAGE_CODE3 ("Creoles and pidgins, English-based (Other)", cpe, cpe)
-+DEFINE_LANGUAGE_CODE3 ("Creoles and pidgins, English based (Other)", cpe, cpe)
- DEFINE_LANGUAGE_CODE3 ("Creoles and pidgins, French-based (Other)", cpf, cpf)
- DEFINE_LANGUAGE_CODE3 ("Creoles and pidgins, Portuguese-based (Other)", cpp, cpp)
- DEFINE_LANGUAGE_CODE3 ("Crimean Tatar; Crimean Turkish", crh, crh)
-@@ -114,21 +115,21 @@
- DEFINE_LANGUAGE_CODE3 ("Delaware", del, del)
- DEFINE_LANGUAGE_CODE3 ("Dinka", din, din)
- DEFINE_LANGUAGE_CODE ("Divehi", dv, div, div)
--DEFINE_LANGUAGE_CODE3 ("Dogri", doi, doi)
- DEFINE_LANGUAGE_CODE3 ("Dogrib", dgr, dgr)
-+DEFINE_LANGUAGE_CODE3 ("Dogri", doi, doi)
- DEFINE_LANGUAGE_CODE3 ("Dravidian (Other)", dra, dra)
- DEFINE_LANGUAGE_CODE3 ("Duala", dua, dua)
-+DEFINE_LANGUAGE_CODE3 ("Dutch, Middle (ca.1050-1350)", dum, dum)
- DEFINE_LANGUAGE_CODE ("Dutch; Flemish", nl, nld, dut)
--DEFINE_LANGUAGE_CODE3 ("Dutch, Middle", dum, dum)
- DEFINE_LANGUAGE_CODE3 ("Dyula", dyu, dyu)
- DEFINE_LANGUAGE_CODE ("Dzongkha", dz, dzo, dzo)
- DEFINE_LANGUAGE_CODE3 ("Efik", efi, efi)
- DEFINE_LANGUAGE_CODE3 ("Egyptian (Ancient)", egy, egy)
- DEFINE_LANGUAGE_CODE3 ("Ekajuk", eka, eka)
- DEFINE_LANGUAGE_CODE3 ("Elamite", elx, elx)
-+DEFINE_LANGUAGE_CODE3 ("English, Middle (1100-1500)", enm, enm)
-+DEFINE_LANGUAGE_CODE3 ("English, Old (ca.450-1100)", ang, ang)
- DEFINE_LANGUAGE_CODE ("English", en, eng, eng)
--DEFINE_LANGUAGE_CODE3 ("English, Middle", enm, enm)
--DEFINE_LANGUAGE_CODE3 ("English, Old", ang, ang)
- DEFINE_LANGUAGE_CODE3 ("Erzya", myv, myv)
- DEFINE_LANGUAGE_CODE ("Esperanto", eo, epo, epo)
- DEFINE_LANGUAGE_CODE ("Estonian", et, est, est)
-@@ -138,36 +139,35 @@
- DEFINE_LANGUAGE_CODE3 ("Fanti", fat, fat)
- DEFINE_LANGUAGE_CODE ("Faroese", fo, fao, fao)
- DEFINE_LANGUAGE_CODE ("Fijian", fj, fij, fij)
-+DEFINE_LANGUAGE_CODE3 ("Filipino; Pilipino", fil, fil)
- DEFINE_LANGUAGE_CODE ("Finnish", fi, fin, fin)
- DEFINE_LANGUAGE_CODE3 ("Finno-Ugrian (Other)", fiu, fiu)
- DEFINE_LANGUAGE_CODE3 ("Fon", fon, fon)
-+DEFINE_LANGUAGE_CODE3 ("French, Middle (ca.1400-1800)", frm, frm)
-+DEFINE_LANGUAGE_CODE3 ("French, Old (842-ca.1400)", fro, fro)
- DEFINE_LANGUAGE_CODE ("French", fr, fra, fre)
--DEFINE_LANGUAGE_CODE3 ("French, Middle", frm, frm)
--DEFINE_LANGUAGE_CODE3 ("French, Old", fro, fro)
- DEFINE_LANGUAGE_CODE ("Frisian", fy, fry, fry)
- DEFINE_LANGUAGE_CODE3 ("Friulian", fur, fur)
- DEFINE_LANGUAGE_CODE ("Fulah", ff, ful, ful)
--DEFINE_LANGUAGE_CODE3 ("Ga", gaa, gaa)
--DEFINE_LANGUAGE_CODE ("Gaelic (Scots)", gd, gla, gla)
-+DEFINE_LANGUAGE_CODE ("Gaelic; Scottish Gaelic", gd, gla, gla)
- DEFINE_LANGUAGE_CODE ("Gallegan", gl, glg, glg)
- DEFINE_LANGUAGE_CODE ("Ganda", lg, lug, lug)
- DEFINE_LANGUAGE_CODE3 ("Gayo", gay, gay)
-+DEFINE_LANGUAGE_CODE3 ("Ga", gaa, gaa)
- DEFINE_LANGUAGE_CODE3 ("Gbaya", gba, gba)
- DEFINE_LANGUAGE_CODE3 ("Geez", gez, gez)
- DEFINE_LANGUAGE_CODE ("Georgian", ka, kat, geo)
--DEFINE_LANGUAGE_CODE ("German", de, deu, ger)
--DEFINE_LANGUAGE_CODE3 ("German, Low; Saxon, Low", nds, nds)
--DEFINE_LANGUAGE_CODE3 ("German, Middle High", gmh, gmh)
--DEFINE_LANGUAGE_CODE3 ("German, Old High", goh, goh)
-+DEFINE_LANGUAGE_CODE3 ("German, Middle High (ca.1050-1500)", gmh, gmh)
-+DEFINE_LANGUAGE_CODE3 ("German, Old High (ca.750-1050)", goh, goh)
- DEFINE_LANGUAGE_CODE3 ("Germanic (Other)", gem, gem)
--DEFINE_LANGUAGE_CODE ("Gikuyu; Kikuyu", ki, kik, kik)
-+DEFINE_LANGUAGE_CODE ("German", de, deu, ger)
- DEFINE_LANGUAGE_CODE3 ("Gilbertese", gil, gil)
- DEFINE_LANGUAGE_CODE3 ("Gondi", gon, gon)
- DEFINE_LANGUAGE_CODE3 ("Gorontalo", gor, gor)
- DEFINE_LANGUAGE_CODE3 ("Gothic", got, got)
- DEFINE_LANGUAGE_CODE3 ("Grebo", grb, grb)
--DEFINE_LANGUAGE_CODE3 ("Greek, Ancient", grc, grc)
--DEFINE_LANGUAGE_CODE ("Greek, Modern", el, gre, ell)
-+DEFINE_LANGUAGE_CODE3 ("Greek, Ancient (to 1453)", grc, grc)
-+DEFINE_LANGUAGE_CODE ("Greek, Modern (1453-)", el, ell, gre)
- DEFINE_LANGUAGE_CODE ("Guarani", gn, grn, grn)
- DEFINE_LANGUAGE_CODE ("Gujarati", gu, guj, guj)
- DEFINE_LANGUAGE_CODE3 ("Gwich�in", gwi, gwi)
-@@ -196,29 +196,30 @@
- DEFINE_LANGUAGE_CODE3 ("Indo-European (Other)", ine, ine)
- DEFINE_LANGUAGE_CODE ("Indonesian", id, ind, ind)
- DEFINE_LANGUAGE_CODE3 ("Ingush", inh, inh)
--DEFINE_LANGUAGE_CODE ("Interlingua", ia, ina, ina)
-+DEFINE_LANGUAGE_CODE ("Interlingua (International Auxiliary Language Association)", ia, ina, ina)
- DEFINE_LANGUAGE_CODE ("Interlingue", ie, ile, ile)
- DEFINE_LANGUAGE_CODE ("Inuktitut", iu, iku, iku)
- DEFINE_LANGUAGE_CODE ("Inupiaq", ik, ipk, ipk)
- DEFINE_LANGUAGE_CODE3 ("Iranian (Other)", ira, ira)
-+DEFINE_LANGUAGE_CODE3 ("Irish, Middle (900-1200)", mga, mga)
-+DEFINE_LANGUAGE_CODE3 ("Irish, Old (to 900)", sga, sga)
- DEFINE_LANGUAGE_CODE ("Irish", ga, gle, gle)
--DEFINE_LANGUAGE_CODE3 ("Irish, Middle", mga, mga)
--DEFINE_LANGUAGE_CODE3 ("Irish, Old", sga, sga)
- DEFINE_LANGUAGE_CODE3 ("Iroquoian languages", iro, iro)
- DEFINE_LANGUAGE_CODE ("Italian", it, ita, ita)
- DEFINE_LANGUAGE_CODE ("Japanese", ja, jpn, jpn)
--DEFINE_LANGUAGE_CODE ("Javanese", jv, jaw, jav)
-+DEFINE_LANGUAGE_CODE ("Javanese", jv, jav, jav)
- DEFINE_LANGUAGE_CODE3 ("Judeo-Arabic", jrb, jrb)
- DEFINE_LANGUAGE_CODE3 ("Judeo-Persian", jpr, jpr)
- DEFINE_LANGUAGE_CODE3 ("Kabardian", kbd, kbd)
- DEFINE_LANGUAGE_CODE3 ("Kabyle", kab, kab)
- DEFINE_LANGUAGE_CODE3 ("Kachin", kac, kac)
--DEFINE_LANGUAGE_CODE ("Kalaallisut (Greenlandic)", kl, kal, kal)
-+DEFINE_LANGUAGE_CODE ("Kalaallisut; Greenlandic", kl, kal, kal)
-+DEFINE_LANGUAGE_CODE3 ("Kalmyk", xal, xal)
- DEFINE_LANGUAGE_CODE3 ("Kamba", kam, kam)
- DEFINE_LANGUAGE_CODE ("Kannada", kn, kan, kan)
- DEFINE_LANGUAGE_CODE ("Kanuri", kr, kau, kau)
--DEFINE_LANGUAGE_CODE3 ("Karachay-Balkar", krc, krc)
- DEFINE_LANGUAGE_CODE3 ("Kara-Kalpak", kaa, kaa)
-+DEFINE_LANGUAGE_CODE3 ("Karachay-Balkar", krc, krc)
- DEFINE_LANGUAGE_CODE3 ("Karen", kar, kar)
- DEFINE_LANGUAGE_CODE ("Kashmiri", ks, kas, kas)
- DEFINE_LANGUAGE_CODE3 ("Kashubian", csb, csb)
-@@ -228,10 +229,11 @@
- DEFINE_LANGUAGE_CODE ("Khmer", km, khm, khm)
- DEFINE_LANGUAGE_CODE3 ("Khoisan (Other)", khi, khi)
- DEFINE_LANGUAGE_CODE3 ("Khotanese", kho, kho)
--DEFINE_LANGUAGE_CODE ("Kikuyu", ki, kik, kik)
-+DEFINE_LANGUAGE_CODE ("Kikuyu; Gikuyu", ki, kik, kik)
- DEFINE_LANGUAGE_CODE3 ("Kimbundu", kmb, kmb)
- DEFINE_LANGUAGE_CODE ("Kinyarwanda", rw, kin, kin)
- DEFINE_LANGUAGE_CODE ("Kirghiz", ky, kir, kir)
-+DEFINE_LANGUAGE_CODE3 ("Klingon; tlhIngan-Hol", tlh, tlh)
- DEFINE_LANGUAGE_CODE ("Komi", kv, kom, kom)
- DEFINE_LANGUAGE_CODE ("Kongo", kg, kon, kon)
- DEFINE_LANGUAGE_CODE3 ("Konkani", kok, kok)
-@@ -239,7 +241,7 @@
- DEFINE_LANGUAGE_CODE3 ("Kosraean", kos, kos)
- DEFINE_LANGUAGE_CODE3 ("Kpelle", kpe, kpe)
- DEFINE_LANGUAGE_CODE3 ("Kru", kro, kro)
--DEFINE_LANGUAGE_CODE ("Kuanyama", kj, kua, kua)
-+DEFINE_LANGUAGE_CODE ("Kuanyama; Kwanyama", kj, kua, kua)
- DEFINE_LANGUAGE_CODE3 ("Kumyk", kum, kum)
- DEFINE_LANGUAGE_CODE ("Kurdish", ku, kur, kur)
- DEFINE_LANGUAGE_CODE3 ("Kurukh", kru, kru)
-@@ -250,11 +252,13 @@
- DEFINE_LANGUAGE_CODE ("Lao", lo, lao, lao)
- DEFINE_LANGUAGE_CODE ("Latin", la, lat, lat)
- DEFINE_LANGUAGE_CODE ("Latvian", lv, lav, lav)
--DEFINE_LANGUAGE_CODE ("Letzeburgesch", lb, ltz, ltz)
- DEFINE_LANGUAGE_CODE3 ("Lezghian", lez, lez)
- DEFINE_LANGUAGE_CODE ("Limburgan; Limburger; Limburgish", li, lim, lim)
- DEFINE_LANGUAGE_CODE ("Lingala", ln, lin, lin)
- DEFINE_LANGUAGE_CODE ("Lithuanian", lt, lit, lit)
-+DEFINE_LANGUAGE_CODE3 ("Lojban", jbo, jbo)
-+DEFINE_LANGUAGE_CODE3 ("Low German; Low Saxon; German, Low; Saxon, Low", nds, nds)
-+DEFINE_LANGUAGE_CODE3 ("Lower Sorbian", dsb, dsb)
- DEFINE_LANGUAGE_CODE3 ("Lozi", loz, loz)
- DEFINE_LANGUAGE_CODE ("Luba-Katanga", lu, lub, lub)
- DEFINE_LANGUAGE_CODE3 ("Luba-Lulua", lua, lua)
-@@ -263,14 +267,15 @@
- DEFINE_LANGUAGE_CODE3 ("Lunda", lun, lun)
- DEFINE_LANGUAGE_CODE3 ("Luo (Kenya and Tanzania)", luo, luo)
- DEFINE_LANGUAGE_CODE3 ("Lushai", lus, lus)
-+DEFINE_LANGUAGE_CODE ("Luxembourgish; Letzeburgesch", lb, ltz, ltz)
- DEFINE_LANGUAGE_CODE ("Macedonian", mk, mkd, mac)
- DEFINE_LANGUAGE_CODE3 ("Madurese", mad, mad)
- DEFINE_LANGUAGE_CODE3 ("Magahi", mag, mag)
- DEFINE_LANGUAGE_CODE3 ("Maithili", mai, mai)
- DEFINE_LANGUAGE_CODE3 ("Makasar", mak, mak)
- DEFINE_LANGUAGE_CODE ("Malagasy", mg, mlg, mlg)
--DEFINE_LANGUAGE_CODE ("Malay", ms, msa, may)
- DEFINE_LANGUAGE_CODE ("Malayalam", ml, mal, mal)
-+DEFINE_LANGUAGE_CODE ("Malay", ms, msa, may)
- DEFINE_LANGUAGE_CODE ("Maltese", mt, mlt, mlt)
- DEFINE_LANGUAGE_CODE3 ("Manchu", mnc, mnc)
- DEFINE_LANGUAGE_CODE3 ("Mandar", mdr, mdr)
-@@ -286,42 +291,46 @@
- DEFINE_LANGUAGE_CODE3 ("Masai", mas, mas)
- DEFINE_LANGUAGE_CODE3 ("Mayan languages", myn, myn)
- DEFINE_LANGUAGE_CODE3 ("Mende", men, men)
--DEFINE_LANGUAGE_CODE3 ("Micmac", mic, mic)
-+DEFINE_LANGUAGE_CODE3 ("Mi'kmaq; Micmac", mic, mic)
- DEFINE_LANGUAGE_CODE3 ("Minangkabau", min, min)
-+DEFINE_LANGUAGE_CODE3 ("Mirandese", mwl, mwl)
- DEFINE_LANGUAGE_CODE3 ("Miscellaneous languages", mis, mis)
- DEFINE_LANGUAGE_CODE3 ("Mohawk", moh, moh)
- DEFINE_LANGUAGE_CODE3 ("Moksha", mdf, mdf)
- DEFINE_LANGUAGE_CODE ("Moldavian", mo, mol, mol)
- DEFINE_LANGUAGE_CODE3 ("Mon-Khmer (Other)", mkh, mkh)
--DEFINE_LANGUAGE_CODE3 ("Mongo", lol, lol)
- DEFINE_LANGUAGE_CODE ("Mongolian", mn, mon, mon)
-+DEFINE_LANGUAGE_CODE3 ("Mongo", lol, lol)
- DEFINE_LANGUAGE_CODE3 ("Mossi", mos, mos)
-+DEFINE_LANGUAGE_CODE3 ("Multiple languages", mul, mul)
- DEFINE_LANGUAGE_CODE3 ("Munda languages", mun, mun)
- DEFINE_LANGUAGE_CODE3 ("Nahuatl", nah, nah)
- DEFINE_LANGUAGE_CODE ("Nauru", na, nau, nau)
--DEFINE_LANGUAGE_CODE ("Navajo", nv, nav, nav)
--DEFINE_LANGUAGE_CODE ("Ndebele, North", nd, nde, nde)
--DEFINE_LANGUAGE_CODE ("Ndebele, South", nr, nbl, nbl)
-+DEFINE_LANGUAGE_CODE ("Navajo; Navaho", nv, nav, nav)
-+DEFINE_LANGUAGE_CODE ("Ndebele, North; North Ndebele", nd, nde, nde)
-+DEFINE_LANGUAGE_CODE ("Ndebele, South; South Ndebele", nr, nbl, nbl)
- DEFINE_LANGUAGE_CODE ("Ndonga", ng, ndo, ndo)
- DEFINE_LANGUAGE_CODE3 ("Neapolitan", nap, nap)
-+DEFINE_LANGUAGE_CODE3 ("Nepal Bhasa; Newari", new, new)
- DEFINE_LANGUAGE_CODE ("Nepali", ne, nep, nep)
--DEFINE_LANGUAGE_CODE3 ("Newari", new, new)
- DEFINE_LANGUAGE_CODE3 ("Nias", nia, nia)
- DEFINE_LANGUAGE_CODE3 ("Niger-Kordofanian (Other)", nic, nic)
- DEFINE_LANGUAGE_CODE3 ("Nilo-Saharan (Other)", ssa, ssa)
- DEFINE_LANGUAGE_CODE3 ("Niuean", niu, niu)
- DEFINE_LANGUAGE_CODE3 ("Nogai", nog, nog)
- DEFINE_LANGUAGE_CODE3 ("Norse, Old", non, non)
--DEFINE_LANGUAGE_CODE3 ("North American Indian (Other)", nai, nai)
-+DEFINE_LANGUAGE_CODE3 ("North American Indian", nai, nai)
- DEFINE_LANGUAGE_CODE ("Northern Sami", se, sme, sme)
--DEFINE_LANGUAGE_CODE ("Norwegian", no, nor, nor)
-+DEFINE_LANGUAGE_CODE3 ("Northern Sotho; Pedi; Sepedi", nso, nso)
- DEFINE_LANGUAGE_CODE ("Norwegian Bokm�, nb, nob, nob)
- DEFINE_LANGUAGE_CODE ("Norwegian Nynorsk", nn, nno, nno)
-+DEFINE_LANGUAGE_CODE ("Norwegian", no, nor, nor)
- DEFINE_LANGUAGE_CODE3 ("Nubian languages", nub, nub)
- DEFINE_LANGUAGE_CODE3 ("Nyamwezi", nym, nym)
- DEFINE_LANGUAGE_CODE3 ("Nyankole", nyn, nyn)
- DEFINE_LANGUAGE_CODE3 ("Nyoro", nyo, nyo)
- DEFINE_LANGUAGE_CODE3 ("Nzima", nzi, nzi)
-+DEFINE_LANGUAGE_CODE ("Occitan (post 1500); Proven�", oc, oci, oci)
- DEFINE_LANGUAGE_CODE ("Ojibwa", oj, oji, oji)
- DEFINE_LANGUAGE_CODE ("Oriya", or, ori, ori)
- DEFINE_LANGUAGE_CODE ("Oromo", om, orm, orm)
-@@ -333,18 +342,17 @@
- DEFINE_LANGUAGE_CODE ("Pali", pi, pli, pli)
- DEFINE_LANGUAGE_CODE3 ("Pampanga", pam, pam)
- DEFINE_LANGUAGE_CODE3 ("Pangasinan", pag, pag)
--DEFINE_LANGUAGE_CODE ("Panjabi", pa, pan, pan)
-+DEFINE_LANGUAGE_CODE ("Panjabi; Punjabi", pa, pan, pan)
- DEFINE_LANGUAGE_CODE3 ("Papiamento", pap, pap)
- DEFINE_LANGUAGE_CODE3 ("Papuan (Other)", paa, paa)
-+DEFINE_LANGUAGE_CODE3 ("Persian, Old (ca.600-400 B.C.)", peo, peo)
- DEFINE_LANGUAGE_CODE ("Persian", fa, fas, per)
--DEFINE_LANGUAGE_CODE3 ("Persian, Old (ca.600-400 B.C.E.)", peo, peo)
- DEFINE_LANGUAGE_CODE3 ("Philippine (Other)", phi, phi)
- DEFINE_LANGUAGE_CODE3 ("Phoenician", phn, phn)
- DEFINE_LANGUAGE_CODE3 ("Pohnpeian", pon, pon)
- DEFINE_LANGUAGE_CODE ("Polish", pl, pol, pol)
- DEFINE_LANGUAGE_CODE ("Portuguese", pt, por, por)
--DEFINE_LANGUAGE_CODE3 ("Prakrit", pra, pra)
--DEFINE_LANGUAGE_CODE ("Proven�; Occitan (post 1500)", oc, oci, oci)
-+DEFINE_LANGUAGE_CODE3 ("Prakrit languages", pra, pra)
- DEFINE_LANGUAGE_CODE3 ("Proven�, Old (to 1500)", pro, pro)
- DEFINE_LANGUAGE_CODE ("Pushto", ps, pus, pus)
- DEFINE_LANGUAGE_CODE ("Quechua", qu, que, que)
-@@ -375,10 +383,12 @@
- DEFINE_LANGUAGE_CODE3 ("Shan", shn, shn)
- DEFINE_LANGUAGE_CODE ("Shona", sn, sna, sna)
- DEFINE_LANGUAGE_CODE ("Sichuan Yi", ii, iii, iii)
-+DEFINE_LANGUAGE_CODE3 ("Sicilian", scn, scn)
- DEFINE_LANGUAGE_CODE3 ("Sidamo", sid, sid)
-+DEFINE_LANGUAGE_CODE3 ("Sign Languages", sgn, sgn)
- DEFINE_LANGUAGE_CODE3 ("Siksika", bla, bla)
- DEFINE_LANGUAGE_CODE ("Sindhi", sd, snd, snd)
--DEFINE_LANGUAGE_CODE ("Sinhalese", si, sin, sin)
-+DEFINE_LANGUAGE_CODE ("Sinhala; Sinhalese", si, sin, sin)
- DEFINE_LANGUAGE_CODE3 ("Sino-Tibetan (Other)", sit, sit)
- DEFINE_LANGUAGE_CODE3 ("Siouan languages", sio, sio)
- DEFINE_LANGUAGE_CODE3 ("Skolt Sami", sms, sms)
-@@ -391,11 +401,10 @@
- DEFINE_LANGUAGE_CODE3 ("Songhai", son, son)
- DEFINE_LANGUAGE_CODE3 ("Soninke", snk, snk)
- DEFINE_LANGUAGE_CODE3 ("Sorbian languages", wen, wen)
--DEFINE_LANGUAGE_CODE3 ("Sotho, Northern", nso, nso)
- DEFINE_LANGUAGE_CODE ("Sotho, Southern", st, sot, sot)
- DEFINE_LANGUAGE_CODE3 ("South American Indian (Other)", sai, sai)
- DEFINE_LANGUAGE_CODE3 ("Southern Sami", sma, sma)
--DEFINE_LANGUAGE_CODE ("Spanish", es, spa, spa)
-+DEFINE_LANGUAGE_CODE ("Spanish; Castilian", es, spa, spa)
- DEFINE_LANGUAGE_CODE3 ("Sukuma", suk, suk)
- DEFINE_LANGUAGE_CODE3 ("Sumerian", sux, sux)
- DEFINE_LANGUAGE_CODE ("Sundanese", su, sun, sun)
-@@ -430,21 +439,23 @@
- DEFINE_LANGUAGE_CODE ("Tswana", tn, tsn, tsn)
- DEFINE_LANGUAGE_CODE3 ("Tumbuka", tum, tum)
- DEFINE_LANGUAGE_CODE3 ("Tupi languages", tup, tup)
--DEFINE_LANGUAGE_CODE ("Turkish", tr, tur, tur)
- DEFINE_LANGUAGE_CODE3 ("Turkish, Ottoman (1500-1928)", ota, ota)
-+DEFINE_LANGUAGE_CODE ("Turkish", tr, tur, tur)
- DEFINE_LANGUAGE_CODE ("Turkmen", tk, tuk, tuk)
- DEFINE_LANGUAGE_CODE3 ("Tuvalu", tvl, tvl)
- DEFINE_LANGUAGE_CODE3 ("Tuvinian", tyv, tyv)
- DEFINE_LANGUAGE_CODE ("Twi", tw, twi, twi)
- DEFINE_LANGUAGE_CODE3 ("Udmurt", udm, udm)
- DEFINE_LANGUAGE_CODE3 ("Ugaritic", uga, uga)
--DEFINE_LANGUAGE_CODE ("Uighur", ug, uig, uig)
-+DEFINE_LANGUAGE_CODE ("Uighur; Uyghur", ug, uig, uig)
- DEFINE_LANGUAGE_CODE ("Ukrainian", uk, ukr, ukr)
- DEFINE_LANGUAGE_CODE3 ("Umbundu", umb, umb)
-+DEFINE_LANGUAGE_CODE3 ("Undetermined", und, und)
-+DEFINE_LANGUAGE_CODE3 ("Upper Sorbian", hsb, hsb)
- DEFINE_LANGUAGE_CODE ("Urdu", ur, urd, urd)
- DEFINE_LANGUAGE_CODE ("Uzbek", uz, uzb, uzb)
- DEFINE_LANGUAGE_CODE3 ("Vai", vai, vai)
--DEFINE_LANGUAGE_CODE3 ("Venda", ven, ven)
-+DEFINE_LANGUAGE_CODE ("Venda", ve, ven, ven)
- DEFINE_LANGUAGE_CODE ("Vietnamese", vi, vie, vie)
- DEFINE_LANGUAGE_CODE ("Volap�o, vol, vol)
- DEFINE_LANGUAGE_CODE3 ("Votic", vot, vot)
-@@ -465,6 +476,6 @@
- DEFINE_LANGUAGE_CODE3 ("Zande", znd, znd)
- DEFINE_LANGUAGE_CODE3 ("Zapotec", zap, zap)
- DEFINE_LANGUAGE_CODE3 ("Zenaga", zen, zen)
--DEFINE_LANGUAGE_CODE ("Zhuang", za, zha, zha)
-+DEFINE_LANGUAGE_CODE ("Zhuang; Chuang", za, zha, zha)
- DEFINE_LANGUAGE_CODE ("Zulu", zu, zul, zul)
- DEFINE_LANGUAGE_CODE3 ("Zuni", zun, zun)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-02-14 23:37:40 UTC (rev 1175)
+++ glibc-package/trunk/debian/patches/series 2006-02-15 20:43:09 UTC (rev 1176)
@@ -67,8 +67,8 @@
glibc235-gcc4-sparc-inline.diff -p0
glibc235-gcc4-alpha-profile.diff -p0
glibc235-gcc34-m68k-seccomment.diff -p0
-locale-iso4217.diff -p0
-locale-iso639.diff
+locale/cvs-iso4217.diff -p0
+locale/cvs-iso639.diff
glibc235-gcc4-hppa-profile.diff -p0
glibc235-dl-execstack.diff -p0
i386-amd64-biarch.diff -p1
Reply to: