Control: tags 1052772 + patch
Dear maintainer, I've prepared an NMU for isoquery (versioned as 3.3.3-1.1). The diff is attached to this message. Regards. -- Sebastian Ramacher
diff -Nru isoquery-3.3.3/debian/changelog isoquery-3.3.3/debian/changelog --- isoquery-3.3.3/debian/changelog 2023-02-28 12:15:46.000000000 +0100 +++ isoquery-3.3.3/debian/changelog 2024-04-27 14:02:12.000000000 +0200 @@ -1,3 +1,11 @@ +isoquery (3.3.3-1.1) unstable; urgency=medium + + [ Steve Langasek ] + * debian/patches/test-locale-is-C: Don't expect non-English output + under LANG=C.UTF-8. Closes: #1052772. + + -- Sebastian Ramacher <sramac...@debian.org> Sat, 27 Apr 2024 14:02:12 +0200 + isoquery (3.3.3-1) unstable; urgency=medium * New upstream version 3.3.3 diff -Nru isoquery-3.3.3/debian/patches/series isoquery-3.3.3/debian/patches/series --- isoquery-3.3.3/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ isoquery-3.3.3/debian/patches/series 2024-04-27 14:00:59.000000000 +0200 @@ -0,0 +1 @@ +test-locale-is-C diff -Nru isoquery-3.3.3/debian/patches/test-locale-is-C isoquery-3.3.3/debian/patches/test-locale-is-C --- isoquery-3.3.3/debian/patches/test-locale-is-C 1970-01-01 01:00:00.000000000 +0100 +++ isoquery-3.3.3/debian/patches/test-locale-is-C 2024-04-27 14:00:59.000000000 +0200 @@ -0,0 +1,423 @@ +Description: Don't expect non-English output under LANG=C.UTF-8 + For some reason upstream has a test case that uses French output to compare + against, but sets LANG=C.UTF-8 in the test environment. We shouldn't expect + French output in this environment. +Author: Steve Langasek <steve.langa...@canonical.com> +Bug-Debian: https://bugs.debian.org/1052772. +Last-Update: 2024-04-09 +Forwarded: no + +Index: isoquery-3.3.3/tests/expected/iso_639-2/all_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_639-2/all_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_639-2/all_localized_test_stdout.txt +@@ -1,4 +1,4 @@ +-aar aa afar +-alg algonquines, langues +-bod tib bo tibétain +-heb he hébreu ++aar aa Afar ++alg Algonquian languages ++bod tib bo Tibetan ++heb he Hebrew +Index: isoquery-3.3.3/tests/expected/iso_639-3/all_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_639-3/all_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_639-3/all_localized_test_stdout.txt +@@ -1,3 +1,3 @@ +-aae I L albanais d'Arbëreshë +-deu I L de ger allemand +-nbs I L langue des signes namibienne ++aae I L Arbëreshë Albanian ++deu I L de ger German ++nbs I L Namibian Sign Language +Index: isoquery-3.3.3/tests/expected/iso_639-5/all_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_639-5/all_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_639-5/all_localized_test_stdout.txt +@@ -1,3 +1,3 @@ +-aus australiennes, langues +-nai indiennes d’Amérique du Nord, langues +-tut altaïques, langues ++aus Australian languages ++nai North American Indian languages ++tut Altaic languages +Index: isoquery-3.3.3/tests/expected/iso_3166-1/all_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_3166-1/all_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_3166-1/all_localized_test_stdout.txt +@@ -1,7 +1,7 @@ +-DE DEU 276 Allemagne +-ES ESP 724 Espagne ++DE DEU 276 Germany ++ES ESP 724 Spain + FR FRA 250 France +-RU RUS 643 Russie, Fédération de ++RU RUS 643 Russian Federation + TV TUV 798 Tuvalu +-TW TWN 158 Taïwan, province de Chine ++TW TWN 158 Taiwan, Province of China + UA UKR 804 Ukraine +Index: isoquery-3.3.3/tests/expected/iso_3166-1/invalid_codes_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_3166-1/invalid_codes_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_3166-1/invalid_codes_localized_test_stdout.txt +@@ -1,3 +1,3 @@ + UA UKR 804 Ukraine +-FR FRA 250 Frankreich +-TW TWN 158 Taiwan, Chinesische Provinz ++FR FRA 250 France ++TW TWN 158 Taiwan, Province of China +Index: isoquery-3.3.3/tests/expected/iso_3166-1/multiple_codes_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_3166-1/multiple_codes_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_3166-1/multiple_codes_localized_test_stdout.txt +@@ -1,3 +1,3 @@ + UA UKR 804 Ukraine +-FR FRA 250 Frankreich +-TW TWN 158 Taiwan, Chinesische Provinz ++FR FRA 250 France ++TW TWN 158 Taiwan, Province of China +Index: isoquery-3.3.3/tests/expected/iso_3166-2/all_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_3166-2/all_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_3166-2/all_localized_test_stdout.txt +@@ -1,63 +1,63 @@ +-DE-BB Land Brandebourg ++DE-BB Land Brandenburg + DE-BE Land Berlin +-DE-BW Land Bade-Wurtemberg +-DE-BY Land Bavière +-DE-HB Land Brème +-DE-HE Land Hesse +-DE-HH Land Hambourg +-DE-MV Land Mecklembourg-Poméranie occidentale +-DE-NI Land Basse-Saxe +-DE-NW Land Rhénanie du Nord-Westfalie +-DE-RP Land Rhénanie-Palatinat ++DE-BW Land Baden-W?rttemberg ++DE-BY Land Bayern ++DE-HB Land Bremen ++DE-HE Land Hessen ++DE-HH Land Hamburg ++DE-MV Land Mecklenburg-Vorpommern ++DE-NI Land Niedersachsen ++DE-NW Land Nordrhein-Westfalen ++DE-RP Land Rheinland-Pfalz + DE-SH Land Schleswig-Holstein +-DE-SL Land Sarre +-DE-SN Land Saxe +-DE-ST Land Saxe-Anhalt +-DE-TH Land Turinge ++DE-SL Land Saarland ++DE-SN Land Sachsen ++DE-ST Land Sachsen-Anhalt ++DE-TH Land Th?ringen + ES-A Province VC Alacant* + ES-AB Province CM Albacete +-ES-AL Province AN Almeria +-ES-AN Autonomous community Andalousie +-ES-AR Autonomous community Aragon +-ES-AS Autonomous community Asturies, principauté des +-ES-AV Province CL Avila ++ES-AL Province AN Almer?a ++ES-AN Autonomous community Andaluc?a ++ES-AR Autonomous community Arag?n ++ES-AS Autonomous community Asturias, Principado de ++ES-AV Province CL ?vila + ES-B Province CT Barcelona [Barcelona] + ES-BA Province EX Badajoz +-ES-BI Province PV Biscaye ++ES-BI Province PV Bizkaia + ES-BU Province CL Burgos +-ES-C Province GA La Corogne +-ES-CA Province AN Cadix +-ES-CB Autonomous community Cantabrique +-ES-CC Province EX Caceres ++ES-C Province GA A Coru?a [La Coru?a] ++ES-CA Province AN C?diz ++ES-CB Autonomous community Cantabria ++ES-CC Province EX C?ceres + ES-CE Autonomous city in north africa Ceuta +-ES-CL Autonomous community Castille et Léon +-ES-CM Autonomous community Castille-La Manche +-ES-CN Autonomous community Canaries +-ES-CO Province AN Cordoba ++ES-CL Autonomous community Castilla y Le?n ++ES-CM Autonomous community Castilla-La Mancha ++ES-CN Autonomous community Canarias ++ES-CO Province AN C?rdoba + ES-CR Province CM Ciudad Real +-ES-CS Province VC Castelló* +-ES-CT Autonomous community Catalunya [Cataluña] ++ES-CS Province VC Castell?* ++ES-CT Autonomous community Catalunya [Catalu?a] + ES-CU Province CM Cuenca +-ES-EX Autonomous community Extramadoure ++ES-EX Autonomous community Extremadura + ES-GA Autonomous community Galicia [Galicia] + ES-GC Province CN Las Palmas + ES-GI Province CT Girona [Gerona] +-ES-GR Province AN Grenade ++ES-GR Province AN Granada + ES-GU Province CM Guadalajara + ES-H Province AN Huelva + ES-HU Province AR Huesca + ES-IB Autonomous community Illes Balears [Islas Baleares] +-ES-J Province AN Jaen +-ES-L Province CT Lleida [Lérida] +-ES-LE Province CL Léon ++ES-J Province AN Ja?n ++ES-L Province CT Lleida [L?rida] ++ES-LE Province CL Le?n + ES-LO Province RI La Rioja + ES-LU Province GA Lugo [Lugo] + ES-M Province MD Madrid +-ES-MA Province AN Malaga +-ES-MC Autonomous community Murcei, région de +-ES-MD Autonomous community Madrid, Communauté de ++ES-MA Province AN M?laga ++ES-MC Autonomous community Murcia, Regi?n de ++ES-MD Autonomous community Madrid, Comunidad de + ES-ML Autonomous city in north africa Melilla +-ES-MU Province MC Murcie ++ES-MU Province MC Murcia + ES-NA Province NC Nafarroa* + ES-NC Autonomous community Nafarroako Foru Komunitatea* + ES-O Province AS Asturias +@@ -67,21 +67,21 @@ + ES-PO Province GA Pontevedra [Pontevedra] + ES-PV Autonomous community Euskal Herria + ES-RI Autonomous community La Rioja +-ES-S Province CB Cantabrique +-ES-SA Province CL Salamanque +-ES-SE Province AN Séville +-ES-SG Province CL Segovie ++ES-S Province CB Cantabria ++ES-SA Province CL Salamanca ++ES-SE Province AN Sevilla ++ES-SG Province CL Segovia + ES-SO Province CL Soria +-ES-SS Province PV Guipuscoa ++ES-SS Province PV Gipuzkoa + ES-T Province CT Tarragona [Tarragona] +-ES-TE Province AR Téruel ++ES-TE Province AR Teruel + ES-TF Province CN Santa Cruz de Tenerife + ES-TO Province CM Toledo + ES-V Province VC Valencia + ES-VA Province CL Valladolid + ES-VC Autonomous community Valenciana, Comunidad + ES-VI Province PV Araba* +-ES-Z Province AR Saragosse ++ES-Z Province AR Zaragoza + ES-ZA Province CL Zamora + FR-01 Metropolitan department ARA Ain + FR-02 Metropolitan department HDF Aisne +@@ -89,40 +89,40 @@ + FR-04 Metropolitan department PAC Alpes-de-Haute-Provence + FR-05 Metropolitan department PAC Hautes-Alpes + FR-06 Metropolitan department PAC Alpes-Maritimes +-FR-07 Metropolitan department ARA Ardèche ++FR-07 Metropolitan department ARA Ard?che + FR-08 Metropolitan department GES Ardennes +-FR-09 Metropolitan department OCC Ariège ++FR-09 Metropolitan department OCC Ari?ge + FR-10 Metropolitan department GES Aube + FR-11 Metropolitan department OCC Aude + FR-12 Metropolitan department OCC Aveyron +-FR-13 Metropolitan department PAC Bouches-du-Rhône ++FR-13 Metropolitan department PAC Bouches-du-Rh?ne + FR-14 Metropolitan department NOR Calvados + FR-15 Metropolitan department ARA Cantal + FR-16 Metropolitan department NAQ Charente + FR-17 Metropolitan department NAQ Charente-Maritime + FR-18 Metropolitan department CVL Cher +-FR-19 Metropolitan department NAQ Corrèze ++FR-19 Metropolitan department NAQ Corr?ze + FR-20R Metropolitan collectivity with special status Corse +-FR-21 Metropolitan department BFC Côte-d'Or +-FR-22 Metropolitan department BRE Côtes-d'Armor ++FR-21 Metropolitan department BFC C?te-d'Or ++FR-22 Metropolitan department BRE C?tes-d'Armor + FR-23 Metropolitan department NAQ Creuse + FR-24 Metropolitan department NAQ Dordogne + FR-25 Metropolitan department BFC Doubs +-FR-26 Metropolitan department ARA Drôme ++FR-26 Metropolitan department ARA Dr?me + FR-27 Metropolitan department NOR Eure + FR-28 Metropolitan department CVL Eure-et-Loir +-FR-29 Metropolitan department BRE Finistère ++FR-29 Metropolitan department BRE Finist?re + FR-2A Metropolitan department 20R Corse-du-Sud + FR-2B Metropolitan department 20R Haute-Corse + FR-30 Metropolitan department OCC Gard + FR-31 Metropolitan department OCC Haute-Garonne + FR-32 Metropolitan department OCC Gers + FR-33 Metropolitan department NAQ Gironde +-FR-34 Metropolitan department OCC Hérault ++FR-34 Metropolitan department OCC H?rault + FR-35 Metropolitan department BRE Ille-et-Vilaine + FR-36 Metropolitan department CVL Indre + FR-37 Metropolitan department CVL Indre-et-Loire +-FR-38 Metropolitan department ARA Isère ++FR-38 Metropolitan department ARA Is?re + FR-39 Metropolitan department BFC Jura + FR-40 Metropolitan department NAQ Landes + FR-41 Metropolitan department CVL Loir-et-Cher +@@ -132,7 +132,7 @@ + FR-45 Metropolitan department CVL Loiret + FR-46 Metropolitan department OCC Lot + FR-47 Metropolitan department NAQ Lot-et-Garonne +-FR-48 Metropolitan department OCC Lozère ++FR-48 Metropolitan department OCC Loz?re + FR-49 Metropolitan department PDL Maine-et-Loire + FR-50 Metropolitan department NOR Manche + FR-51 Metropolitan department GES Marne +@@ -142,20 +142,20 @@ + FR-55 Metropolitan department GES Meuse + FR-56 Metropolitan department BRE Morbihan + FR-57 Metropolitan department GES Moselle +-FR-58 Metropolitan department BFC Nièvre ++FR-58 Metropolitan department BFC Ni?vre + FR-59 Metropolitan department HDF Nord + FR-60 Metropolitan department HDF Oise + FR-61 Metropolitan department NOR Orne + FR-62 Metropolitan department HDF Pas-de-Calais +-FR-63 Metropolitan department ARA Puy-de-Dôme +-FR-64 Metropolitan department NAQ Pyrénées-Atlantiques +-FR-65 Metropolitan department OCC Hautes-Pyrénées +-FR-66 Metropolitan department OCC Pyrénées-Orientales ++FR-63 Metropolitan department ARA Puy-de-D?me ++FR-64 Metropolitan department NAQ Pyr?n?es-Atlantiques ++FR-65 Metropolitan department OCC Hautes-Pyr?n?es ++FR-66 Metropolitan department OCC Pyr?n?es-Orientales + FR-67 Metropolitan department GES Bas-Rhin + FR-68 Metropolitan department GES Haut-Rhin +-FR-69 Metropolitan department ARA Rhône +-FR-70 Metropolitan department BFC Haute-Saône +-FR-71 Metropolitan department BFC Saône-et-Loire ++FR-69 Metropolitan department ARA Rh?ne ++FR-70 Metropolitan department BFC Haute-Sa?ne ++FR-71 Metropolitan department BFC Sa?ne-et-Loire + FR-72 Metropolitan department PDL Sarthe + FR-73 Metropolitan department ARA Savoie + FR-74 Metropolitan department ARA Haute-Savoie +@@ -163,13 +163,13 @@ + FR-76 Metropolitan department NOR Seine-Maritime + FR-77 Metropolitan department IDF Seine-et-Marne + FR-78 Metropolitan department IDF Yvelines +-FR-79 Metropolitan department NAQ Deux-Sèvres ++FR-79 Metropolitan department NAQ Deux-S?vres + FR-80 Metropolitan department HDF Somme + FR-81 Metropolitan department OCC Tarn + FR-82 Metropolitan department OCC Tarn-et-Garonne + FR-83 Metropolitan department PAC Var + FR-84 Metropolitan department PAC Vaucluse +-FR-85 Metropolitan department PDL Vendée ++FR-85 Metropolitan department PDL Vend?e + FR-86 Metropolitan department NAQ Vienne + FR-87 Metropolitan department NAQ Haute-Vienne + FR-88 Metropolitan department GES Vosges +@@ -179,47 +179,47 @@ + FR-92 Metropolitan department IDF Hauts-de-Seine + FR-93 Metropolitan department IDF Seine-Saint-Denis + FR-94 Metropolitan department IDF Val-de-Marne +-FR-95 Metropolitan department IDF Val-d’Oise ++FR-95 Metropolitan department IDF Val-d'Oise + FR-971 Overseas department GP Guadeloupe + FR-972 Overseas department MQ Martinique +-FR-973 Overseas department GF Guyane (française) +-FR-974 Overseas department RE La Réunion ++FR-973 Overseas department GF Guyane (fran?aise) ++FR-974 Overseas department RE La R?union + FR-976 Overseas department YT Mayotte +-FR-ARA Metropolitan region Auvergne-Rhône-Alpes +-FR-BFC Metropolitan region Bourgogne-Franche-Comté +-FR-BL Overseas collectivity Saint-Barthélemy ++FR-ARA Metropolitan region Auvergne-Rh?ne-Alpes ++FR-BFC Metropolitan region Bourgogne-Franche-Comt? ++FR-BL Overseas collectivity Saint-Barth?lemy + FR-BRE Metropolitan region Bretagne + FR-CP Dependency Clipperton + FR-CVL Metropolitan region Centre-Val de Loire +-FR-GES Metropolitan region Grand Est +-FR-GF Overseas region Guyane (française) ++FR-GES Metropolitan region Grand-Est ++FR-GF Overseas region Guyane (fran?aise) + FR-GP Overseas region Guadeloupe + FR-HDF Metropolitan region Hauts-de-France +-FR-IDF Metropolitan region Île-de-France ++FR-IDF Metropolitan region ?le-de-France + FR-MF Overseas collectivity Saint-Martin + FR-MQ Overseas region Martinique + FR-NAQ Metropolitan region Nouvelle-Aquitaine +-FR-NC Overseas collectivity with special status Nouvelle-Calédonie ++FR-NC Overseas collectivity with special status Nouvelle-Cal?donie + FR-NOR Metropolitan region Normandie + FR-OCC Metropolitan region Occitanie +-FR-PAC Metropolitan region Provence-Alpes-Côte d'Azur +-FR-PDL Metropolitan region Pays de la Loire +-FR-PF Overseas collectivity Polynésie française ++FR-PAC Metropolitan region Provence-Alpes-C?te-d?Azur ++FR-PDL Metropolitan region Pays-de-la-Loire ++FR-PF Overseas collectivity Polyn?sie fran?aise + FR-PM Overseas collectivity Saint-Pierre-et-Miquelon +-FR-RE Overseas region La Réunion +-FR-TF Overseas territory Terres australes françaises ++FR-RE Overseas region La R?union ++FR-TF Overseas territory Terres australes fran?aises + FR-WF Overseas collectivity Wallis-et-Futuna + FR-YT Overseas region Mayotte + NO-03 County Oslo + NO-11 County Rogaland +-NO-15 County Møre og Romsdal ++NO-15 County M?re og Romsdal + NO-18 County Nordland +-NO-21 Arctic region Svalbard (région arctique) +-NO-22 Arctic region Jan Mayen (région arctique) ++NO-21 Arctic region Svalbard (Arctic Region) ++NO-22 Arctic region Jan Mayen (Arctic Region) + NO-30 County Viken + NO-34 County Innlandet + NO-38 County Vestfold og Telemark + NO-42 County Agder + NO-46 County Vestland +-NO-50 County Trööndelage +-NO-54 County Romssa ja Finnmárkku ++NO-50 County Tr??ndelage ++NO-54 County Romssa ja Finnm?rkku +Index: isoquery-3.3.3/tests/expected/iso_3166-3/all_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_3166-3/all_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_3166-3/all_localized_test_stdout.txt +@@ -1,3 +1,3 @@ +-ATB BQAQ 1979 Territoire britannique de l'Antarctique +-SCG CSXX 891 2006-06-05 Serbie et Monténégro +-GEL GEHH 296 now split into Kiribati and Tuvalu 1979 Îles Gilbert et Ellice ++ATB BQAQ 1979 British Antarctic Territory ++SCG CSXX 891 2006-06-05 Serbia and Montenegro ++GEL GEHH 296 now split into Kiribati and Tuvalu 1979 Gilbert and Ellice Islands +Index: isoquery-3.3.3/tests/expected/iso_4217/all_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_4217/all_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_4217/all_localized_test_stdout.txt +@@ -1,3 +1,3 @@ + EUR 978 Euro +-GBP 826 Livre sterling +-INR 356 Roupie indienne ++GBP 826 Pound Sterling ++INR 356 Indian Rupee +Index: isoquery-3.3.3/tests/expected/iso_15924/all_localized_test_stdout.txt +=================================================================== +--- isoquery-3.3.3.orig/tests/expected/iso_15924/all_localized_test_stdout.txt ++++ isoquery-3.3.3/tests/expected/iso_15924/all_localized_test_stdout.txt +@@ -1,4 +1,4 @@ +-Beng 325 bengali +-Cyrl 220 cyrillique +-Grek 200 grec +-Latn 215 latin ++Beng 325 Bengali ++Cyrl 220 Cyrillic ++Grek 200 Greek ++Latn 215 Latin
