summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2004-03-13 02:57:03 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2004-03-13 02:57:03 +0000
commitdfccf14eb251d1d3bacd3b359365ac8bf5689ecf (patch)
treea11c5191cbf6e25beadfff2e11fc539a57ab8d5c
parent44f8737a9580e6267e84819634963abb8cd93129 (diff)
downloaddrakx-dfccf14eb251d1d3bacd3b359365ac8bf5689ecf.tar
drakx-dfccf14eb251d1d3bacd3b359365ac8bf5689ecf.tar.gz
drakx-dfccf14eb251d1d3bacd3b359365ac8bf5689ecf.tar.bz2
drakx-dfccf14eb251d1d3bacd3b359365ac8bf5689ecf.tar.xz
drakx-dfccf14eb251d1d3bacd3b359365ac8bf5689ecf.zip
Let printerdrake install "scanner-gui" instead of "xsane" when it sets up an HP multi-function device.
"MandrakeSoft" -> "Mandrakesoft", "Mandrake" -> "Mandrakelinux".
-rw-r--r--perl-install/printer/printerdrake.pm22
1 files changed, 11 insertions, 11 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 43aa36246..0eb075250 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -14,9 +14,9 @@ use printer::detect;
use printer::default;
use printer::data;
-my $companyname = "MandrakeSoft";
+my $companyname = "Mandrakesoft";
my $distroname = "Mandrakelinux";
-my $shortdistroname = "Mandrake";
+my $shortdistroname = "Mandrakelinux";
my $domainname = "mandrakesoft.com";
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 uncompresing 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.
@@ -1933,13 +1933,13 @@ sub setup_common {
$makemodel !~ /HP\s+(DeskJet|dj)\s*450/i) {
# Install SANE
if (!$::testing &&
- !files_exist(qw(/usr/bin/scanimage
- /usr/bin/xscanimage
- /usr/bin/xsane
- /etc/sane.d/dll.conf
- /usr/lib/libsane-hpoj.so.1),
- if_(files_exist('/usr/bin/gimp'),
- '/usr/bin/xsane-gimp'))) {
+ (!files_exist(qw(/usr/bin/scanimage
+ /usr/bin/xscanimage
+ /etc/sane.d/dll.conf
+ /usr/lib/libsane-hpoj.so.1)) ||
+ (!files_exist(qw(/usr/bin/xsane)) &&
+ !files_exist(qw(/usr/bin/kooka)) &&
+ !$in->do_pkgs->is_installed('scanner-gui')))) {
undef $w;
$w = $in->wait_message
(N("Printerdrake"),
@@ -1947,8 +1947,8 @@ sub setup_common {
if !$printer->{noninteractive};
$in->do_pkgs->install('sane-backends',
'sane-frontends',
- 'xsane', 'libsane-hpoj1',
- if_($in->do_pkgs->is_installed('gimp'), 'xsane-gimp'))
+ 'scanner-gui',
+ 'libsane-hpoj1')
or do {
$in->ask_warn(N("Warning"),
N("Could not install the %s packages!",