- s/mandrake/mandriva/

5 files changed, 25 insertions, 19 deletions

diff --git a/Distribconf.pm b/Distribconf.pm
index e832113..56fee3e 100644
--- a/Distribconf.pm
+++ b/Distribconf.pm
@@ -1,4 +1,4 @@
-##- Nanar <nanardon@mandrake.org>
+##- Nanar <nanardon@mandriva.org>
 ##-
 ##- This program is free software; you can redistribute it and/or modify
 ##- it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ package Distribconf;
 
 =head1 NAME
 
-Distribconf - perl module to get config from a mandrakelinux distribution tree
+Distribconf - perl module to get config from a Mandriva Linux distribution tree
 
 =head1 SYNOPSIS
 
@@ -37,7 +37,7 @@ Distribconf - perl module to get config from a mandrakelinux distribution tree
 =head1 DESCRIPTION
 
 Distribconf is a little module to get/write the configuration of a
-mandrakelinux distribution tree.
+Mandriva Linux distribution tree.
 
 The goal is to manage both configuration of old-style trees
 (C<Mandrake/base/> ie 10.0 and older) and of new-style ones
@@ -297,7 +297,7 @@ sub parse_version {
     open(my $h_ver, "<", $fversion) or return 0;
     my $l = <$h_ver>;
     chomp($l);
-    my ($version, $branch, $product, $arch) = $l =~ /^mandrake ?linux\s+(\w+)\s+([^- ]*)-([^- ]*)-([^- ]*)/i;
+    my ($version, $branch, $product, $arch) = $l =~ /^(?:mandrake|mandriva) ?linux\s+(\w+)\s+([^- ]*)-([^- ]*)-([^- ]*)/i;
     $distrib->{cfg}->newval('media_info', 'version', $version);
     $distrib->{cfg}->newval('media_info', 'branch', $branch);
     $distrib->{cfg}->newval('media_info', 'product', $product);
@@ -408,18 +408,21 @@ __END__
 
 =head1 AUTHOR
 
-The code has been written by Olivier Thauvin <nanardon@mandrake.org>.
+The code has been written by Olivier Thauvin <nanardon@mandriva.org>.
 
-The media.cfg has been improved by Warly <warly@mandrakesoft.com>.
+The media.cfg has been improved by Warly <warly@mandriva.com>.
 
-Special thanks to Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> for
+Special thanks to Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> for
 suggesting to use Config::IniFiles.
 
-Thanks to Sylvie Terjan <erinmargault@mandrake.org> for the spell checking.
+Thanks to Sylvie Terjan <erinmargault@mandriva.org> for the spell checking.
 
 =head1 ChangeLog
 
     $Log$
+    Revision 1.10  2005/09/06 19:46:16  othauvin
+    - s/mandrake/mandriva/
+
     Revision 1.9  2005/03/07 13:45:09  rgarciasuarez
     Doc and POD fixes
 
diff --git a/Distribconf/Build.pm b/Distribconf/Build.pm
index d0c5324..46e1327 100644
--- a/Distribconf/Build.pm
+++ b/Distribconf/Build.pm
@@ -1,4 +1,4 @@
-##- Nanar <nanardon@mandrake.org>
+##- Nanar <nanardon@mandriva.org>
 ##-
 ##- This program is free software; you can redistribute it and/or modify
 ##- it under the terms of the GNU General Public License as published by
@@ -137,7 +137,7 @@ sub write_version {
 
     my @gmt = gmtime(time);
 
-    printf($h_version "Mandrakelinux %s %s-%s-%s%s %s\n",
+    printf($h_version "Mandriva Linux %s %s-%s-%s%s %s\n",
         $distrib->getvalue(undef, 'version') || 'cooker',
         $distrib->getvalue(undef, 'branch') || 'cooker',
         $distrib->getvalue(undef, 'arch') || 'noarch',
@@ -221,18 +221,21 @@ L<Distribconf>
 
 =head1 AUTHOR
 
-The code has been written by Olivier Thauvin <nanardon@mandrake.org>.
+The code has been written by Olivier Thauvin <nanardon@mandriva.org>.
 
-The media.cfg has been improved by Warly <warly@mandrakesoft.com>.
+The media.cfg has been improved by Warly <warly@mandriva.com>.
 
-Special thanks to Rafael Garcia-Suarez <rgarciasuarez@mandrakesoft.com> for
+Special thanks to Rafael Garcia-Suarez <rgarciasuarez@mandriva.com> for
 suggesting to use Config::IniFiles.
 
-Thanks to Sylvie Terjan <erinmargault@mandrake.org> for the spell checking.
+Thanks to Sylvie Terjan <erinmargault@mandriva.org> for the spell checking.
 
 =head1 ChangeLog
 
     $Log$
+    Revision 1.3  2005/09/06 19:46:17  othauvin
+    - s/mandrake/mandriva/
+
     Revision 1.2  2005/05/26 09:32:40  rgarciasuarez
     Fix error messages
 
diff --git a/Packdrakeng.pm b/Packdrakeng.pm
index 6a7e616..8757242 100644
--- a/Packdrakeng.pm
+++ b/Packdrakeng.pm
@@ -1,4 +1,4 @@
-##- Nanar <nanardon@mandrake.org>
+##- Nanar <nanardon@mandriva.org>
 ##-
 ##- This program is free software; you can redistribute it and/or modify
 ##- it under the terms of the GNU General Public License as published by
@@ -888,7 +888,7 @@ Print to $handle (STDOUT if not specified) the table of content of the archive.
 
 =head1 AUTHOR
 
-Olivier Thauvin <nanardon@mandrake.org>
+Olivier Thauvin <nanardon@mandriva.org>
 
 =head1 LICENSE
 
diff --git a/dumpdistribconf b/dumpdistribconf
index 5161e2e..7652adc 100755
--- a/dumpdistribconf
+++ b/dumpdistribconf
@@ -9,7 +9,7 @@ use Distribconf;
 sub usage {
     print STDERR <<EOF
 $0 -h|-m [options] path1 [path2 ...]
-Dump mandrakelinux distrib configuration.
+Dump Mandriva Linux distrib configuration.
 
 -h      output an hdlists file
 -m      output an media.cfg file
diff --git a/packdrake.pm b/packdrake.pm
index c62b805..3461ac8 100644
--- a/packdrake.pm
+++ b/packdrake.pm
@@ -1,4 +1,4 @@
-##- Nanar <nanardon@mandrake.org>
+##- Nanar <nanardon@mandriva.org>
 ##-
 ##- This program is free software; you can redistribute it and/or modify
 ##- it under the terms of the GNU General Public License as published by
@@ -163,7 +163,7 @@ L<Packdrakeng>.
 
 =head1 COPYRIGHT
 
-Copyright (C) 2000-2004 Mandrakesoft <nanardon@mandrake.org>
+Copyright (C) 2000-2004 Mandrakesoft <nanardon@mandriva.org>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by