Removed HP multi-function device configuration from SMB and remote LPD printer setup.

Let the Sony IJP-V100 being treated as an HP multi-function device.
Taken into account that the HP PhotoSmart 7150 has no photo card reader.

1 files changed, 13 insertions, 10 deletions

diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index 722f81622..9b00fd940 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -1181,11 +1181,11 @@ sub setup_common {
 
     my $ptaldevice = "";
     my $isHPOJ = 0;
-    if ($device !~ /^smb:/) {
+    if (($device =~ /^\/dev\//) || ($device =~ /^socket:\/\//)) {
 	if (!$do_auto_detect) {
 	    local $::isWizard = 0;
 	    $isHPOJ = $in->ask_yesorno(_("Local Printer"),
-				       _("Is your printer a multi-function device from HP (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner), an HP PhotoSmart or an HP LaserJet 2200?"), 0);
+				       _("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);
 	}
 	if (($makemodel =~ /HP\s+OfficeJet/i) ||
 	    ($makemodel =~ /HP\s+PSC/i) ||
@@ -1196,6 +1196,7 @@ sub setup_common {
 	    ($makemodel =~ /HP\s+LaserJet\s+2200/i) ||
 	    ($makemodel =~ /HP\s+LaserJet\s+3200/i) ||
 	    ($makemodel =~ /HP\s+LaserJet\s+33.0/i) ||
+	    ($makemodel =~ /Sony\s+IJP[\s\-]+V[\s\-]+100/i) ||
 	    ($isHPOJ)) {
 	    # Install HPOJ package
 	    if ((!$::testing) &&
@@ -1237,9 +1238,10 @@ sub setup_common {
 		    printer::config_sane();
 		}
 		# Configure photo card access with mtools and MToolsFM
-		if (($makemodel =~ /HP\s+PhotoSmart/i) ||
-		    ($makemodel =~ /HP\s+PSC\s*9[05]0/i) ||
-		    ($makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i)) {
+		if ((($makemodel =~ /HP\s+PhotoSmart/i) ||
+		     ($makemodel =~ /HP\s+PSC\s*9[05]0/i) ||
+		     ($makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i)) &&
+		    ($makemodel !~ /HP\s+PhotoSmart\s+7150/i)) {
 		    # Install mtools and MToolsFM
 		    if ((!$::testing) &&
 			(!printer::files_exist(qw(/usr/bin/mdir
@@ -2172,7 +2174,7 @@ sub scanner_help {
 	if (($makemodel !~ /HP\s+PhotoSmart/i) &&
 	    ($makemodel !~ /HP\s+LaserJet\s+2200/i)) {
 	    # Models with built-in scanner
-	    return _("Your HP 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.
+	    return _("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.
 
 Do not use \"scannerdrake\" for this device!",
 		     $ptaldevice);
@@ -2187,11 +2189,12 @@ sub photocard_help {
     my ($makemodel, $deviceuri) = @_;
     if ($deviceuri =~ m!^ptal:/(.*)$!) {
 	my $ptaldevice = $1;
-	if (($makemodel =~ /HP\s+PhotoSmart/i) ||
-	    ($makemodel =~ /HP\s+PSC\s*9[05]0/i) ||
-	    ($makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i)) {
+	if ((($makemodel =~ /HP\s+PhotoSmart/i) ||
+	     ($makemodel =~ /HP\s+PSC\s*9[05]0/i) ||
+	     ($makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i)) &&
+	    ($makemodel !~ /HP\s+PhotoSmart\s+7150/i)) {
 	    # Models with built-in photo card drives
-	    return _("Your HP 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.",
+	    return _("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.",
 		     $ptaldevice);
 	} else {
 	    # Photo-card-drive-less models