summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-09-16 11:00:37 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-09-16 11:00:37 +0000
commit900170e99254ba7b04dbe69af0e57ce85b64a2c1 (patch)
tree89f1c44b6180b28dcda2e0b80b35c992cb5556cf
parentfe41ddb258414337d043f16b00e77892b9d72393 (diff)
downloaddrakx-900170e99254ba7b04dbe69af0e57ce85b64a2c1.tar
drakx-900170e99254ba7b04dbe69af0e57ce85b64a2c1.tar.gz
drakx-900170e99254ba7b04dbe69af0e57ce85b64a2c1.tar.bz2
drakx-900170e99254ba7b04dbe69af0e57ce85b64a2c1.tar.xz
drakx-900170e99254ba7b04dbe69af0e57ce85b64a2c1.zip
- Adapted file names to check for to the changes on the HPIJ 0.91-8mdk
packages.
-rw-r--r--perl-install/printer/printerdrake.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 0bb61b0e5..b9834f1c6 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -2540,7 +2540,7 @@ sub setup_common {
(!files_exist("/usr/bin/scanimage",
"/usr/bin/xscanimage",
"/etc/sane.d/dll.conf",
- "/usr/$lib/libsane-hpaio.so.1") ||
+ "/usr/$lib/sane/libsane-hpaio.so.1") ||
(!files_exist(qw(/usr/bin/xsane)) &&
!files_exist(qw(/usr/bin/kooka)) &&
($::isInstall ||
@@ -2649,11 +2649,11 @@ sub setup_common {
$makemodel !~ /HP\s+LaserJet\s+2200/i &&
$makemodel !~ /HP\s+(DeskJet|dj)\s*450/i) {
# Install SANE
- if (!$::testing &&
+ if (!$::testing &&
(!files_exist("/usr/bin/scanimage",
"/usr/bin/xscanimage",
"/etc/sane.d/dll.conf",
- "/usr/$lib/libsane-hpoj.so.1") ||
+ "/usr/$lib/sane/libsane-hpoj.so.1") ||
(!files_exist(qw(/usr/bin/xsane)) &&
!files_exist(qw(/usr/bin/kooka)) &&
($::isInstall ||