[Freeciv-Dev] (PR#10206) Copyright, patents and fictional nations

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=10206 >

The only trademarked name we know of is Frodo.  This patch removes it.

jason

Index: data/nation/hobbits.ruleset
===================================================================
RCS file: /home/freeciv/CVS/freeciv/data/nation/hobbits.ruleset,v
retrieving revision 1.1
diff -u -r1.1 hobbits.ruleset
--- data/nation/hobbits.ruleset 17 Sep 2004 05:32:41 -0000      1.1
+++ data/nation/hobbits.ruleset 25 Nov 2004 05:24:10 -0000
@@ -3,9 +3,13 @@
 name=_("Hobbit")
 plural=_("?plural:Hobbits")
 class=_("Fictional")
-; These are pretty arbitrary.  Peregrin was Thain of Tookland; others were
-; mayor of hobbiton; Frodo was never a leader of hobbits
-leader="Will Whitfoot", "Frodo Baggins", "Samwise", "Tolman Cotton", "Peregrin"
+; These are pretty arbitrary.  Peregrin was Thain of Tookland;
+; Meriadoc was Master of Brandybuck; others were mayor of hobbiton.
+;
+; Frodo was never a leader of hobbits and is a trademarked name, so we don't
+; use it.
+leader="Will Whitfoot", "Samwise Gamgee", "Tolman Cotton",
+       "Peregrin Took", "Meriadoc Brandybuck"
 leader_sex="Male", "Male", "Male", "Male", "Male"
 flag="f.hobbits"
 flag_alt = "-"