summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-08-24 19:04:09 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-08-24 19:04:09 +0000
commitae9e0f8fc2ae2bd4ab34914c56e1562637fed3e6 (patch)
tree8f060e7dbbfa64af13b7ede5fcbbd5b144db77ce
parent847bc9394a6f4e354adcb926ae44e7ff7e3bfa0f (diff)
downloaddrakx-ae9e0f8fc2ae2bd4ab34914c56e1562637fed3e6.tar
drakx-ae9e0f8fc2ae2bd4ab34914c56e1562637fed3e6.tar.gz
drakx-ae9e0f8fc2ae2bd4ab34914c56e1562637fed3e6.tar.bz2
drakx-ae9e0f8fc2ae2bd4ab34914c56e1562637fed3e6.tar.xz
drakx-ae9e0f8fc2ae2bd4ab34914c56e1562637fed3e6.zip
Added HP DeskJet 450 to the models which need HPOJ.
-rw-r--r--perl-install/printer/printerdrake.pm16
1 files changed, 10 insertions, 6 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index c5072f743..95604980d 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -1774,10 +1774,10 @@ sub setup_common {
local $::isWizard = 0;
if (!$printer->{noninteractive}) {
$isHPOJ = $in->ask_yesorno(N("Add a new printer"),
- N("Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"), 0);
+ N("Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"), 0);
}
}
- if ($makemodel =~ /HP\s+(OfficeJet|PSC|PhotoSmart|LaserJet\s+(1200|1220|2200|3200|33.0))/i ||
+ if ($makemodel =~ /HP\s+(OfficeJet|PSC|PhotoSmart|LaserJet\s+(1200|1220|2200|3200|33.0)|DeskJet\s+450)/i ||
$makemodel =~ /Sony\s+IJP[\s\-]+V[\s\-]+100/i ||
$isHPOJ) {
# Install HPOJ package
@@ -1802,7 +1802,8 @@ sub setup_common {
if ($ptaldevice) {
# Configure scanning with SANE on the MF device
if ($makemodel !~ /HP\s+PhotoSmart/i &&
- $makemodel !~ /HP\s+LaserJet\s+2200/i) {
+ $makemodel !~ /HP\s+LaserJet\s+2200/i &&
+ $makemodel !~ /HP\s+DeskJet\s+450/i) {
# Install SANE
if (!$::testing &&
!files_exist(qw(/usr/bin/scanimage
@@ -1830,7 +1831,8 @@ sub setup_common {
$makemodel =~ /HP\s+PSC\s*9[05]0/i ||
$makemodel =~ /HP\s+PSC\s*22\d\d/i ||
$makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i ||
- $makemodel =~ /HP\s+OfficeJet\s+71[34]0/i) &&
+ $makemodel =~ /HP\s+OfficeJet\s+71[34]0/i ||
+ $makemodel =~ /HP\s+DeskJet\s+450/i) &&
$makemodel !~ /HP\s+PhotoSmart\s+7150/i) {
# Install mtools and MToolsFM
if (!$::testing &&
@@ -3009,7 +3011,8 @@ sub scanner_help {
if ($deviceuri =~ m!^ptal://?(.*?)$!) {
my $ptaldevice = $1;
if ($makemodel !~ /HP\s+PhotoSmart/i &&
- $makemodel !~ /HP\s+LaserJet\s+2200/i) {
+ $makemodel !~ /HP\s+LaserJet\s+2200/i &&
+ $makemodel !~ /HP\s+DeskJet\s+450/i) {
# Models with built-in scanner
return N("Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information.
@@ -3030,7 +3033,8 @@ sub photocard_help {
$makemodel =~ /HP\s+PSC\s*9[05]0/i ||
$makemodel =~ /HP\s+PSC\s*22\d\d/i ||
$makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i ||
- $makemodel =~ /HP\s+OfficeJet\s+71[34]0/i) &&
+ $makemodel =~ /HP\s+OfficeJet\s+71[34]0/i ||
+ $makemodel =~ /HP\s+DeskJet\s+450/i) &&
$makemodel !~ /HP\s+PhotoSmart\s+7150/i) {
# Models with built-in photo card drives
return N("Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists.",