fix email addressses

2 files changed, 32 insertions, 32 deletions

diff --git a/tools/cvslog2changelog.pl b/tools/cvslog2changelog.pl
index be8d7872f..cecebe87f 100755
--- a/tools/cvslog2changelog.pl
+++ b/tools/cvslog2changelog.pl
@@ -67,71 +67,71 @@ sub auto_fill {
 BEGIN {
     %users = (
               'abiro'   => 'Arpad Biro  <biro_arpad at yahoo.com>',
-              'adelorbeau' => 'Arnaud de Lorbeau  <adelorbeau at mandrakesoft.com>',
+              'adelorbeau' => 'Arnaud de Lorbeau  <adelorbeau at mandriva.com>',
               'adesmons'  => 'Arnaud Desmons',
-              'aginies' => 'Antoine Ginies  <aginies at mandrakesoft.com> ',
+              'aginies' => 'Antoine Ginies  <aginies at mandriva.com> ',
               'alafox'  => 'Alice Lafox  <alice at lafox.com.ua>',
               'alemaire'  => 'Aurélien Lemaire',
               'alus'    => 'Arkadiusz Lipiec  <alipiec at elka.pw.edu.pl>',
               'amaury'   => 'Amaury Amblard-Ladurantie',
-              'baudens' => 'David Baudens  <baudens at mandrakesoft.com>',
-              'camille' => 'Camille Bégnis  <camille at mandrakesoft.com>',
+              'baudens' => 'David Baudens  <baudens at mandriva.com>',
+              'camille' => 'Camille Bégnis  <camille at mandriva.com>',
               'cbelisle'  => 'Christian Belisle',
               'chmou'    => 'Chmouel Boudjnah',
               'chmouel'  => 'Chmouel Boudjnah',
-              'croy'    => 'Christian Roy  <croy at mandrakesoft.com>',
+              'croy'    => 'Christian Roy  <croy at mandriva.com>',
               'damien'  => 'dam\'s  <dams at idm.fr>',
-              'daouda'  => 'Daouda Lo  <daouda at mandrakesoft.com>',
-              'dchaumette' => 'Damien Chaumette  <dchaumette at mandrakesoft.com>',
+              'daouda'  => 'Daouda Lo  <daouda at mandriva.com>',
+              'dchaumette' => 'Damien Chaumette  <dchaumette at mandriva.com>',
               'dindinx'  => 'David odin',
               'drdrake' => 'Dovix  <dovix2003 at yahoo.com>',
-              'erwan'   => 'Erwan Velu  <erwan at mandrakesoft.com>',
+              'erwan'   => 'Erwan Velu  <erwan at mandriva.com>',
               'fabman'  => 'Fabian Mandelbaum  <fabman at 2vias.com.ar>',
-              'fcrozat' => 'Frederic Crozat  <fcrozat at mandrakesoft.com>',
-              'flepied' => 'Frederic Lepied  <flepied at mandrakesoft.com>',
-              'florin'  => 'Florin Grad  <florin at mandrakesoft.com>',
+              'fcrozat' => 'Frederic Crozat  <fcrozat at mandriva.com>',
+              'flepied' => 'Frederic Lepied  <flepied at mandriva.com>',
+              'florin'  => 'Florin Grad  <florin at mandriva.com>',
               'fpons'    => 'Fançois Pons',
               'fred'     => 'Frederic Bastok',
               'fwang'   => 'Funda Wang <fundawang at linux.net.cn>',
-              'gb'      => 'Gwenole Beauchesne  <gbeauchesne at mandrakesoft.com>',
-              'gbeauchesne' => 'Gwenole Beauchesne  <gbeauchesne at mandrakesoft.com>',
-              'gc'      => 'Guillaume Cottenceau  <gc at mandrakesoft.com>',
+              'gb'      => 'Gwenole Beauchesne  <gbeauchesne at mandriva.com>',
+              'gbeauchesne' => 'Gwenole Beauchesne  <gbeauchesne at mandriva.com>',
+              'gc'      => 'Guillaume Cottenceau  <gc at mandriva.com>',
               'hilbert' => '(Hilbert) <h at mandrake.org>',
-              'install' => 'DrakX  <install at mandrakesoft.com>',
+              'install' => 'DrakX  <install at mandriva.com>',
               'jdanjou'  => 'Julien Danjou',
               'jjorge'  => 'José JORGE <jjorge at free.fr>',
               'jpomerleau'  => 'Joel Pomerleau',
               'keld'    => 'Keld Jørn Simonsen  <keld at dkuug.dk>',
-              'lmontel' => 'Laurent Montel  <lmontel at mandrakesoft.com>',
+              'lmontel' => 'Laurent Montel  <lmontel at mandriva.com>',
               'mscherer' => 'Michael Scherer  <mscherer at mandrake.org>',
-              'nplanel' => 'Nicolas Planel  <nplanel at mandrakesoft.com>',
-              'oblin' => 'Olivier Blin <oblin at mandrakesoft.com>',
+              'nplanel' => 'Nicolas Planel  <nplanel at mandriva.com>',
+              'oblin' => 'Olivier Blin <oblin at mandriva.com>',
               'othauvin' => 'Olivier Thauvin  <thauvin at aerov.jussieu.fr>',
-              'pablo'   => 'Pablo Saratxaga  <pablo at mandrakesoft.com>',
+              'pablo'   => 'Pablo Saratxaga  <pablo at mandriva.com>',
               'peroyvind' => 'Per Øyvind Karlsen <peroyvind at linux-mandrake.com>',
               'phetroy'  => 'Philippe Libat',
               'philippe'  => 'Philippe Libat',
-              'prigaux' => 'Pixel  <pixel at mandrakesoft.com>',
-              'quintela' => 'Juan Quintela  <quintela at mandrakesoft.com>',
+              'prigaux' => 'Pixel  <pixel at mandriva.com>',
+              'quintela' => 'Juan Quintela  <quintela at mandriva.com>',
               'rchaillat'  => 'Renaud Chaillat',
-	      'rdalverny' => 'Romain d\'Alverny  <rdalverny at mandrakesoft.com>',
+	      'rdalverny' => 'Romain d\'Alverny  <rdalverny at mandriva.com>',
 	      'redhog'   => 'RedHog',
               'reinouts' => 'Reinout van Schouwen  <reinout at cs.vu.nl>',
-              'rgarciasuarez' => 'Rafael Garcia-Suarez <rgarciasuarez at mandrakesoft.com>',
+              'rgarciasuarez' => 'Rafael Garcia-Suarez <rgarciasuarez at mandriva.com>',
               'rvojta' => 'Robert Vojta <robert.vojta at mandrake.cz>',
-              'sbenedict' => 'Stew Benedict  <sbenedict at mandrakesoft.com>',
+              'sbenedict' => 'Stew Benedict  <sbenedict at mandriva.com>',
               'sdetilly'  => 'Sylvain de Tilly',
               'siegel'  => 'Stefan Siegel  <siegel at linux-mandrake.com>',
               'tbacklund' => 'Thomas Backlund  <tmb at mandrake.org>',
-              'tkamppeter' => 'Till Kamppeter  <till at mandrakesoft.com>',
+              'tkamppeter' => 'Till Kamppeter  <till at mandriva.com>',
               'tpittich' => 'Tibor Pittich  <Tibor.Pittich at phuture.sk>',
               'tsdgeos ' => 'Albert Astals Cid <astals11 at terra.es>',
-              'tv' => 'Thierry Vignaud  <tvignaud at mandrakesoft.com>',
-              'tvignaud' => 'Thierry Vignaud  <tvignaud at mandrakesoft.com>',
+              'tv' => 'Thierry Vignaud  <tvignaud at mandriva.com>',
+              'tvignaud' => 'Thierry Vignaud  <tvignaud at mandriva.com>',
               'uid524'   => 'Chmouel Boudjnah',
-              'vdanen'  => 'Vincent Danen  <vdanen at mandrakesoft.com>',
-              'vguardiola' => 'Vincent Guardiola <vguardiola at mandrakesoft.com>',
-              'warly'   => 'Warly  <warly at mandrakesoft.com>',
+              'vdanen'  => 'Vincent Danen  <vdanen at mandriva.com>',
+              'vguardiola' => 'Vincent Guardiola <vguardiola at mandriva.com>',
+              'warly'   => 'Warly  <warly at mandriva.com>',
               'yduret'   => 'Yves Duret',
               'yoann'    => 'Yoann Vandoorselaere',
               'yrahal'  => 'Youcef Rabah Rahal <rahal at arabeyes.org>',
diff --git a/tools/mailchangelog.pl b/tools/mailchangelog.pl
index 6e7793eb7..428cdc251 100755
--- a/tools/mailchangelog.pl
+++ b/tools/mailchangelog.pl
@@ -6,9 +6,9 @@ chomp($ver = <STDIN>);
 
 print F 
 q(Subject: [DrakX] DrakX snapshot #), $ver, q( uploaded
-From: DrakX Builder Robot <devel@mandrakesoft.com>
+From: DrakX Builder Robot <devel@mandriva.com>
 To: changelog@linux-mandrake.com
-Reply-To: install@mandrakesoft.com
+Reply-To: install@mandriva.com
 
 );
 print F foreach <STDIN>;