NetBSD Problem Report #42576

From www@NetBSD.org  Mon Jan  4 14:17:41 2010
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 3D11263C37E
	for <gnats-bugs@gnats.NetBSD.org>; Mon,  4 Jan 2010 14:17:41 +0000 (UTC)
Message-Id: <20100104141740.E23F663B844@www.NetBSD.org>
Date: Mon,  4 Jan 2010 14:17:40 +0000 (UTC)
From: toddy@debian.org
Reply-To: toddy@debian.org
To: gnats-bugs@NetBSD.org
Subject: Update of questions and answers in quiz game
X-Send-Pr-Version: www-1.0

>Number:         42576
>Category:       bin
>Synopsis:       Update of questions and answers in quiz game
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgoyette
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 04 14:20:01 +0000 2010
>Closed-Date:    Tue Jun 28 00:18:01 +0000 2016
>Last-Modified:  Tue Jun 28 00:20:01 +0000 2016
>Originator:     Tobias Quathamer
>Release:        
>Organization:
>Environment:
>Description:
This is an update for the quiz game program. The patch contains one spelling error in the murders file and quite some changes in the capitals of the world. Lastly, the data of american presidents have been updated.

If there's a problem with the non-ASCII characters (Backspace) in the patch getting mangled, please contact me.
>How-To-Repeat:

>Fix:
--- a/games/quiz/datfiles/murders
+++ b/games/quiz/datfiles/murders
@@ -19,7 +19,7 @@
 {Yukio }Mishima:{Yukio }Mishima
 {Alexander }Hamilton:{Aaron }Burr
 Cleopatra:{the |an }asp
-[Ann Boleyn|Catharine Howard]:Henry{ VIII}
+[Anne Boleyn|Catharine Howard]:Henry{ VIII}
 vaudeville:{the }movies|film
 {the }movies|film:TV|television
 {the }VA patients:{the }nurses
--- a/games/quiz/datfiles/africa
+++ b/games/quiz/datfiles/africa
@@ -1,43 +1,56 @@
-Algeria:Alg[iers|er]
-Botswana:Gaberones
+Algeria:Algiers
+Angola:Luanda
+Benin:Porto-Novo
+Botswana:Gaborone
+Burkina Faso:Ouagadougou
 Burundi:Bujumbura
-Cameroun:Yaound['e|e'|e]
+C[^o|o^|o]te d'Ivoire:Yamoussoukro
+Cameroon:Yaound['e|e'|e]
+Cape Verde:Praia
 Central Africa{n Rep{ublic}}:Bangui
-Chad:Ndjamena
-Congo:Brazzaville
-Dahomey:Porto Novo
+Chad:N'Djamena|Ndjamena
+Comoros:Moroni
+Djibouti:Djibouti
+Egypt:Cairo
+Equatorial Guinea:Malabo
+Eritrea:Asmara
 Ethiopia:Addis Ababa
 Gabon:Libreville
 Ghana:Accra
 Guinea-Bissau:Bissau
 Guinea:Conakry
-Ivory Coast:Abidjan
 Kenya:Nairobi
 Lesotho:Maseru
 Liberia:Monrovia
-Libya:Al Bayda{'}
-Malagasy{ Rep{ublic}}|Madagascar:Tananarive
-Malawi:Zomba
+Libya:Tripoli
+Malagasy{ Rep{ublic}}|Madagascar:Antananarivo
+Malawi:Lilongwe
 Mali:Bamako
 Mauritania:Nouakchott
+Mauritius:Port Louis
+Mayotte:Mamoudzou
+Mo[z|,c|c,|c]ambique:Maputo
 Morocco:Rabat
-Mo[z|,c|c,|c]ambique:Louren[,c|c,|c]o Marques
+Namibia:Windhoek
 Niger:Niamey
-Nigeria:Lagos
-Rhodesia:Salisbury
+Nigeria:Abuja
+R['e|e'|e]union:Saint-Denis
+Rep. Congo:Brazzaville
 Rwanda:Kigali
+S[~a|a~|a]o Tom['e|e'|e] and Pr['i|i'|i]ncipe:S[~a|a~|a]o Tom['e|e'|e]
+Saint Helena:Jamestown
 Senegal:Dakar
+Seychelles:Victoria
 Sierra Leone:Freetown
-Somali{ Rep{ublic}}:Mogadis[cio|hu]
+Somalia:Mogadishu
 Sudan:Khartoum
 Swaziland:Mbabane
-Tanzania:Dar es Salaam
+Tanzania:Dodoma
 Togo:Lom['e|e'|e]
 Tunisia:Tunis
 Uganda:Kampala
-United Arab Rep{ublic}|Egypt:Cairo
-Upper Volta:Ouagadougou
 Zambia:Lusaka
-Za["i|i"|i]re:Kinshasha
+Zimbabwe:Harare
+{DR |Democratic Republic of the }Congo:Kinshasa
 {Rep{ublic} of }South Africa:Pretoria
-{The }Gambia:Bathurst
+{The }Gambia:Banjul|Bathurst
--- a/games/quiz/datfiles/america
+++ b/games/quiz/datfiles/america
@@ -1,27 +1,54 @@
+Anguilla:The Valley
+Antigua and Barbuda:St. John's
 Argentina:Buenos Aires
-Bahamas:Nassau
+Aruba:Oranjestad
 Barbados:Bridgetown
+Belize:Belmopan
+Bermuda:Hamilton
 Bolivia:La Paz|Sucre
-Bra[z|s]il:Brasilia
+Bra[z|s]il:Bras['i|i'|i]lia
+British Virgin Islands:Road Town
 Canada:Ottawa
+Cayman Islands:George Town
 Chile:Santiago
 Colombia:Bogot['a|a'|a]
-Costa Rica:San Jose
+Costa Rica:San Jos['e|e'|e]
 Cuba:Ha[v|b]ana
+Dominica:Roseau
 Dominican Republic:Santo Domingo
 Ecuador:Quito
 El Salvador:San Salvador
-Guatemala:Guatemala
+Falkland Islands:Stanley
+French Guiana:Cayenne
+Greenland:Nuuk
+Grenada:St. George's
+Guadeloupe:Basse-Terre
+Guatemala:Guatemala City
 Guyana:Georgetown
-Haiti:Port au Prince
+Haiti:Port[-| ]au[-| ]Prince
 Honduras:Tegucigalpa
 Jamaica:Kingston
-Mexico:Mexico
+Martinique:Fort-de-France
+Mexico:Mexico City
+Montserrat:Plymouth|Brades
+Netherlands Antilles:Willemstad
 Nicaragua:Managua
-Panama:Panama
+Panama:Panama City
 Paraguay:Asunci['o|o'|o]n
 Peru:Lima
-Trinidad[ and Tobago|]:Port of Spain
-United States|US{A}:Washington
+Puerto Rico:San Juan
+SGSSI|South Georgia and the South Sandwich Islands:Grytviken|King Edward Point
+Saint Barth['e|e'|e]lemy:Gustavia
+Saint Kitts and Nevis:Basseterre
+Saint Lucia:Castries
+Saint Martin:Marigot
+Saint Pierre and Miquelon:Saint-Pierre
+Saint Vincent and the Grenadines:Kingstown
+Suriname:Paramaribo
+Trinidad{ and Tobago}:Port of Spain
+Turks and Caicos Islands:Cockburn Town
+United States Virgin Islands:Charlotte Amalie
+United States|US{A}:Washington{ DC}
 Uruguay:Montevideo
 Venezuela:Caracas
+{The }Bahamas:Nassau
--- a/games/quiz/datfiles/asia
+++ b/games/quiz/datfiles/asia
@@ -1,12 +1,16 @@
 Afghanistan:Kabul
+Armenia:Yerevan
 Australia:Canberra
-Bahrein:Manama
-Bangladesh:Dacca
-Bhutan:Thimbu
-Burma:Rangoon
-Cambodia|Khmer:P{h}nom Penh
-China:Peking
+Azerbaijan:Baku
+Bahr[a|e]in:Manama
+Bangladesh:Dhaka
+Bhutan:Thimphu
+Burma:Naypyidaw
+Cambodia:Phnom Penh
 Cyprus:Nicosia
+East Timor:Dili
+Egypt:Cairo
+Georgia:Tbilisi
 India:New Delhi
 Indonesia:Jakarta|Djakarta
 Iran:Tehran
@@ -14,28 +18,34 @@
 Israel:Jerusalem
 Japan:Tokyo
 Jordan:Amman
-Kuwait:Al-kuwait
+Kazakhstan:Astana
+Kuwait:Kuwait City
+Kyrgyzstan:Bishkek
 Laos:Vientiane
 Lebanon:Beirut
 Malaysia:Kuala Lumpur
-Maldive Islands:Male
+Maldives:Mal['e|e'|e]
 Mongolia:Ulan Bator
-Nepal:Katmandu
+Nepal:Kathmandu
 North Korea:P{'}yongyang
-North Yemen:San{'}a
 Oman:Muscat
 Pakistan:Islamabad
-Papua[-| ]New Guinea:Port Moresby
+Papua New Guinea:Port Moresby
 Philippines:Manila
 Qatar:Doha
-Saudi Arabia:Riyadh|J{ei}ddah
+Russia:Moscow
+Saudi Arabia:Riyadh
 Singapore:Singapore
 South Korea:Seoul
-South Yemen:Aden
-Sri Lanka:Colombo
+Sri Lanka:Kotte
 Syria:Damascus
 Taiwan:Taipei
+Tajikistan:Dushanbe
 Thailand:Bangkok
 Turkey:Ankara
-United Arab Emirates:Abu Dhabi
+Turkmenistan:Ashgabat
+United Arab Emirates|UAE:Abu Dhabi
+Uzbekistan:Tashkent
 Vietnam:Hanoi
+{Republic of }Yemen:Sana'a
+{{People's }Republic of }China:Beijing|Peking
--- a/games/quiz/datfiles/europe
+++ b/games/quiz/datfiles/europe
@@ -1,44 +1,60 @@
-Albania:Tirana|Tirane"
+Abkhazia:Sukhumi
+Albania:Tirana
 Andorra:Andorra la V[ell|iej]a
+Armenia:Yerevan
 Austria:Vienna|Wien
-Belarus|Byelorussia:M[i|e]nsk
-Belgium:Brussel[s|]|Bruxelles
-Bosnia[-Herzegovina|]:Sarajevo
-Bulgaria:Sofi[a|ya]
+Azerbaijan:Baku
+Belarus:Minsk
+Belgium:Brussel{s}|Bruxelles
+Bosnia and Herzegovina:Sarajevo
+Bulgaria:Sofia
 Croatia:Zagreb
+Cyprus:Nicosia
 Czech Republic:Prague|Praha
-Denmark:Copenhagen|K[o|o/]benhavn
-United Kingdom|England|Great Britain|UK:London
+Denmark:Copenhagen|K[o|o/|/o]benhavn
 Estonia:Tallinn
+Faroe Islands:T['o|o'|o]rshavn
 Finland:Helsinki
 France:Paris
 Georgia:Tbilisi
 Germany:Berlin
+Gibraltar:Gibraltar
 Greece:Athens
+Guernsey:Saint Peter Port
 Hungary:Budapest
-Iceland:Reykjavik
+Iceland:Reykjav['i|i'|i]k
 Ireland|Eire:Dublin
+Isle of Man:Douglas
 Italy:Rom[e|a]
+Jersey:Saint Helier
+Kazakhstan:Astana
+Kosovo:Pristina
 Latvia:Riga
 Liechtenstein:Vaduz
 Lithuania:Vilnius
 Luxembourg:Luxembourg
-[|Former Yugoslav Republic Of ]Macedonia:Skop[|l]je
+Macedonia:Skopje
 Malta:Valletta
-Moldova:Chisinau|Kishinev
+Moldova:Chi[,s|s,|s]inau|Kishinev
 Monaco:Monaco
-Netherlands|Holland:Amsterdam
+Montenegro:Podgorica
+Netherlands:Amsterdam
 Norway:Oslo
 Poland:Wars[aw|zawa]
 Portugal:Lisbo[n|a]
-R[u|o]mania:Bucharest|Bucuresti
+Romania:Bucharest
 Russia:Mos[cow|kva]
 San Marino:San Marino
-Serbia and Montenegro:Belgrade|Beograd
-Slovakia|Slovak Republic:Bratislava
+Serbia:Belgrade
+Slovakia:Bratislava
 Slovenia:Ljubljana
+South Ossetia:Tskhinvali
 Spain:Madrid
+Svalbard:Longyearbyen
 Sweden:Stockholm
 Switzerland:Bern{e}
 Turkey:Ankara
 Ukraine:Kiev|Kyiv
+United Kingdom|England|Great Britain|UK:London
+Vatican City:Vatican City
+[°A|A°|A]land Islands:Mariehamn
--- a/games/quiz/datfiles/pres
+++ b/games/quiz/datfiles/pres
@@ -79,5 +79,7 @@
 {J{ames} }{D{anforth|an} }Quayle:{W{illiam|m} }{J{efferson} }Clinton
 {W{illiam|m} }{J{efferson} }Clinton:1993-2001:\
 {A{lbert} }{A{rnold} }Gore{{,} J{unio}r}:{G{eorge} }{W{alker} }Bush{{,} J{unio}r}
-{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-:\
-{R{ichard} }{B{ruce} }Cheney:
+{G{eorge} }{W{alker} }Bush{{,} J{unio}r}:2001-{{20}0}9:\
+{R{ichard} }{B{ruce} }Cheney:{B{arack} }{H{ussein} }Obama{ II}
+{B{arack} }{H{ussein} }Obama{ II}:2009-:\
+{J{oe{seph}} }{R{obinette} }{Biden}{{,} J{unio}r}:

>Release-Note:

>Audit-Trail:
From: Dafydd Crosby <dtcrsby@gmail.com>
To: gnats-bugs@netbsd.org
Cc: 
Subject: Re: bin/42576
Date: Wed, 9 Jun 2010 08:39:36 -0600

 I have an additional patch that cleans up the answers in the trek datfile:

 --- trek.orig	2010-06-08 23:32:54.677404306 -0600
 +++ trek	2010-06-08 23:40:13.045294183 -0600
 @@ -1,19 +1,19 @@
 -captain's name:{James |Jim }{T. }Kirk|{james |jim }{t. }kirk
 -first officers name:Spock|spock|Mr. Spock|mr. spock
 -name of ship:{the }{u.s.s. }enterprise|Enterprise
 -name of the "good guys":{the }Federation|federation|{the }federation
 +captain's name:{James |Jim }{T. }Kirk
 +first officers name:{Mr. }Spock
 +name of ship:{The }{U.S.S. }Enterprise
 +name of the "good guys":{The }Federation
  name of the "bad guys":{the }klingons|{the }romulans
 -nickname of chief engineer:scotty|Scotty
 -nickname of chief medical officer:bones|Bones
 +nickname of chief engineer:Scotty
 +nickname of chief medical officer:Bones
  machine used for transportation to surface of nearby
 planet:transporter|shuttlecraft
 -main engines of ship:warp engines|warp
 +main engines of ship:warp{ engines}
  number of crew:400|four hundred
  hand-held weapon:phaser
 -type of torpedoes used on the ship:photon torpedoes|photon
 -name of electronic protective device on ship:shields|shield
 -name of device that makes a ship invisible:cloaking device|cloak|cloaking
 +type of torpedoes used on the ship:photon{ torpedoes}
 +name of electronic protective device on ship:shield{s}
 +name of device that makes a ship invisible:cloak{ing}{ device}
  type of voice that the on-board computer has:female|feminine|woman's
 -where first officer comes from:vulcan|Vulcan
 -rare, but very powerful enemies:romulans|Romulans
 -reaction that main engines operate on:matter-antimatter{
 reaction}|matter/antimatter{ reaction}
 -slow engines used in emergencies:impulse engines|impulse
 +where first officer comes from:Vulcan
 +rare, but very powerful enemies:Romulans
 +reaction that main engines operate on:matter{-|/}antimatter{ reaction}
 +slow engines used in emergencies:impulse{ engines}

Responsible-Changed-From-To: bin-bug-people->pgoyette
Responsible-Changed-By: pgoyette@NetBSD.org
Responsible-Changed-When: Tue, 28 Jun 2016 00:18:01 +0000
Responsible-Changed-Why:
I handled it.


State-Changed-From-To: open->closed
State-Changed-By: pgoyette@NetBSD.org
State-Changed-When: Tue, 28 Jun 2016 00:18:01 +0000
State-Changed-Why:
Changes (mostly) incorporated, with some editting.


From: "Paul Goyette" <pgoyette@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/42576 CVS commit: src/games/quiz/datfiles
Date: Tue, 28 Jun 2016 00:15:40 +0000

 Module Name:	src
 Committed By:	pgoyette
 Date:		Tue Jun 28 00:15:40 UTC 2016

 Modified Files:
 	src/games/quiz/datfiles: africa america asia europe pres

 Log Message:
 Merge updates from PR bin/42576

 XXX Any typos are mine, not those of the PR submitter!


 To generate a diff of this commit:
 cvs rdiff -u -r1.3 -r1.4 src/games/quiz/datfiles/africa
 cvs rdiff -u -r1.1 -r1.2 src/games/quiz/datfiles/america
 cvs rdiff -u -r1.4 -r1.5 src/games/quiz/datfiles/asia
 cvs rdiff -u -r1.6 -r1.7 src/games/quiz/datfiles/europe
 cvs rdiff -u -r1.5 -r1.6 src/games/quiz/datfiles/pres

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

Home	PR Database Search