Merge in recent changes
authorgerv@gerv.net
Thu, 31 Jan 2008 04:36:56 -0800
changeset 11101 8e89edc6d4c2f86916ad8fbd17d0e58f366c8685
parent 11100 7e35e15cc9d1980f58af0fde026ab02e744ba966
child 11102 2257db0177c57ce2d7d6249c61aad62a58f5c7c6
push id1
push userbsmedberg@mozilla.com
push dateThu, 20 Mar 2008 16:49:24 +0000
treeherdermozilla-central@61007906a1f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9b3pre
Merge in recent changes
tools/relic/make-id-list
--- a/tools/relic/make-id-list
+++ b/tools/relic/make-id-list
@@ -1,16 +1,21 @@
 #!/usr/bin/perl -w
 #
 # This is a script to take a long list of Initial Developers on stdin and
 # output a de-duped, munged list suitable for putting into about:licence or
 # other similar place in order to comply with the MPL section 3.3
 
 # Equivalence mappings; having these is easier than updating hundreds of files
 # to make them all use the same variant of each name.
+#
+# Procedure:
+# relic -I -f * > names.txt
+# make-id-list < names.txt > final.txt
+
 my %equivalents = (
   "ActiveState Tool Corporation" => "ActiveState Tool Corp",
   "Activestate Tool Corp" => "ActiveState Tool Corp",
   "ActiveState Tool Corp." => "ActiveState Tool Corp",
 
   "Crocodile Clips Ltd." => "Crocodile Clips Ltd",
 
   "Hewlett-Packard Company. Portions created by Hewlett-Packard Company are Copyright" => "Hewlett-Packard Company",
@@ -39,16 +44,17 @@ my %equivalents = (
   "Netscape Corp" => "Netscape Communications Corporation",
   "Netscape Communications" => "Netscape Communications Corporation",
   "Netscape Communications, Inc" => "Netscape Communications Corporation",
   "Netscape Communications Corp" => "Netscape Communications Corporation",
   "Netscape Communications Corp." => "Netscape Communications Corporation",
   "Netscape Commmunications Corp" => "Netscape Communications Corporation",
   "Netscape Communications Corp, Inc" => "Netscape Communications Corporation",
   "Netscape Communication Corporation" => "Netscape Communications Corporation",
+  "Netscape Communications Corporation." => "Netscape Communications Corporation",  
 
   "Novell" => "Novell Inc",
   "Novell, Inc" => "Novell Inc",
   "Novell Corporation" => "Novell Inc",
   
   "Red Hat Software" => "Red Hat Inc",
   "Red Hat" => "Red Hat Inc",
   "Red Hat, Inc" => "Red Hat Inc",
@@ -67,28 +73,43 @@ my %equivalents = (
   "Digital Creations 2" => "Digital Creations 2 Inc",
   "Douglas F. Turner II" => "Doug Turner",
   "Kenneth Herron" => "Ken Herron",
   "sqlite3", "Sqlite Project",
   "University Of Queensland" => "University of Queensland",
   "OEOne Corporation" => "OEone Corporation",
   "Paul Kocher of Cryptography Research" => "Paul Kocher",
   "QUALCOMM incorporated" => "Qualcomm Inc",
+  "QUALCOMM Incorporated" => "Qualcomm Inc",
   "Simdesk Technologies" => "Simdesk Technologies Inc",
   "Google" => "Google Inc",
   "Telephone Corporation)" => "NTT",
-
+  "Disruptive Innovations" => "Disruptive Innovations SARL",
+  "Florian QUEZE" => "Florian Queze",
+  "Nelson B Bolyard" => "Nelson B. Bolyard",
+  "Richard L Walsh" => "Richard L. Walsh",
+  "timeless" => "Josh Soref",
+  "Olivier Parniere BT Global Services / Etat francais Ministere de la Defense" => "Olivier Parniere",
+  
   "Frank Schoenheit" => "Frank Sch&ouml;nheit",
   "Frank Schnheit" => "Frank Sch&ouml;nheit",
   "Håkan Waara" => "H&aring;kan Waara",
   "Hkan Waara" => "H&aring;kan Waara",
   "Karsten Düsterloh" => "Karsten D&uuml;sterloh",
   "Simon Bünzli" => "Simon B&uuml;nzli",
   "Vincent Béron" => "Vincent B&eacute;ron",
-  "Tomas Mller" => "Tomas M&uuml;ller",  
+  "Tomas Mller" => "Tomas M&uuml;ller",
+  "Dão Gottwald" => "D&atilde;o Gottwald",
+  "Lszl Nmeth" => "L&aacute;szl&oacute; N&eacutre;meth",
+  "Bjrn Jacke" => "Bj&ouml;rn Jacke",
+  
+  "example Inc" => "Mozilla Foundation",
+  "SeaMonkey team" => "Mozilla Foundation",
+  "person recorded in the version control logs" => "Mozilla Foundation",
+  "None" => "Mozilla Foundation"
 );
 
 # 'indevs' == "Initial Developers"
 my %indevs;
 
 while (<>)
 {
   chomp;