[Freeciv-Dev] (PR#2547) Fix for the Barsoom patch...

["esr@xxxxxxxxxxx via RT" <rt@xxxxxxxxxxxxxx>]

So, now I know how to integrity-check a data file set...

That 16-leader limit ought to be fixed.
-- 
                <a href="http://www.tuxedo.org/~esr/";>Eric S. Raymond</a>

Diffs between last version checked in and current workfile(s):

--- data/nation/american.ruleset        2002/12/11 13:25:18     1.2
+++ data/nation/american.ruleset        2002/12/11 13:55:14
@@ -6,54 +6,48 @@
        "John Adams",
        "Thomas Jefferson", 
        "James Madison",
-       "James Monroe",
-       "John Quincy Adams",
+       ;"James Monroe",
+       ;"John Quincy Adams",
        "Andrew Jackson",
-       "Martin Van Buren",
-       "William Henry Harrison",
-       "John Tyler",
-       "James Polk",
-       "Zachary Taylor",
-       "Millard Filmore",
-       "Franklin Pierce",
-       "James Buchanan",
+       ;"Martin Van Buren",
+       ;"William Henry Harrison",
+       ;"John Tyler",
+       ;"James Polk",
+       ;"Zachary Taylor",
+       ;"Millard Filmore",
+       ;"Franklin Pierce",
+       ;"James Buchanan",
        "Abraham Lincoln",
-       "Andew Johnson", 
+       ;"Andew Johnson", 
        "Ulysses S. Grant",
-       "Rutherford Hayes",
-       "James Garfield",
-       "Chester Alan Arthur",
-       "Grover Cleveland",
-       "Benjamin Harrison",
-       "William McKinley",
+       ;"Rutherford Hayes",
+       ;"James Garfield",
+       ;"Chester Alan Arthur",
+       ;"Grover Cleveland",
+       ;"Benjamin Harrison",
+       ;"William McKinley",
        "Theodore Roosevelt",
-       "William Howard Taft",
-       "Woodrow Wilson",
-       "Warren Harding",
-       "Calvin Coolidge",
-       "Herbert Hoover",
+       ;"William Howard Taft",
+       ;"Woodrow Wilson",
+       ;"Warren Harding",
+       ;"Calvin Coolidge",
+       ;"Herbert Hoover",
        "Franklin D. Roosevelt",
        "Harry S. Truman",
-       "Dwight Eisenhower",
+       ;"Dwight Eisenhower",
        "John F. Kennedy", 
        "Lyndon Johnson",
        "Richard Nixon",
-       "Gerald W. Ford",
-       "Jimmy Carter",
+       ;"Gerald W. Ford",
+       ;"Jimmy Carter",
        "Ronald Reagan",
        "George H. W. Bush",
-       "Bill Clinton",
-       "George W. Bush",
+       ;"Bill Clinton",
+       ;"George W. Bush",
        "Eleanor Roosevelt"
 leader_sex="Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 
-           "Male", "Male", "Male", "Male", "Male", 
-           "Male", "Male", "Male", "Male", "Male", 
-           "Male", "Male", "Male", "Male", "Male", 
-           "Male", "Male", "Male", "Male", "Male", 
-           "Male", "Male", "Male", "Male", "Male", 
-           "Male", "Male", "Male",
            "Female"
 flag="f.usa"
 flag_alt = "-"
--- data/nation/babylonian.ruleset      2002/12/11 13:25:18     1.2
+++ data/nation/babylonian.ruleset      2002/12/11 13:43:15
@@ -2,7 +2,7 @@
 
 name=_("Babylonian")
 plural=_("?plural:Babylonians")
-leader="Hammurabi", "Sargon", "Nebuchadnezzar", "Tiglath-Pileser",
+leader="Hammurabi", "Sargon", "Nebuchadnezzar", "Tiglath-Pileser"
 leader_sex="Male", "Male", "Male", "Male"
 flag = "f.iraq_old"
 flag_alt = "-"
--- data/nation/barbarian.ruleset       2002/12/11 13:25:18     1.2
+++ data/nation/barbarian.ruleset       2002/12/11 13:48:39
@@ -2,7 +2,7 @@
 
 name=_("Barbarian")
 plural=_("?plural:Barbarians")
-leader="Genseric", "Alaric", "Theodoric", "Stilicho", "Attila",
+leader="Genseric", "Alaric", "Theodoric", "Stilicho", "Attila"
 leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="f.barbarian"
 flag_alt = "-"
--- data/nation/barsoom.ruleset 2002/12/11 13:25:18     1.2
+++ data/nation/barsoom.ruleset 2002/12/11 13:47:20
@@ -7,7 +7,7 @@
 plural=_("?plural:Barsoomians")
 leader="John Carter", "Tars Tarkas", "Carthoris", "Vad Varo", 
         "Tardos Mor", "Mors Kajak",  "Gahan", "Kar Komak",
-        "Dejah Thoris" "Llana", "Tara", "Thuvia"
+        "Dejah Thoris", "Llana", "Tara", "Thuvia"
 leader_sex="Male", "Male", "Male", "Male",
            "Male", "Male", "Male", "Male",
            "Female", "Female", "Female", "Female"
--- data/nation/french.ruleset  2002/12/11 13:25:18     1.2
+++ data/nation/french.ruleset  2002/12/11 13:55:42
@@ -4,7 +4,7 @@
 plural=_("?plural:French")
 leader="Napoleon", "Charlemagne", "Louis XIV", "Charles de Gaulle",
        "Vercingetorix", "Chlodwig", "Charles Martel"
-leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male"
+leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male"
 flag="f.france"
 flag_alt = "-"
 city_style = "European"
--- data/nation/greek.ruleset   2002/12/11 13:25:18     1.2
+++ data/nation/greek.ruleset   2002/12/11 13:44:45
@@ -2,7 +2,7 @@
 
 name=_("Greek")
 plural=_("?plural:Greeks")
-leader="Alexander", "Perikles", "Leonidas", "Solon",
+leader="Alexander", "Perikles", "Leonidas", "Solon"
 leader_sex="Male", "Male", "Male", "Male"
 flag="f.greece"
 flag_alt = "-"
--- data/nation/roman.ruleset   2002/12/11 13:25:18     1.2
+++ data/nation/roman.ruleset   2002/12/11 13:41:22
@@ -3,7 +3,7 @@
 name=_("Roman")
 plural=_("?plural:Romans")
 leader="Caesar", "Augustus", "Vespasian", "Nero", "Trajan", "Marcus Aurelius",
-       "Tiberius", "Constantine"
+       "Tiberius", "Constantine",
        "Livia", "Messalina"
 leader_sex="Male", "Male", "Male", "Male", "Male", "Male", "Male", "Male",
            "Female", "Female"
--- data/nation/zulu.ruleset    2002/12/11 13:25:18     1.2
+++ data/nation/zulu.ruleset    2002/12/11 13:45:58
@@ -9,7 +9,7 @@
 leader="Utshaka", "Umdhlani", "Umalandela", "Untombela", "Uzulu", 
        "Unkosinkulu", "Umageba",  "Upunga", "Undaba", "Ujama", 
        "Usenzangakona", "Udingana", "Umpande", "Ucetywayo", "Udinuzulu", 
-       "Usolomona",
+       "Usolomona"
 leader_sex="Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 
            "Male", "Male", "Male", "Male", "Male", 

End of diffs.