Add more email fixesHEADmaster

1 files changed, 33 insertions, 0 deletions

diff --git a/fix-emails b/fix-emails
index 2c73b53..5f9df3a 100755
--- a/fix-emails
+++ b/fix-emails
@@ -13,6 +13,7 @@ cat | sed \
  -e 's/@\./@/g' \
  -e 's/\([^ ]\)</\1 </g' \
  -e 's/com$/com>/g' \
+ -e 's/org$/orig>/g' \
  -e 's/idr@freedesktop.org/ian.d.romanick@intel.com/g' \
  -e 's/idr@lists.freedesktop.org/ian.d.romanick@intel.com/g' \
  -e 's/idr@us.ibm.com/ian.d.romanick@intel.com/g' \
@@ -22,6 +23,8 @@ cat | sed \
  -e 's/Ian Romanic /Ian Romanick /g' \
  -e 's/Ian Romainck/Ian Romanick/g' \
  -e 's/Ian Roamnick/Ian Romanick/g' \
+ -e 's/Ian RomanicK/Ian Romanick/g' \
+ -e 's/Matt Turer/Matt Turner/g' \
  -e 's/Matt Tuner/Matt Turner/g' \
  -e 's/matts88/mattst88/g' \
  -e 's/abdiel.janulgue@intel.com/abdiel.janulgue@linux.intel.com/g' \
@@ -30,8 +33,10 @@ cat | sed \
  -e 's/Ken Graunke/Kenneth Graunke/g' \
  -e 's/Kenneth Grunke/Kenneth Graunke/g' \
  -e 's/Kenneth Gruanke/Kenneth Graunke/g' \
+ -e 's/Kenneth Garunke/Kenneth Graunke/g' \
  -e 's/kenneth@whiteacpe.org/kenneth@whitecape.org/g' \
  -e 's/kenneth@Whitecape.org/kenneth@whitecape.org/g' \
+ -e 's/kenneth@whitecape.orig/kenneth@whitecape.org/g' \
  -e 's/Marek Ol????k/Marek Olšák/g' \
  -e 's/Marek Ol ák/Marek Olšák/g' \
  -e 's/maraeo@gmail.com/marek.olsak@amd.com/g' \
@@ -46,6 +51,7 @@ cat | sed \
  -e 's/chad.versace@intel.com/chad.versace@linux.intel.com/g' \
  -e 's/Chad Verace/Chad Versace/g' \
  -e 's/Chad Versace chad.versace@linux.intel.com/chad.versace@linux.intel.com/g' \
+ -e 's/ chad.versace@linux.intel.com>/<chad.versace@linux.intel.com>/g' \
  -e 's/Dylan Baken/Dylan Baker/g' \
  -e 's/<eric@anholt.net$/<eric@anholt.net>/g' \
  -e 's/aholt.net/anholt.net/g' \
@@ -81,9 +87,36 @@ cat | sed \
  -e 's/Jason Ekstarnd/Jason Ekstrand/g' \
  -e 's/jason@jlekstrand.net/jason.ekstrand@intel.com/g' \
  -e 's/jason.ekstrand@iastate.edu/jason.ekstrand@intel.com/g' \
+ -e 's/jasoan.ekstrand@intel.com/jason.ekstrand@intel.com/g' \
  -e 's/cwabbott02gmail.com/cwabbott0@gmail.com/g' \
  -e 's/cwabott0@gmail.com/cwabbott0@gmail.com/g' \
  -e 's/Connor Abbot /Connor Abbott /g' \
  -e 's/Axel davy/Axel Davy/g' \
  -e 's/David Heidelberger <d.okias@gmail.com>/David Heidelberg <david@ixit.cz>/g' \
+ -e 's/nobled <nobled@dreamwidth.org>/Dylan Noblesmith <nobled@dreamwidth.org>/g' \
+ -e 's/<krh@sasori.boston.redhat.com>/<krh@bitplanet.net>/g' \
+ -e 's/<krh@hinata.localdomain>/<krh@bitplanet.net>/g' \
+ -e 's/<krh@madara.(none)>/<krh@bitplanet.net>/g' \
+ -e 's/<krh@localhost.localdomain>/<krh@bitplanet.net>/g' \
+ -e 's/<jesse.barnes@intel.com>/<jbarnes@virtuousgeek.org>/g' \
+ -e 's/<conselvan2@gmail.com>/<ander.conselvan.de.oliveira@intel.com>/g' \
+ -e 's/<bryce@canonical.com>/<bryce@osg.samsung.com>/g' \
+ -e 's/Bryce W. Harrington <b.harrington@samsung.com>/Bryce Harrington <bryce@osg.samsung.com>/g' \
+ -e 's/<daniels@collabora.com>/<daniel@fooishbar.org>/g' \
+ -e 's/Darxus@chaosreigns.com <Darxus@chaosreigns.com>/Darxus <darxus@chaosreigns.com>/g' \
+ -e 's/<Darxus@chaosreigns.com>/<darxus@chaosreigns.com>/g' \
+ -e 's/Marek Ch <mchqwerty@gmail.com>/Marek Chalupa <mchqwerty@gmail.com>/g' \
+ -e 's/Mathias Fiedler <Mathias.Fiedler@xse.de>/Mathias Fiedler <mathias.fiedler@xse.de>/g' \
+ -e 's/Olivier Blin <olivier.blin@softathome.com>/Olivier Blin <dev@blino.org>/g' \
+ -e 's/Pekka Paalanen <pekka.paalanen@collabora.co.uk>/Pekka Paalanen <ppaalanen@gmail.com>/g' \
+ -e 's/Tiago Vignatti <tiago.vignatti@nokia.com>/Tiago Vignatti <tiago.vignatti@intel.com>/g' \
+ -e 's/Emli Velikov/Emil Velikov/g' \
+ -e 's/eml.velikov@collabora.com/emil.velikov@collabora.com/g' \
+ -e 's/emil.velikov@collabore.com/emil.velikov@collabora.com/g' \
+ -e 's/Bas Nieuwenhuizen/Bas Nieuwenhuizen/g' \
+ -e 's/Bas Nieuwenhuizen$/Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>/g' \
+ -e 's/<bas@basnieuwenhuizen>/<bas@basnieuwenhuizen.nl>/g' \
+ -e 's/<bas@basnieuwenhuien.nl>/<bas@basnieuwenhuizen.nl>/g' \
+ -e 's/Dave Airlied/Dave Airlie/g' \
+ -e 's/ailried@redhat.com/airlied@redhat.com/g' \
  -e 's/^\s*//g'