summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-04-21 15:01:43 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-04-21 15:01:43 +0000
commit2f6d5d1c5e9e80db39b8c331bc8c28e7e75eba48 (patch)
treed4859725ab1c8c5bf3ee536ab41556519fc949f4
parent65263be4a4b3ffa86f31754fb9688794937aeafa (diff)
downloaddrakx-2f6d5d1c5e9e80db39b8c331bc8c28e7e75eba48.tar
drakx-2f6d5d1c5e9e80db39b8c331bc8c28e7e75eba48.tar.gz
drakx-2f6d5d1c5e9e80db39b8c331bc8c28e7e75eba48.tar.bz2
drakx-2f6d5d1c5e9e80db39b8c331bc8c28e7e75eba48.tar.xz
drakx-2f6d5d1c5e9e80db39b8c331bc8c28e7e75eba48.zip
switch from MandrakeSoft to Mandriva in scannerdrake & printerdrake
-rw-r--r--perl-install/printer/printerdrake.pm2
-rwxr-xr-xperl-install/standalone/scannerdrake6
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index f81ecf9ae..9e8d55dc6 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -19,7 +19,7 @@ my $recstr = $printer::main::recstr;
my $precstr = $printer::main::precstr;
my $sprecstr = $printer::main::sprecstr;
-my $shortdistroname = "Mandrakelinux";
+my $shortdistroname = "Mandrivalinux";
my $hp1000fwtext = N("The HP LaserJet 1000 needs its firmware to be uploaded after being turned on. Download the Windows driver package from the HP web site (the firmware on the printer's CD does not work) and extract the firmware file from it by decompressing the self-extracting '.exe' file with the 'unzip' utility and searching for the 'sihp1000.img' file. Copy this file into the '/etc/printer' directory. There it will be found by the automatic uploader script and uploaded whenever the printer is connected and turned on.
");
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 7e6f9a125..be0ec07b2 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -30,9 +30,9 @@ use handle_configs;
use services;
my $companyname = "Mandriva";
-my $distroname = "Mandrakelinux";
-my $shortdistroname = "Mandrakelinux";
-my $domainname = "mandrakesoft.com";
+my $distroname = "Mandrivalinux";
+my $shortdistroname = "Mandrivalinux";
+my $domainname = "mandriva.com";
foreach (@ARGV) {
/^--update-usbtable$/ and do { scanner::updateScannerDBfromUsbtable(); exit() };