re-sync after the big svn loss

9 files changed, 0 insertions, 9737 deletions

diff --git a/perl-install/printer/STATUS b/perl-install/printer/STATUS
deleted file mode 100644
index e9c5bc205..000000000
--- a/perl-install/printer/STATUS
+++ /dev/null
@@ -1,5 +0,0 @@
-printerdrake status
-
-- printer::printerdrake still needs to be splited/cleaned
-
-- printer::printerdrake should probably be renamed printer::gui
diff --git a/perl-install/printer/common.pm b/perl-install/printer/common.pm
deleted file mode 100644
index 9d8f4d9a5..000000000
--- a/perl-install/printer/common.pm
+++ /dev/null
@@ -1,86 +0,0 @@
-package printer::common;
-
-use strict;
-use vars qw(@ISA @EXPORT);
-
-@ISA = qw(Exporter);
-@EXPORT = qw(addentry addsection removeentry  removesection);
-
-
-sub addentry {
-    my ($section, $entry, $filecontent) = @_;
-    my $sectionfound = 0;
-    my $entryinserted = 0;
-    my @lines = split("\n", $filecontent);
-    foreach (@lines) {
-	if (!$sectionfound) {
-	    $sectionfound = 1 if /^\s*\[\s*$section\s*\]\s*$/;
-	} else {
-	    if (!/^\s*$/ && !/^\s*;/) { #-#
-		$_ = "$entry\n$_";
-		$entryinserted = 1;
-		last;
-	    }
-	}
-    }
-    push(@lines, $entry) if $sectionfound && !$entryinserted;
-    return join "\n", @lines;
-}
-
-sub addsection {
-    my ($section, $filecontent) = @_;
-    my @lines = split("\n", $filecontent);
-    foreach (@lines) {
-     # section already there, nothing to be done
-     return $filecontent if /^\s*\[\s*$section\s*\]\s*$/;
-    }
-    return $filecontent . "\n[$section]";
-}
-
-sub removeentry {
-    my ($section, $entry, $filecontent) = @_;
-    my $sectionfound = 0;
-    my $done = 0;
-    my @lines = split("\n", $filecontent);
-    foreach (@lines) {
-	$_ = "$_\n";
-	next if $done;
-	if (!$sectionfound) {
-	    $sectionfound = 1 if /^\s*\[\s*$section\s*\]\s*$/;
-	} else {
-	    if (/^\s*\[.*\]\s*$/) { # Next section
-		$done = 1;
-	    } elsif (/^\s*$entry/) {
-		$_ = "";
-		$done = 1;
-	    }
-	}
-    }
-    return join "", @lines;
-}
-
-sub removesection {
-    my ($section, $filecontent) = @_;
-    my $sectionfound = 0;
-    my $done = 0;
-    my @lines = split("\n", $filecontent);
-    foreach (@lines) {
-	$_ = "$_\n";
-	next if $done;
-	if (!$sectionfound) {
-	    if (/^\s*\[\s*$section\s*\]\s*$/) {
-		$_ = "";
-		$sectionfound = 1;
-	    }
-	} else {
-	    if (/^\s*\[.*\]\s*$/) { # Next section
-		$done = 1;
-	    } else {
-		$_ = "";
-	    }
-	}
-    }
-    return join "", @lines;
-}
-
-1;
diff --git a/perl-install/printer/cups.pm b/perl-install/printer/cups.pm
deleted file mode 100644
index eb443482e..000000000
--- a/perl-install/printer/cups.pm
+++ /dev/null
@@ -1,147 +0,0 @@
-package printer::cups;
-
-use strict;
-
-use printer::data;
-use run_program;
-use common;
-
-
-#------------------------------------------------------------------------------
-
-sub lpstat_lpv() {
-
-    # Get a list of remotely defined print queues, with "Description" and
-    # "Location"
-
-    # Info to return
-    my @items;
-
-    # Hash to simplify the adding of the URIs
-    my $itemshash;
-
-    # Run the "lpstat" command in a mode to give as much info about the
-    # print queues as possible
-    my @lpstat = run_program::rooted_get_stdout
-	($::prefix, 'lpstat', '-l', '-p', '-v');
-    
-    my $currentitem = -1;
-    for my $line (@lpstat) {
-	chomp($line);
-	if ($line !~ m!^\s*$!) {
-	    if ($line =~ m!^printer\s+(\S+)\s+.*\b(enabled|disabled)\b!) {
-		# Beginning of new printer's entry
-		my $name = $1;
-		my $state = $2;
-		push(@items, {});
-		$currentitem = $#items;
-		$itemshash->{$name} = $currentitem;
-		$items[$currentitem]{queuename} ||= $name;
-		$items[$currentitem]{state} ||= $state;
-	    } elsif ($line =~ m!^\s+Description:\s+(\S.*)$!) {
-		# Description field
-		if ($currentitem != -1) {
-		    $items[$currentitem]{description} ||= $1;
-		}
-	    } elsif ($line =~ m!^\s+Location:\s+(\S.*)$!) {
-		# Location field
-		if ($currentitem != -1) {
-		    $items[$currentitem]{location} ||= $1;
-		}
-	    } elsif ($line =~ m!^device\s+for\s+(\S+):\s+(\S.*)$!) {
-		# "device for ..." line, extract URI
-		my $name = $1;
-		my $uri = $2;
-		if (defined($itemshash->{$name})) {
-		    if ($uri !~ /:/) { $uri = "file:" . $uri }
-		    $currentitem = $itemshash->{$name};
-		    if (($currentitem <= $#items) &&
-			($items[$currentitem]{queuename} eq $name)) {
-			$items[$currentitem]{uri} ||= $uri;
-			if ($uri =~ m!^ipp://([^/:]+)[:/]!) {
-			    $items[$currentitem]{ipp} = $1;
-			}
-		    }
-		}
-	    }
-	}
-    }
-    return @items;
-}
-
-sub lpstat_v() {
-    map {
-	if (my ($queuename, $uri) = m/^\s*device\s+for\s+([^:\s]+):\s*(\S+)\s*$/) {
-	    +{ queuename => $queuename, uri => $uri, if_($uri =~ m!^ipp://([^/:]+)[:/]!, ipp => $1) };
-	} else {
-	    ();
-	}
-    } run_program::rooted_get_stdout($::prefix, 'lpstat', '-v');
-}
-
-sub lpinfo_v() {
-    map {
-	if (my ($type, $uri) = m/^\s*(\S+)\s+(\S+)\b/) {
-	    if ($uri =~ m!:/!) {
-		$uri;
-	    } elsif ($type =~ m/network/i) {
-		"$uri://";
-	    } else {
-		"$uri:/";
-	    }
-	} else {
-	    ();
-	}
-    } run_program::rooted_get_stdout($::prefix, 'lpinfo', '-v');
-}
-
-sub read_printer_list {
-    my ($printer) = @_;
-    # This function reads in a list of all printers which the local CUPS
-    # daemon currently knows, including remote ones.
-    map {
-	my $comment = 
-	  $_->{ipp} && !$printer->{configured}{$_->{queuename}} ?
-	    N("(on %s)", $_->{ipp}) : N("(on this machine)");
-	"$_->{queuename} $comment";
-    } lpstat_v();
-}
-
-sub get_formatted_remote_queues {
-    my ($printer) = @_;
-
-    # This function reads in a list of all remote printers which the local 
-    # CUPS daemon knows due to broadcasting of remote servers or 
-    # "BrowsePoll" entries in the local /etc/cups/cupsd.conf/
-    map {
-	join('!', if_($printer->{expert}, N("CUPS")), N("Configured on other machines"), $_);
-    } map {
-	my $comment = N("On CUPS server \"%s\"", ($_->{ipp} ? $_->{ipp} : $printer->{remote_cups_server})) . ($_->{queuename} eq $printer->{DEFAULT} ? N(" (Default)") : "");
-	"$_->{queuename}: $comment";
-    } grep { 
-	!$printer->{configured}{$_->{queuename}};
-    } lpstat_v();
-}
-
-sub get_remote_queues {
-    my ($printer) = @_;
-    # The following code reads in a list of all remote printers which the
-    # local CUPS daemon knows due to broadcasting of remote servers or 
-    # "BrowsePoll" entries in the local /etc/cups/cupsd.conf
-    map {
-	"$_->{queuename}|$_->{ipp}";
-    } grep { 
-	$_->{ipp} && !$printer->{configured}{$_->{queuename}};
-    } lpstat_v();
-}
-
-sub queue_enabled {
-    my ($queue) = @_;
-    0 != grep {
-	/\b$queue\b.*\benabled\b/i;
-    } run_program::rooted_get_stdout($::prefix, 'lpstat', '-p', $queue);
-}
-
-
-
-1;
diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
deleted file mode 100644
index 0d650ac02..000000000
--- a/perl-install/printer/data.pm
+++ /dev/null
@@ -1,177 +0,0 @@
-package printer::data;
-
-use strict;
-use common;
-use vars qw(@ISA @EXPORT);
-
-@ISA = qw(Exporter);
-@EXPORT = qw(%spoolers %spooler_inv %shortspooler_inv
-	     $kernelversion $usbprintermodule $lib
-	     $commonpackages $gimpprintingpackages $gnomecupspackages
-	     $localqueuepackages);
-
-
-# Kernel-specific data
-our $kernelversion = `uname -r 2>/dev/null`;
-$kernelversion =~ s/^(\s*)(\d+\.\d+)(\..*)$/$2/;
-chomp $kernelversion;
-
-our $usbprintermodule = ($kernelversion eq '2.6' ? "usblp" : "printer");
-
-# Architecture-specific data
-our $lib = arch() =~ /x86_64/ ? "lib64" : "lib";
-
-# Packages which are always needed to run printerdrake
-our $commonpackages = [ [ 'foomatic-db-engine' ], 
-			[ '/usr/bin/foomatic-configure' ] ];
-
-# Packages which are needed to print with the GIMP
-our $gimpprintingpackages = [ [ 'gutenprint-gimp2' ], 
-			      [ "/usr/$lib/gimp/2.0/plug-ins/print" ] ];
-
-# Packages which are needed for CUPS under GNOME
-our $gnomecupspackages = [ [ 'desktop-printing' ], 
-			   [ '/usr/bin/eggcups' ] ];
-
-# Packages which are needed to create and manage local print queues
-our $localqueuepackages = [ [ 'foomatic-filters', 'foomatic-db',
-			      'foomatic-db-hpijs', 'foomatic-db-engine',
-			      'printer-filters', 
-			      'printer-utils', 'printer-testpages', 
-			      'ghostscript', 'hplip-hpijs', 'gutenprint-ijs',
-			      'gutenprint-foomatic', 'gutenprint-escputil', 
-			      'postscript-ppds', 
-			      'hplip-model-data', 'nmap', 'scli' ],
-			    [qw(/usr/bin/foomatic-rip
-				/usr/share/foomatic/db/source/driver/ljet4.xml
-				/usr/share/foomatic/db/source/driver/hpijs.xml
-				/usr/bin/foomatic-configure
-				/usr/bin/pnm2ppa
-				/usr/bin/getusbprinterid
-				/usr/share/printer-testpages/testprint.ps
-				/usr/bin/gs-common
-				/usr/bin/hpijs
-				/usr/share/man/man1/ijsgutenprint.1.bz2
-				/usr/share/foomatic/db/source/driver/gutenprint-ijs.5.0.xml
-				/usr/bin/escputil
-				/usr/share/cups/model/postscript.ppd.gz
-				/usr/share/hplip/data/xml/models.xml
-				/usr/bin/nmap
-				/usr/bin/scli)] ];
-
-# Spooler-specific data
-our %spoolers = ('pdq' => {
-                          'help' => "/usr/bin/pdq -h -P %s 2>&1 |",
-			  'print_command' => 'lpr-pdq',
-			  'print_gui' => 'xpdq',
-			  'long_name' => N("PDQ - Print, Do not Queue"),
-			  'short_name' => N("PDQ"),
-			  'local_queues' => 1,
-                          'packages2add' => [ [ 'pdq' ], [qw(/usr/bin/pdq /usr/X11R6/bin/xpdq)] ],
-                          'alternatives' => [
-                              [ 'lpr', '/usr/bin/lpr-pdq' ],
-                              [ 'lpq', '/usr/bin/lpq-foomatic' ],
-                              [ 'lprm', '/usr/bin/lprm-foomatic' ]
-                          ],
-			  },
-		 'lpd' => {
-                        'print_command' => 'lpr-lpd',
-			'print_gui' => 'lpr-lpd',
-			'long_name' => N("LPD - Line Printer Daemon"),
-                        'short_name' => N("LPD"),
-                        'boot_spooler' => 'lpd',
-                        'service' => 'lpd',
-			'local_queues' => 1,
-                        'packages2add' => [ [qw(lpr net-tools a2ps ImageMagick)],
-                                            [qw(/usr/sbin/lpf
-                                                /usr/sbin/lpd
-                                                /sbin/ifconfig
-                                                /usr/bin/a2ps
-                                                /usr/bin/convert)] ],
-                        'packages2rm' => [ 'LPRng', "/usr/$lib/filters/lpf" ],
-                        'alternatives' => [
-                            [ 'lpr', '/usr/bin/lpr-lpd' ],
-                            [ 'lpq', '/usr/bin/lpq-lpd' ],
-                            [ 'lprm', '/usr/bin/lprm-lpd' ],
-                            [ 'lpc', '/usr/sbin/lpc-lpd' ]
-                        ]
-		    },
-		 'lprng' => {
-		     'print_command' => 'lpr-lpd',
-		     'print_gui' => 'lpr-lpd',
-		     'long_name' => N("LPRng - LPR New Generation"),
-		     'short_name' => N("LPRng"),
-		     'boot_spooler' => 'lpd',
-		     'service' => 'lpd',
-		     'local_queues' => 1,
-		     'packages2add' => [ [qw(LPRng net-tools a2ps ImageMagick)],
-					 ["/usr/$lib/filters/lpf",
-					  "/usr/sbin/lpd",
-					  "/sbin/ifconfig",
-					  "/usr/bin/a2ps",
-					  "/usr/bin/convert"] ],
-		     'packages2rm' => [ 'lpr', '/usr/sbin/lpf' ],
-		     'alternatives' => [
-					[ 'lpr', '/usr/bin/lpr-lpd' ],
-					[ 'lpq', '/usr/bin/lpq-lpd' ],
-					[ 'lprm', '/usr/bin/lprm-lpd' ],
-					[ 'lp', '/usr/bin/lp-lpd' ],
-					[ 'cancel', '/usr/bin/cancel-lpd' ],
-					[ 'lpstat', '/usr/bin/lpstat-lpd' ],
-					[ 'lpc', '/usr/sbin/lpc-lpd' ]
-					]
-				    },
-		 'cups' => {
-		     'help' => "/usr/bin/lphelp %s |",
-		     'print_command' => 'lpr-cups',
-		     'print_gui' => 'xpp',
-		     'long_name' => N("CUPS - Common Unix Printing System"),
-		     'short_name' => N("CUPS"),
-		     'boot_spooler' => 'cups',
-		     'service' => 'cups',
-		     'local_queues' => 1,
-		     'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gutenprint-cups',
-					  $::isInstall ? 'curl' : 'webfetch'],
-					 [ "/usr/$lib/cups/cgi-bin/printers.cgi",
-					   "/sbin/ifconfig",
-					   "/usr/bin/xpp",
-					   "/usr/$lib/cups/filter/rastertolxx74", 
-					   "/usr/$lib/cups/filter/commandtoepson",
-					   $::isInstall ||
-					   !(-x '/usr/bin/wget') ?
-					   '/usr/bin/curl' :
-					   '/usr/bin/wget' ] ],
-		     'alternatives' => [
-					[ 'lpr', '/usr/bin/lpr-cups' ],
-					[ 'lpq', '/usr/bin/lpq-cups' ],
-					[ 'lprm', '/usr/bin/lprm-cups' ],
-					[ 'lp', '/usr/bin/lp-cups' ],
-					[ 'cancel', '/usr/bin/cancel-cups' ],
-					[ 'lpstat', '/usr/bin/lpstat-cups' ],
-					[ 'lpc', '/usr/sbin/lpc-cups' ]
-					]
-				    },
-		 'rcups' => {
-		     'help' => "/usr/bin/lphelp %s |",
-		     'print_command' => 'lpr-cups',
-		     'print_gui' => 'xpp',
-		     'long_name' => N("CUPS - Common Unix Printing System (remote server)"),
-		     'short_name' => N("Remote CUPS"),
-		     'local_queues' => 0,
-		     'packages2add' => [ ['cups-common', 'xpp'],
-					 ['/usr/bin/lpr-cups',
-					  '/usr/bin/xpp'] ],
-		     'alternatives' => [
-					[ 'lpr', '/usr/bin/lpr-cups' ],
-					[ 'lpq', '/usr/bin/lpq-cups' ],
-					[ 'lprm', '/usr/bin/lprm-cups' ],
-					[ 'lp', '/usr/bin/lp-cups' ],
-					[ 'cancel', '/usr/bin/cancel-cups' ],
-					[ 'lpstat', '/usr/bin/lpstat-cups' ],
-					[ 'lpc', '/usr/sbin/lpc-cups' ]
-					]
-				    }
-		 );
-our %spooler_inv = map { $spoolers{$_}{long_name} => $_ } keys %spoolers;
-
-our %shortspooler_inv = map { $spoolers{$_}{short_name} => $_ } keys %spoolers;
diff --git a/perl-install/printer/default.pm b/perl-install/printer/default.pm
deleted file mode 100644
index 41da25c56..000000000
--- a/perl-install/printer/default.pm
+++ /dev/null
@@ -1,64 +0,0 @@
-package printer::default;
-
-use strict;
-use run_program;
-use common;
-
-#-configuration directory of Foomatic
-my $FOOMATICCONFDIR = "/etc/foomatic"; 
-#-location of the file containing the default spooler's name
-my $FOOMATIC_DEFAULT_SPOOLER = "$FOOMATICCONFDIR/defaultspooler";
-
-sub set_printer {
-    my ($printer) = $_[0];
-    my $spooler = $printer->{SPOOLER};
-    if ($spooler eq "rcups") {
-	run_program::rooted($::prefix, "lpoptions",
-			    "-d", $printer->{DEFAULT}) or return 0;
-    } else {
-	run_program::rooted($::prefix, "foomatic-configure",
-			    "-D", "-q", "-s", $spooler,
-			    "-n", $printer->{DEFAULT}) or return 0;
-    }
-    return 1;
-}
-
-sub get_printer {
-    my $printer = $_[0];
-    my $spooler = $printer->{SPOOLER};
-    $spooler = "cups" if $spooler eq "rcups";
-    local *F;
-    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	"foomatic-configure -Q -q -s $spooler |" or return undef;
-    my $line;
-    while ($line = <F>) {
-	if ($line =~ m!^\s*<defaultqueue>(.*)</defaultqueue>\s*$!) {
-	    return $1;
-	}
-    }
-    return undef;
-}
-
-sub printer_type() { "LOCAL" }
-
-sub get_spooler () {
-    if (-f "$::prefix$FOOMATIC_DEFAULT_SPOOLER") {
-        my $spool = cat_("$::prefix$FOOMATIC_DEFAULT_SPOOLER");
-	chomp $spool;
-	if ($spool =~ /cups/) {
-	    my ($daemonless_cups, $_remote_cups_server) =
-		printer::main::read_client_conf();
-	    $spool = ($daemonless_cups > 0 ? "rcups" : "cups");
-	}
-	return $spool if $spool =~ /cups|lpd|lprng|pdq/;
-    }
-}
-
-sub set_spooler ($) {
-    my ($printer) = @_;
-    # Mark the default driver in a file
-    output_p("$::prefix$FOOMATIC_DEFAULT_SPOOLER", $printer->{SPOOLER});
-}
-
-
-1;
diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
deleted file mode 100644
index d02e89ac3..000000000
--- a/perl-install/printer/detect.pm
+++ /dev/null
@@ -1,637 +0,0 @@
-package printer::detect;
-
-use strict;
-use common;
-use modules;
-use detect_devices;
-use printer::data;
-
-sub local_detect() {
-    modules::any_conf->read->get_probeall("usb-interface") and eval { modules::load($usbprintermodule) };
-    # Reload parallel port modules only when we were not called by
-    # automatic setup of print queues, to avoid recursive calls
-    if ($::autoqueue) {
-	whatUsbport();
-    } else {
-	eval { modules::unload(qw(lp parport_pc ppdev parport)) }; #- on kernel 2.4 parport has to be unloaded to probe again
-	eval { modules::load(qw(ppdev parport_pc lp)) }; #- take care as not available on 2.4 kernel (silent error).
-	whatPrinter();
-    }
-}
-
-sub net_detect { whatNetPrinter(1, 0, @_) }
-
-sub net_smb_detect { whatNetPrinter(0, 1, @_) }
-
-sub detect {
-    local_detect(), whatNetPrinter(1, 1, @_);
-}
-
-
-#-CLASS:PRINTER;
-#-MODEL:HP LaserJet 1100;
-#-MANUFACTURER:Hewlett-Packard;
-#-DESCRIPTION:HP LaserJet 1100 Printer;
-#-COMMAND SET:MLC,PCL,PJL;
-sub whatPrinter() {
-    my @res = (whatParport(), whatUsbport());
-    grep { $_->{val}{CLASS} eq "PRINTER" } @res;
-}
-
-sub whatParport() {
-    my @res;
-    my $i = 0;
-    foreach (sort { $a =~ /(\d+)/; my $m = $1; $b =~ /(\d+)/; my $n = $1; $m <=> $n } `ls -1d /proc/parport/[0-9]* /proc/sys/dev/parport/parport[0-9]* 2>/dev/null`) {
-	chomp;
-	my $elem = {};
-	my $F;
-	open $F, "$_/autoprobe" or next;
-	{
-	    local $_;
-	    my $itemfound = 0;
-	    while (<$F>) {
-		chomp;
-		if (/(.*):(.*);/) { #-#
-		    $elem->{$1} = $2;
-		    $elem->{$1} =~ s/Hewlett[-\s_]Packard/HP/;
-		    $elem->{$1} =~ s/HEWLETT[-\s_]PACKARD/HP/;
-		    $itemfound = 1;
-		    # Add IEEE-1284 device ID string
-		    $elem->{IEEE1284} .= $_;
-		}
-	    }
-	    # Some parallel printers miss the "CLASS" field
-	    $elem->{CLASS} = 'PRINTER' 
-		if $itemfound && !defined($elem->{CLASS});
-	}
-	push @res, { port => "/dev/lp$i", val => $elem };
-	$i ++;
-    }
-    @res;
-}
-
-sub whatPrinterPort() {
-    grep { detect_devices::tryWrite($_) } qw(/dev/lp0 /dev/lp1 /dev/lp2 /dev/usb/lp0 /dev/usb/lp1 /dev/usb/lp2 /dev/usb/lp3 /dev/usb/lp4 /dev/usb/lp5 /dev/usb/lp6 /dev/usb/lp7 /dev/usb/lp8 /dev/usb/lp9);
-}
-
-sub whatUsbport() {
-    # The printer manufacturer and model names obtained with the usb_probe()
-    # function were very messy, once there was a lot of noise around the
-    # manufacturers name ("Inc.", "SA", "International", ...) and second,
-    # all Epson inkjets answered with the name "Epson Stylus Color 760" which
-    # lead many newbies to install their Epson Stylus Photo XXX as an Epson
-    # Stylus Color 760 ...
-    #
-    # This routine based on an ioctl request gives very clean and correct
-    # manufacturer and model names, so that they are easily matched to the
-    # printer entries in the Foomatic database
-    my @res;
-    foreach my $i (0..15) {
-	my $port = "/dev/usb/lp$i";
-	my $realport = devices::make($port);
-	next if !$realport;
-	next if ! -r $realport;
-	foreach my $j (1..3) {
-	    open(my $PORT, $realport) or next;
-	    my $idstr = "";
-	    # Calculation of IOCTL function 0x84005001 (to get device ID
-	    # string):
-	    # len = 1024
-	    # IOCNR_GET_DEVICE_ID = 1
-	    # LPIOC_GET_DEVICE_ID(len) =
-	    #     _IOC(_IOC_READ, 'P', IOCNR_GET_DEVICE_ID, len)
-	    # _IOC(), _IOC_READ as defined in /usr/include/asm/ioctl.h
-	    # Use "eval" so that program does not stop when IOCTL fails
-	    eval { 
-		my $output = "\0" x 1024; 
-		ioctl($PORT, 0x84005001, $output);
-		$idstr = $output;
-	    } or do {
-		close $PORT;
-		next;
-	    };
-	    close $PORT;
-	    # Cut resulting string to its real length
-	    my $length = ord(substr($idstr, 1, 1)) +
-		(ord(substr($idstr, 0, 1)) << 8);
-	    $idstr = substr($idstr, 2, $length-2);
-	    # Remove non-printable characters
-	    $idstr =~ tr/[\x00-\x1f]/./;
-	    # If we do not find any item in the ID string, we try to read
-	    # it again
-	    my $itemfound = 0;
-	    # Extract the printer data from the ID string
-	    my ($manufacturer, $model, $serialnumber, $description, $commandset) =
-		    ("", "", "", "", "");
-	    my ($sku);
-	    if ($idstr =~ /CLS:([^;]+);/ || $idstr =~ /CLASS:([^;]+);/) {
-		$itemfound = 1;
-	    }
-	    if ($idstr =~ /MFG:([^;]+);/ || $idstr =~ /MANUFACTURER:([^;]+);/) {
-		$manufacturer = $1;
-		$manufacturer =~ s/Hewlett[-\s_]Packard/HP/;
-		$manufacturer =~ s/HEWLETT[-\s_]PACKARD/HP/;
-		$itemfound = 1;
-	    }
-	    # For HP's multi-function devices the real model name is in the "SKU"
-	    # field. So use this field with priority for $model when it exists.
-	    if ($idstr =~ /MDL:([^;]+);/ || $idstr =~ /MODEL:([^;]+);/) {
-		$model ||= $1;
-		$itemfound = 1;
-	    }
-	    if ($idstr =~ /SKU:([^;]+);/) {
-		$sku = $1;
-		$itemfound = 1;
-	    }
-	    if ($idstr =~ /DES:([^;]+);/ || $idstr =~ /DESCRIPTION:([^;]+);/) {
-		$description = $1;
-		$description =~ s/Hewlett[-\s_]Packard/HP/;
-		$description =~ s/HEWLETT[-\s_]PACKARD/HP/;
-		$itemfound = 1;
-	    }
-	    if (($idstr =~ /SE*R*N:([^;]+);/) ||
-		($idstr =~ /SN:([^;]+);/)) {
-		$serialnumber = $1;
-		$itemfound = 1;
-	    }
-	    if ($idstr =~ /CMD:([^;]+);/ || 
-		$idstr =~ /COMMAND\s*SET:([^;]+);/) {
-		$commandset ||= $1;
-		$itemfound = 1;
-	    }
-	    # Nothing found? Try again if not in the third attempt,
-	    # after the third attempt give up
-	    next if !$itemfound;
-	    # Was there a manufacturer and a model in the string?
-	    if ($manufacturer eq "" || $model eq "") {
-		$manufacturer = "";
-		$model = N("Unknown model");
-	    }
-	    # No description field? Make one out of manufacturer and model.
-	    if ($description eq "") {
-		$description = "$manufacturer $model";
-	    }
-	    # Store this auto-detection result in the data structure
-	    push @res, { port => $port, val => 
-			 { CLASS => 'PRINTER',
-			   MODEL => $model,
-			   MANUFACTURER => $manufacturer,
-			   DESCRIPTION => $description,
-			   SERIALNUMBER => $serialnumber,
-			   'COMMAND SET' => $commandset,
-			   SKU => $sku,
-			   IEEE1284 => $idstr,
-			   } };
-	    last;
-	}
-    }
-    @res;
-}
-
-sub whatNetPrinter {
-    my ($network, $smb, $timeout) = @_;
-
-    my (@res);
-
-    # Set timeouts for "nmap"
-    $timeout = 4000 if !$timeout;
-    my $irtimeout = $timeout / 2;
-
-    # Which ports should be scanned?
-    my @portstoscan;
-    push @portstoscan, "139" if $smb;
-    push @portstoscan, "4010", "4020", "4030", "5503", "9100-9104" if $network;
-    
-    return () if $#portstoscan < 0;
-    my $portlist = join ",", @portstoscan;
-
-    # Which hosts should be scanned?
-    # (Applying nmap to a whole network is very time-consuming,
-    #  because nmap waits for a certain timeout period on non-existing
-    #  hosts, so we get a lists of existing hosts by pinging the
-    #  broadcast addresses for existing hosts and then scanning only
-    #  them, which is much faster)
-    my @hostips = getIPsInLocalNetworks();
-    return () if $#hostips < 0;
-    my $hostlist = join " ", @hostips;
-
-    # Scan network for printers, the timeout settings are there to avoid
-    # delays caused by machines blocking their ports with a firewall
-    local *F;
-    open F, ($::testing ? "" : "chroot $::prefix/ ") .
-	qq(/bin/sh -c "export LC_ALL=C; nmap -r -P0 --host_timeout $timeout --initial_rtt_timeout $irtimeout -p $portlist $hostlist" 2> /dev/null |)
-	or return @res;
-    my ($host, $ip, $port, $modelinfo, $namechecked) = ("", "", "", "", 0);
-    while (my $line = <F>) {
-	chomp $line;
-
-	# head line of the report of a host with the ports in question open
-	if (($line =~ m/^\s*Interesting\s+ports\s+on\s+(\S*)\s*\((\S+)\)\s*:\s*$/i) ||
-	    ($line =~ m/^\s*Interesting\s+ports\s+on\s+(\S+)\s*:\s*$/i)) {
-	    ($host, $ip) = ($1, $2);
-	    $ip = $host if !$ip;
-	    $host = $ip if $host eq "";
-	    $port = "";
-	    $namechecked = 0;
-
-	    undef $modelinfo;
-
-	} elsif ($line =~ m!^\s*(\d+)/\S+\s+open\s+!i) {
-	    next if $ip eq "";
-	    $port = $1;
-
-	    # Check integrity of the host name (work around DNS problems
-	    # by using IP if host name is broken)
-	    if (!$namechecked && ($host ne $ip)) {
-		$namechecked = 1; # Do not check more than once
-		my $packedip = gethostbyname("$host");
-		my ($a,$b,$c,$d) = unpack('C4',$packedip);
-		my $ipfromdns = sprintf("%d.%d.%d.%d", $a, $b, $c, $d);
-		$host = $ip if $ip ne $ipfromdns;
-	    }
-	    # Now we have all info for one printer
-	    # Store this auto-detection result in the data structure
-
-	    # Determine the protocol by the port number
-
-	    # SMB/Windows
-	    if ($port eq "139") {
-		my @shares = getSMBPrinterShares($ip);
-		foreach my $share (@shares) {
-		    push @res, { port => "smb://$host/$share->{name}",
-				 val => { CLASS => 'PRINTER',
-					  MODEL => N("Unknown model"),
-					  MANUFACTURER => "",
-					  DESCRIPTION => $share->{description},
-					  SERIALNUMBER => ""
-				      }
-			     };
-		}
-	    } else {
-		if (!defined($modelinfo)) {
-		    # SNMP request to auto-detect model
-		    $modelinfo = getSNMPModel($ip);
-		}
-		if (defined($modelinfo)) {
-		    push @res, { port => "socket://$host:$port",
-				 val => $modelinfo
-				 };
-		}
-	    }
-	}
-    }
-    close F;
-    @res;
-}
-
-sub getNetworkInterfaces() {
-
-    # subroutine determines the list of all network interfaces reported
-    # by "ifconfig", except "lo".
-    
-    # Return an empty list if no network is running
-    return () unless network_running();
-    
-    my @interfaces;
-	
-    local *IFCONFIG_OUT;
-    open IFCONFIG_OUT, ($::testing ? "" : "chroot $::prefix/ ") .
-	'/bin/sh -c "export LC_ALL=C; ifconfig" 2> /dev/null |' or return ();
-    while (my $readline = <IFCONFIG_OUT>) {
-	# New entry ...
-	if ($readline =~ /^(\S+)\s/) {
-	    my $dev = $1;
-	    if ($dev ne "lo") {
-		push @interfaces, $dev;
-	    }
-	}
-    }
-    close(IFCONFIG_OUT);
-
-    @interfaces;
-}
-
-sub getIPsOfLocalMachine() {
-
-    # subroutine determines all IPs which point to the local machine,
-    # except 127.0.0.1 (localhost).
-
-    # Return an empty list if no network is running
-    return () unless network_running();
-    
-    # Read the output of "ifconfig" to determine the broadcast addresses of
-    # the local networks
-    my $dev_is_realnet = 0;
-    my @local_ips;
-    my $current_ip = "";
-	
-    local *IFCONFIG_OUT;
-    open IFCONFIG_OUT, ($::testing ? "" : "chroot $::prefix/ ") .
-	'/bin/sh -c "export LC_ALL=C; ifconfig" 2> /dev/null |' or return ();
-    while (my $readline = <IFCONFIG_OUT>) {
-	# New entry ...
-	if ($readline =~ /^(\S+)\s/) {
-	    my $dev = $1;
-	    # ... for a real network (not lo = localhost)
-	    $dev_is_realnet = $dev ne 'lo';
-	    # delete previous address
-	    $current_ip = "";
-	}
-	# Are we in the important line now?
-	if ($readline =~ /\sinet addr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
-	    # Rip out the IP address
-	    $current_ip = $1;
-	    
-	    # Are we in an entry for a real network?
-	    if ($dev_is_realnet) {
-		# Store current IP address
-		push @local_ips, $current_ip;
-	    }
-	}
-    }
-    close(IFCONFIG_OUT);
-    @local_ips;
-}
-
-sub getIPsInLocalNetworks() {
-
-    # subroutine determines the list of all hosts reachable in the local
-    # networks by means of pinging the broadcast addresses.
-    
-    # Return an empty list if no network is running
-    return () unless network_running();
-    
-    # Read the output of "ifconfig" to determine the broadcast addresses of
-    # the local networks
-    my $dev_is_localnet = 0;
-    my $local_nets = {};
-    my $dev;
-    local *IFCONFIG_OUT;
-    open IFCONFIG_OUT, ($::testing ? "" : "chroot $::prefix/ ") .
-	'/bin/sh -c "export LC_ALL=C; ifconfig" 2> /dev/null |' or return ();
-    while (my $readline = <IFCONFIG_OUT>) {
-	# New entry ...
-	if ($readline =~ /^(\S+)\s/) {
-	    $dev = $1;
-	    # ... for a local network (eth = ethernet, 
-	    #     vmnet = VMWare,
-	    #     ethernet card connected to ISP excluded)?
-	    $dev_is_localnet = $dev =~ /^eth/ || $dev =~ /^vmnet/;
-	}
-	if ($dev_is_localnet) {
-	    # Are we in the important line now?
-	    if ($readline =~ /\saddr:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
-		# Rip out the broadcast IP address
-		$local_nets->{$dev}{ip} = $1;
-	    }
-	    if ($readline =~ /\sBcast:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
-		# Rip out the broadcast IP address
-		$local_nets->{$dev}{bcast} = $1;
-	    }
-	    if ($readline =~ /\sMask:([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\s/) {
-		# Rip out the broadcast IP address
-		$local_nets->{$dev}{mask} = $1;
-	    }
-	}
-    }
-    close(IFCONFIG_OUT);
-
-    # Now find all addresses in the local networks which we will investigate
-    my @addresses;
-    foreach my $dev (keys %{$local_nets}) {
-	my $ip = $local_nets->{$dev}{ip};
-	my $bcast = $local_nets->{$dev}{bcast};
-	my $mask = $local_nets->{$dev}{mask};
-	if ($mask =~ /255.255.255.(\d+)/) {
-	    # Small network, never more than 255 boxes, so we return
-	    # all addresses belonging to this network, nwithout pinging
-	    my $lastnumber = $1;
-	    my $masknumber;
-	    if ($lastnumber < 128) {
-		$masknumber = 24;
-	    } elsif ($lastnumber < 192) {
-		$masknumber = 25;
-	    } elsif ($lastnumber < 224) {
-		$masknumber = 26;
-	    } elsif ($lastnumber < 240) {
-		$masknumber = 27;
-	    } elsif ($lastnumber < 248) {
-		$masknumber = 28;
-	    } elsif ($lastnumber < 252) {
-		$masknumber = 29;
-	    } elsif ($lastnumber < 254) {
-		$masknumber = 30;
-	    } elsif ($lastnumber < 255) {
-		$masknumber = 31;
-	    } else {
-		$masknumber = 32;
-	    }
-	    push @addresses, "$ip/$masknumber";
-	} else {
-	    # Big network, probably more than 255 boxes, so ping the 
-	    # broadcast address and additionally "nmblookup" the
-	    # networks (to find Windows servers which do not answer to ping)
-	    local *F;
-	    open F, ($::testing ? "" : "chroot $::prefix/ ") . 
-		qq(/bin/sh -c "export LC_ALL=C; ping -w 1 -b -n $bcast 2> /dev/null | cut -f 4 -d ' ' | sed s/:// | egrep '^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+' | uniq | sort" |) 
-		or next;
-	    local $_;
-	    while (<F>) { chomp; push @addresses, $_ }
-	    close F;
-	    if (-x "/usr/bin/nmblookup") {
-		local *F;
-		open F, ($::testing ? "" : "chroot $::prefix/ ") . 
-		    qq(/bin/sh -c "export LC_ALL=C; nmblookup -B $bcast \\* 2> /dev/null | cut -f 1 -d ' ' | egrep '^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+' | uniq | sort" |)
-		    or next;
-		local $_;
-		while (<F>) { 
-		    chomp;
-		    push @addresses, $_ if !(member($_,@addresses));
-		}
-	    }
-	}
-    }
-
-    @addresses;
-}
-
-sub getSMBPrinterShares {
-    my ($host) = @_;
-    
-    # SMB request to auto-detect shares
-    local *F;
-    open F, ($::testing ? "" : "chroot $::prefix/ ") .
-	qq(/bin/sh -c "export LC_ALL=C; smbclient -N -L $host" 2> /dev/null |) or return ();
-    my $insharelist = 0;
-    my @shares;
-    while (my $l = <F>) {
-	chomp $l;
-	if ($l =~ /^\s*Sharename\s+Type\s+Comment\s*$/i) {
-	    $insharelist = 1;
-	} elsif ($l =~ /^\s*Server\s+Comment\s*$/i) {
-	    $insharelist = 0;
-	} elsif ($l =~ /^\s*(\S+)\s+Printer\s*(.*)$/i &&
-		 $insharelist) {
-	    my $name = $1;
-	    my $description = $2;
-	    $description =~ s/^(\s*)//;
-	    push @shares, { name => $name, description => $description };
-	}
-    }
-    close F;
-
-    return @shares;
-}
-
-sub getSNMPModel {
-    my ($host) = @_;
-    my $manufacturer = "";
-    my $model = "";
-    my $description = "";
-    my $serialnumber = "";
-    
-    # SNMP request to auto-detect model
-    local *F;
-    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
-	qq(/bin/sh -c "scli -v 1 -c 'show printer info' $host" 2> /dev/null |) or
-	return { CLASS => 'PRINTER',
-		 MODEL => N("Unknown model"),
-		 MANUFACTURER => "",
-		 DESCRIPTION => "",
-		 SERIALNUMBER => ""
-		 };
-    while (my $l = <F>) {
-	chomp $l;
-	if ($l =~ /^\s*Manufacturer:\s*(\S.*)$/i &&
-	    $l =~ /^\s*Vendor:\s*(\S.*)$/i) {
-	    $manufacturer = $1;
-	    $manufacturer =~ s/Hewlett[-\s_]Packard/HP/;
-	    $manufacturer =~ s/HEWLETT[-\s_]PACKARD/HP/;
-	} elsif ($l =~ /^\s*Model:\s*(\S.*)$/i) {
-	    $model = $1;
-	} elsif ($l =~ /^\s*Description:\s*(\S.*)$/i) {
-	    $description = $1;
-	    $description =~ s/Hewlett[-\s_]Packard/HP/;
-	    $description =~ s/HEWLETT[-\s_]PACKARD/HP/;
-	} elsif ($l =~ /^\s*Serial\s*Number:\s*(\S.*)$/i) {
-	    $serialnumber = $1;
-	}
-    }
-    close F;
-
-    # Was there a manufacturer and a model in the output?
-    # If not, get them from the description
-    if ($manufacturer eq "" || $model eq "") {
-	# Replace bad description
-	if ((length($description) < 5) &&
-	    (length($description) >= 5)) {
-	    $description = $model;
-	}
-	# Guess manufacturer by model name
-	if ($description =~
-	    /^\s*(DeskJet|LaserJet|OfficeJet|PSC|PhotoSmart)\b/i) {
-	    # HP printer
-	    $manufacturer = "HP";
-	    $model = $description;
-	} elsif ($description =~
-	    /^\s*(Stylus|EPL|AcuLaser)\b/i) {
-	    # Epson printer
-	    $manufacturer = "Epson";
-	    $model = $description;
-	} elsif ($description =~
-	    /^\s*(Aficio)\b/i) {
-	    # Ricoh printer
-	    $manufacturer = "Ricoh";
-	    $model = $description;
-	} elsif ($description =~
-	    /^\s*(Optra|Color\s+JetPrinter)\b/i) {
-	    # Lexmark printer
-	    $manufacturer = "Lexmark";
-	    $model = $description;
-	} elsif ($description =~
-	    /^\s*(imageRunner|Pixma|Pixus|BJC|LBP)\b/i) {
-	    # Canon printer
-	    $manufacturer = "Canon";
-	    $model = $description;
-	} elsif ($description =~
-	    /^\s*(Phaser|DocuPrint|(Work|Document)\s*(Home|)Centre)\b/i) {
-	    # Xerox printer
-	    $manufacturer = "Xerox";
-	    $model = $description;
-	} elsif ($description =~ /^\s*(\S*)\s+(\S.*)$/) {
-	    $manufacturer = $1 if $manufacturer eq "";
-	    $model = $2 if $model eq "";
-	}
-	# No description field? Make one out of manufacturer and model.
-    } elsif ($description eq "") {
-	$description = "$manufacturer $model";
-    }
-    
-    # We couldn't determine a model
-    $model = N("Unknown model") if $model eq "";
-    
-    # Remove trailing spaces
-    $manufacturer =~ s/(\S+)\s+$/$1/;
-    $model        =~ s/(\S+)\s+$/$1/;
-    $description  =~ s/(\S+)\s+$/$1/;
-    $serialnumber =~ s/(\S+)\s+$/$1/;
-
-    # Now we have all info for one printer
-    # Store this auto-detection result in the data structure
-    return  { CLASS => 'PRINTER',
-	      MODEL => $model,
-	      MANUFACTURER => $manufacturer,
-	      DESCRIPTION => $description,
-	      SERIALNUMBER => $serialnumber
-	      };
-}
-
-sub network_running() {
-    # If the network is not running return 0, otherwise 1.
-    local *F; 
-    open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	'/bin/sh -c "export LC_ALL=C; /sbin/ifconfig" 2> /dev/null |' or
-	    die 'Could not run "ifconfig"!';
-    while (my $line = <F>) {
-	if ($line !~ /^lo\s+/ && # The loopback device can have been 
-                                   # started by the spooler's startup script
-	    $line =~ /^(\S+)\s+/) { # In this line starts an entry for a
-	                              # running network
-	    close F;
-	    return 1;
-	}
-    }
-    close F;
-    return 0;
-}
-
-sub parport_addr {
-    # auto-detect the parallel port addresses
-    my ($device) = @_;
-    $device =~ m!^/dev/lp(\d+)$! or
-	$device =~ m!^/dev/printers/(\d+)$!;
-    my $portnumber = $1;
-    my $i = 0;
-    my $parportdir;
-    foreach (sort { $a =~ /(\d+)/; my $m = $1; $b =~ /(\d+)/; my $n = $1; $m <=> $n } `ls -1d /proc/parport/[0-9]* /proc/sys/dev/parport/parport[0-9]* 2>/dev/null`) {
-	chomp;
-	if ($i == $portnumber) {
-	    $parportdir = $_;
-	    last;
-	}
-	$i++;
-    }
-    my $parport_addresses = 
-	`cat $parportdir/base-addr`;
-    my $address_arg;
-    if ($parport_addresses =~ /^\s*(\d+)\s+(\d+)\s*$/) {
-	$address_arg = sprintf(" -base 0x%x -basehigh 0x%x", $1, $2);
-    } elsif ($parport_addresses =~ /^\s*(\d+)\s*$/) {
-	$address_arg = sprintf(" -base 0x%x", $1);
-    } else {
-	$address_arg = "";
-    }
-    return $address_arg;
-}
-
-1;
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
deleted file mode 100644
index 37e2952bb..000000000
--- a/perl-install/printer/main.pm
+++ /dev/null
@@ -1,3010 +0,0 @@
-package printer::main;
-
-# $Id$
-
-use strict;
-
-use common;
-use run_program;
-use printer::data;
-use printer::services;
-use printer::default;
-use printer::cups;
-use printer::detect;
-use handle_configs;
-use services;
-use lang;
-
-use vars qw(@ISA @EXPORT);
-
-@ISA = qw(Exporter);
-@EXPORT = qw(%printer_type %printer_type_inv);
-
-our %printer_type = (
-    N("Local printer")                              => "LOCAL",
-    N("Remote printer")                             => "REMOTE",
-    N("Printer on remote CUPS server")              => "CUPS",
-    N("Printer on remote lpd server")               => "LPD",
-    N("Network printer (TCP/Socket)")               => "SOCKET",
-    N("Printer on SMB/Windows server")              => "SMB",
-    N("Printer on NetWare server")                  => "NCP",
-    N("Enter a printer device URI")                 => "URI",
-    N("Pipe job into a command")                    => "POSTPIPE"
-);
-
-our %printer_type_inv = reverse %printer_type;
-
-our %thedb;
-our %linkedppds;
-
-our $hplipdevicesdb;
-
-# Translation of the "(recommended)" in printer driver entries
-our $recstr = N("recommended");
-our $precstr = "($recstr)";
-our $sprecstr = quotemeta($precstr);
-
-#------------------------------------------------------------------------------
-
-sub spooler() {
-    # LPD is taken from the menu for the moment because the classic LPD is
-    # highly unsecure. Depending on how the GNU lpr development is going on
-    # LPD support can be reactivated by uncommenting the following line.
-
-    #return @spooler_inv{qw(cups lpd lprng pdq)};
-
-    # LPRng is not officially supported any more since version 9.0 of
-    # this distribution, so show it only in the spooler menu when it
-    # was manually installed.
-
-    # PDQ is not officially supported any more since version 9.1, so
-    # show it only in the spooler menu when it was manually installed.
-
-    return map { $spoolers{$_}{long_name} } ('cups', 'rcups' , 
-    if_(files_exist(qw(/usr/bin/pdq)), 'pdq'),
-    if_(files_exist("/usr/$lib/filters/lpf", "/usr/sbin/lpd"), 'lprng'));
-}
-
-sub printer_type($) {
-    my ($printer) = @_;
-    for ($printer->{SPOOLER}) {
-	/cups/  and return @printer_type_inv{qw(LOCAL LPD SOCKET SMB), if_($printer->{expert}, qw(URI))};
-	/lpd/   and return @printer_type_inv{qw(LOCAL LPD SOCKET SMB NCP), if_($printer->{expert}, qw(POSTPIPE URI))};
-	/lprng/ and return @printer_type_inv{qw(LOCAL LPD SOCKET SMB NCP), if_($printer->{expert}, qw(POSTPIPE URI))};
-	/pdq/   and return @printer_type_inv{qw(LOCAL LPD SOCKET), if_($printer->{expert}, qw(URI))};
-	/rcups/ and return ();
-    }
-}
-
-sub SIGHUP_daemon {
-    my ($service) = @_;
-    if ($service eq "cupsd") { $service = "cups" }
-    # PDQ and remote CUPS have no daemons, exit.
-    if (($service eq "pdq") || ($service eq "rcups")) { return 1 }
-    # CUPS needs auto-correction for its configuration
-    run_program::rooted($::prefix, "/usr/sbin/correctcupsconfig") if $service eq "cups";
-    # Name of the daemon
-    my %daemons = (
-			    "lpr" => "lpd",
-			    "lpd" => "lpd",
-			    "lprng" => "lpd",
-			    "cups" => "cupsd",
-			    "devfs" => "devfsd",
-			    );
-    my $daemon = $daemons{$service};
-    $daemon = $service unless defined $daemon;
-#    if ($service eq "cups") {
-#	# The current CUPS (1.1.13) dies on SIGHUP, do the normal restart.
-#	printer::services::restart($service);
-#	# CUPS needs some time to come up.
-#	printer::services::wait_for_cups();
-#    } else {
-
-    # Send the SIGHUP
-    run_program::rooted($::prefix, "/usr/bin/killall", "-HUP", $daemon);
-    if ($service eq "cups") {
-	# CUPS needs some time to come up.
-	printer::services::wait_for_cups();
-    }
-
-    return 1;
-}
-
-
-sub assure_device_is_available_for_cups {
-    # Checks whether CUPS already "knows" a certain port, it does not
-    # know it usually when the appropriate kernel module is loaded
-    # after CUPS was started or when the printer is turned on after
-    # CUPS was started. CUPS 1.1.12 and newer refuses to set up queues
-    # on devices which it does not know, it points these queues to
-    # file:/dev/null instead. Restart CUPS if necessary to assure that
-    # CUPS knows the device.
-    my ($device) = @_;
-    my $sdevice = handle_configs::searchstr($device);
-    my ($result, $i);
-    # USB printers get special model-dependent URLs in "lpinfo -v" here
-    # checking is complicated, so we simply restart CUPS then and ready.
-    if ($device =~ /usb/) {
-	$result = printer::services::restart("cups");
-	return 1;
-    }
-    my $maxattempts = 3;
-    for ($i = 0; $i < $maxattempts; $i++) {
-	open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
-	    '/bin/sh -c "export LC_ALL=C; /usr/sbin/lpinfo -v" |') or
-	    die 'Could not run "lpinfo"!';
-	while (my $line = <$F>) {
-	    if ($line =~ /$sdevice/) { # Found a line containing the device
-		                       # name, so CUPS knows it.
-		close $F;
-		return 1;
-	    }
-	}
-	close $F;
-	$result = printer::services::restart("cups");
-    }
-    return $result;
-}
-
-
-sub spooler_in_security_level {
-    # Was the current spooler already added to the current security level?
-    my ($spooler, $level) = @_;
-    my $sp;
-    $sp = $spooler eq "lpr" || $spooler eq "lprng" ? "lpd" : $spooler;
-    my $file = "$::prefix/etc/security/msec/server.$level";
-    if (-f $file) {
-	open(my $F, "< $file") or return 0;
-	while (my $line = <$F>) {
-	    if ($line =~ /^\s*$sp\s*$/) {
-		close $F;
-		return 1;
-	    }
-	}
-	close $F;
-    }
-    return 0;
-}
-
-sub add_spooler_to_security_level {
-    my ($spooler, $level) = @_;
-    my $sp;
-    $sp = $spooler eq "lpr" || $spooler eq "lprng" ? "lpd" : $spooler;
-    my $file = "$::prefix/etc/security/msec/server.$level";
-    if (-f $file) {
-	   eval { append_to_file($file, "$sp\n") } or return 0;
-    }
-    return 1;
-}
-
-sub pdq_panic_button {
-    my $setting = $_[0];
-    if (-f "$::prefix/usr/sbin/pdqpanicbutton") {
-        run_program::rooted($::prefix, "/usr/sbin/pdqpanicbutton", "--$setting")
-	    or die "Could not $setting PDQ panic buttons!";
-    }
-}
-
-sub copy_printer_params($$) {
-    my ($from, $to) = @_;
-    map { $to->{$_} = $from->{$_} } grep { $_ ne 'configured' } keys %$from; 
-    #- avoid cycles-----------------^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-}
-
-sub getinfo($) {
-    my ($prefix) = @_;
-    my $printer = {};
-
-    $::prefix = $prefix;
-
-    # Initialize $printer data structure
-    resetinfo($printer);
-
-    return $printer;
-}
-
-#------------------------------------------------------------------------------
-sub resetinfo($) {
-    my ($printer) = @_;
-    $printer->{QUEUE} = "";
-    $printer->{OLD_QUEUE} = "";
-    $printer->{OLD_CHOICE} = "";
-    $printer->{ARGS} = {};
-    $printer->{DBENTRY} = "";
-    $printer->{DEFAULT} = "";
-    $printer->{currentqueue} = {};
-    # -check which printing system was used previously and load the information
-    # -about its queues
-    read_configured_queues($printer);
-}
-
-sub read_configured_queues($) {
-    my ($printer) = @_;
-    my @QUEUES;
-    # Get the default spooler choice from the config file
-    $printer->{SPOOLER} ||= printer::default::get_spooler();
-    if (!$printer->{SPOOLER}) {
-	#- Find the first spooler where there are queues
-	foreach my $spooler (qw(rcups cups pdq lprng lpd)) {
-	    #- Is the spooler's daemon running?
-	    my $service = $spooler;
-	    if ($service eq "lprng") {
-		$service = "lpd";
-	    }
-	    if (($service ne "pdq") && ($service ne "rcups")) {
-		next unless services::is_service_running($service);
-		# daemon is running, spooler found
-		$printer->{SPOOLER} = $spooler;
-	    }
-	    #- poll queue info
-	    if ($service ne "rcups") {
-		open(my $F, ($::testing ? 
-			     $::prefix : "chroot $::prefix/ ") .
-		     "foomatic-configure -P -q -s $spooler |") or
-		     die "Could not run foomatic-configure";
-		eval join('', <$F>);
-		close $F;
-	    }
-	    if ($service eq "pdq") {
-		#- Have we found queues? PDQ has no damon, so we consider
-		#- it in use when there are defined printer queues
-		if ($#QUEUES != -1) {
-		    $printer->{SPOOLER} = $spooler;
-		    last;
-		}
-	    } elsif ($service eq "rcups") {
-		#- In daemon-less CUPS mode there are no local queues,
-		#- we can only recognize it by a server entry in
-		#- /etc/cups/client.conf
-		my ($daemonless_cups, $remote_cups_server) =
-		    printer::main::read_client_conf();
-		if ($daemonless_cups) {
-		    $printer->{SPOOLER} = $spooler;
-		    $printer->{remote_cups_server} = $remote_cups_server;
-		    last;
-		}
-	    } else {
-		#- For other spoolers we have already found a running
-		#- daemon when we have arrived here
-		last;
-	    }
-	}
-    } else {
-	if ($printer->{SPOOLER} ne "rcups") {
-	    #- Poll the queues of the current default spooler
-	    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
-		 "foomatic-configure -P -q -s $printer->{SPOOLER} -r |") or
-		 die "Could not run foomatic-configure";
-	    eval join('', <$F>);
-	    close $F;
-	} else {
-	    my ($_daemonless_cups, $remote_cups_server) =
-		printer::main::read_client_conf();
-	    $printer->{remote_cups_server} = $remote_cups_server;
-	}
-    }
-    $printer->{configured} = {};
-    my $i;
-    my $N = $#QUEUES + 1;
-    for ($i = 0;  $i < $N; $i++) {
-	# Set the default printer
-	$printer->{DEFAULT} = $QUEUES[$i]{queuedata}{queue} if
-	    $QUEUES[$i]{queuedata}{default};
-	# Advance to the next entry if the current is a remotely defined
-	# printer
-	next if $QUEUES[$i]{queuedata}{remote};
-	# Add an entry for a locally defined queue
-	$printer->{configured}{$QUEUES[$i]{queuedata}{queue}} = 
-	    $QUEUES[$i];
-	if (!$QUEUES[$i]{make} || !$QUEUES[$i]{model}) {
-	    if ($printer->{SPOOLER} eq "cups") {
-		$printer->{OLD_QUEUE} = $QUEUES[$i]{queuedata}{queue};
-		my $descr = get_descr_from_ppd($printer);
-		if ($descr =~ m/^([^\|]*)\|([^\|]*)(\|.*|)$/) {
-		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{make} ||= $1;
-		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{model} ||= $2;
-	        }
-		# Read out which PPD file was originally used to set up this
-		# queue
-		if (open(my $F, "< $::prefix/etc/cups/ppd/$QUEUES[$i]{queuedata}{queue}.ppd")) {
-		    while (my $line = <$F>) {
-			if ($line =~ /^\*%MDKMODELCHOICE:(.+)$/) {
-			    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd} = $1;
-			}
-		    }
-		    close $F;
-		    # Mark that we have a CUPS queue but do not know the
-		    # name the PPD file in /usr/share/cups/model
-		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd} ||= '1';
-		    # Mark that our PPD file is not a Foomatic one
-		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{driver} = "PPD";
-		} else {
-		    # We do not have a PPD file for this queue
-		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{ppd} = undef;
-		    # No PPD found? Then we have a raw queue
-		    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{driver} = "raw";
-		}
-		$printer->{OLD_QUEUE} = "";
-	    }
-	    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{make} ||= "";
-	    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{model} ||= N("Unknown model");
-	} else {
-	    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{make} = $QUEUES[$i]{make};
-	    $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{model} = $QUEUES[$i]{model};
-	}
-	# Fill in "options" field
-	if (my $args = $printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{args}) {
-	    my @options;
-	    foreach my $arg (@$args) {
-		push(@options, "-o");
-		my $optstr = $arg->{name} . "=" . $arg->{default};
-		push(@options, $optstr);
-	    }
-	    @{$printer->{configured}{$QUEUES[$i]{queuedata}{queue}}{queuedata}{options}} = @options;
-	}
-	# Construct an entry line for tree view in main window of
-	# printerdrake
-	make_menuentry($printer, $QUEUES[$i]{queuedata}{queue});
-    }
-}
-
-sub make_menuentry {
-    my ($printer, $queue) = @_;
-    my $spooler = $spoolers{$printer->{SPOOLER}}{short_name};
-    my $connect = $printer->{configured}{$queue}{queuedata}{connect};
-    my $localremote = N("Configured on this machine");
-    my $make = $printer->{configured}{$queue}{queuedata}{make};
-    my $model = $printer->{configured}{$queue}{queuedata}{model};
-    my $connection;
-    if ($connect =~ m!^(file|parallel):/dev/lp(\d+)$!) {
-	my $number = $2;
-	$connection = N(" on parallel port #%s", $number);
-    } elsif ($connect =~ m!^(file|usb):/dev/usb/lp(\d+)$!) {
-	my $number = $2;
-	$connection = N(", USB printer #%s", $number);
-    } elsif ($connect =~ m!^usb://!) {
-	$connection = N(", USB printer");
-    } elsif ($connect =~ m!^hp:/(.+?)$!) {
-	my $hplipdevice = $1;
-	if ($hplipdevice =~ m!^par/!) {
-	    $connection = N(", HP printer on a parallel port");
-	} elsif ($hplipdevice =~ m!^usb/!) {
-	    $connection = N(", HP printer on USB");
-	} elsif ($hplipdevice =~ m!^net/!) {
-	    $connection = N(", HP printer on HP JetDirect");
-	} else {
-	    $connection = N(", HP printer");
-	}
-    } elsif ($connect =~ m!^ptal://?(.+?)$!) {
-	my $ptaldevice = $1;
-	if ($ptaldevice =~ /^mlc:par:(\d+)$/) {
-	    my $number = $1;
-	    $connection = N(", multi-function device on parallel port #%s",
-			    $number);
-	} elsif ($ptaldevice =~ /^mlc:par:/) {
-	    $connection = N(", multi-function device on a parallel port");
-	} elsif ($ptaldevice =~ /^mlc:usb:/) {
-	    $connection = N(", multi-function device on USB");
-	} elsif ($ptaldevice =~ /^hpjd:/) {
-	    $connection = N(", multi-function device on HP JetDirect");
-	} else {
-	    $connection = N(", multi-function device");
-	}
-    } elsif ($connect =~ m!^file:(.+)$!) {
-        my $file = $1;
-	$connection = N(", printing to %s", $file);
-    } elsif ($connect =~ m!^lpd://([^/]+)/([^/]+)/?$!) {
-        my ($server, $printer) = ($1, $2);
-	$connection = N(" on LPD server \"%s\", printer \"%s\"", $server, $printer);
-    } elsif ($connect =~ m!^socket://([^/:]+):([^/:]+)/?$!) {
-        my ($host, $port) = ($1, $2);
-	$connection = N(", TCP/IP host \"%s\", port %s", $host, $port);
-    } elsif ($connect =~ m!^smb://([^/\@]+)/([^/\@]+)/?$! ||
-	     $connect =~ m!^smb://.*/([^/\@]+)/([^/\@]+)/?$! ||
-	     $connect =~ m!^smb://.*\@([^/\@]+)/([^/\@]+)/?$!) {
-        my ($server, $share) = ($1, $2);
-	$connection = N(" on SMB/Windows server \"%s\", share \"%s\"", $server, $share);
-    } elsif ($connect =~ m!^ncp://([^/\@]+)/([^/\@]+)/?$! ||
-	     $connect =~ m!^ncp://.*/([^/\@]+)/([^/\@]+)/?$! ||
-	     $connect =~ m!^ncp://.*\@([^/\@]+)/([^/\@]+)/?$!) {
-        my ($server, $printer) = ($1, $2);
-	$connection = N(" on Novell server \"%s\", printer \"%s\"", $server, $printer);
-    } elsif ($connect =~ m!^postpipe:(.+)$!) {
-        my $command = $1;
-	$connection = N(", using command %s", $command);
-    } else {
-	$connection = ($printer->{expert} ? ", URI: $connect" : "");
-    }
-    my $sep = "!";
-    $printer->{configured}{$queue}{queuedata}{menuentry} = 
-	($printer->{expert} ? "$spooler$sep" : "") .
-	"$localremote$sep$queue: $make $model$connection";
-}
-
-sub connectionstr {
-    my ($connect) = @_;
-    my $connection;
-    if ($connect =~ m!^(file|parallel):/dev/lp(\d+)$!) {
-	my $number = $2;
-	$connection = N("Parallel port #%s", $number);
-    } elsif ($connect =~ m!^(file|usb):/dev/usb/lp(\d+)$!) {
-	my $number = $2;
-	$connection = N("USB printer #%s", $number);
-    } elsif ($connect =~ m!^usb://!) {
-	$connection = N("USB printer");
-    } elsif ($connect =~ m!^hp:/(.+?)$!) {
-	my $hplipdevice = $1;
-	if ($hplipdevice =~ m!^par/!) {
-	    $connection = N("HP printer on a parallel port");
-	} elsif ($hplipdevice =~ m!^usb/!) {
-	    $connection = N("HP printer on USB");
-	} elsif ($hplipdevice =~ m!^net/!) {
-	    $connection = N("HP printer on HP JetDirect");
-	} else {
-	    $connection = N("HP printer");
-	}
-    } elsif ($connect =~ m!^ptal://?(.+?)$!) {
-	my $ptaldevice = $1;
-	if ($ptaldevice =~ /^mlc:par:(\d+)$/) {
-	    my $number = $1;
-	    $connection = N("Multi-function device on parallel port #%s",
-			    $number);
-	} elsif ($ptaldevice =~ /^mlc:par:/) {
-	    $connection = N("Multi-function device on a parallel port");
-	} elsif ($ptaldevice =~ /^mlc:usb:/) {
-	    $connection = N("Multi-function device on USB");
-	} elsif ($ptaldevice =~ /^hpjd:/) {
-	    $connection = N("Multi-function device on HP JetDirect");
-	} else {
-	    $connection = N("Multi-function device");
-	}
-    } elsif ($connect =~ m!^file:(.+)$!) {
-        my $file = $1;
-	$connection = N("Prints into %s", $file);
-    } elsif ($connect =~ m!^lpd://([^/]+)/([^/]+)/?$!) {
-        my ($server, $port) = ($1, $2);
-	$connection = N("LPD server \"%s\", printer \"%s\"", $server, $port);
-    } elsif ($connect =~ m!^socket://([^/:]+):([^/:]+)/?$!) {
-        my ($host, $port) = ($1, $2);
-        $connection = N("TCP/IP host \"%s\", port %s", $host, $port);
-    } elsif ($connect =~ m!^smb://([^/\@]+)/([^/\@]+)/?$! ||
-	     $connect =~ m!^smb://.*/([^/\@]+)/([^/\@]+)/?$! ||
-	     $connect =~ m!^smb://.*\@([^/\@]+)/([^/\@]+)/?$!) {
-        my ($server, $share) = ($1, $2);
-	$connection = N("SMB/Windows server \"%s\", share \"%s\"", $server, $share);
-    } elsif ($connect =~ m!^ncp://([^/\@]+)/([^/\@]+)/?$! ||
-	     $connect =~ m!^ncp://.*/([^/\@]+)/([^/\@]+)/?$! ||
-	     $connect =~ m!^ncp://.*\@([^/\@]+)/([^/\@]+)/?$!) {
-        my ($server, $share) = ($1, $2);
-	$connection = N("Novell server \"%s\", printer \"%s\"", $server, $share);
-    } elsif ($connect =~ m!^postpipe:(.+)$!) {
-        my $command = $1;
-	$connection = N("Uses command %s", $command);
-    } else {
-	$connection = N("URI: %s", $connect);
-    }
-    return $connection;
-}
-
-sub read_printer_db {
-
-    my ($printer, $spooler, $newppd) = @_;
-
-    # If a $newppd is supplied, we return the key of the DB entry which
-    # is for this file. This way we can pre-select a freshly added PPD in
-    # the model/driver list.
-
-    # No local queues available in daemon-less CUPS mode
-    return 1 if $spooler eq "rcups";
-
-    my $DBPATH; #- do not have to do close ... and do not modify globals at least
-    # Generate the Foomatic printer/driver overview
-    open($DBPATH, ($::testing ? $::prefix : "chroot $::prefix/ ") . #-#
-	"foomatic-configure -O -q |") or
-	die "Could not run foomatic-configure";
-
-    %linkedppds = ();
-    my $entry = {};
-    @{$entry->{drivers}} = (); 
-    my $inentry = 0;
-    my $indrivers = 0;
-    my $inppds = 0;
-    my $inppd = 0;
-    my $inautodetect = 0;
-    my $autodetecttype = "";
-    my $ppds = {};
-    my $ppddriver = "";
-    my $ppdfile = "";
-    my $ppdentry = "";
-    local $_;
-    while (<$DBPATH>) {
-	chomp;
-	if ($inentry) {
-	    # We are inside a printer entry
-	    if ($indrivers) {
-		# We are inside the drivers block of a printers entry
-		if (m!^\s*</drivers>\s*$!) {
-		    # End of drivers block
-		    $indrivers = 0;
-		} elsif (m!^\s*<driver>(.+)</driver>\s*$!) {
-		    push @{$entry->{drivers}}, $1;
-		}
-	    } elsif ($inppds) {
-		# We are inside the ppds block of a printers entry
-		if ($inppd) {
-		    # We are inside a PPD entry in the ppds block
-		    if (m!^\s*</ppd>\s*$!) {
-			# End of ppds block
-			$inppd = 0;
-			if ($ppddriver && $ppdfile) {
-			    $ppds->{$ppddriver} = $ppdfile;
-			}
-			$ppddriver = "";
-			$ppdfile = "";
-		    } elsif (m!^\s*<driver>(.+)</driver>\s*$!) {
-			$ppddriver = $1;
-		    } elsif (m!^\s*<ppdfile>(.+)</ppdfile>\s*$!) {
-			$ppdfile = $1;
-		    }
-		} else {
-		    if (m!^\s*</ppds>\s*$!) {
-			# End of ppds block
-			$inppds = 0;
-		    } elsif (m!^\s*<ppd>\s*$!) {
-			$inppd = 1;
-		    }
-		}
-	    } elsif ($inautodetect) {
-		# We are inside the autodetect block of a printers entry
-		# All entries inside this block will be ignored
-		if ($autodetecttype) {
-		    if (m!^.*</$autodetecttype>\s*$!) {
-			# End of general, parallel, USB, or SNMP section
-			$autodetecttype = "";
-		    } elsif (m!^\s*<manufacturer>\s*([^<>]+)\s*</manufacturer>\s*$!) {
-			# Manufacturer
-			$entry->{devidmake} = $1;
-		    } elsif (m!^\s*<model>\s*([^<>]+)\s*</model>\s*$!) {
-			# Model
-			$entry->{devidmodel} = $1;
-		    } elsif (m!^\s*<description>\s*([^<>]+)\s*</description>\s*$!) {
-			# Description
-			$entry->{deviddesc} = $1;
-		    } elsif (m!^\s*<commandset>\s*([^<>]+)\s*</commandset>\s*$!) {
-			# Command set
-			$entry->{devidcmdset} = $1;
-		    } elsif (m!^\s*<ieee1284>\s*([^<>]+)\s*</ieee1284>\s*$!) {
-			# Full ID string
-			my $idstr = $1;
-			$idstr =~ m!(MFG|MANUFACTURER):([^;]+);!i
-			    and $entry->{devidmake} = $2;
-			$idstr =~ m!(MDL|MODEL):([^;]+);!i
-			    and $entry->{devidmodel} = $2;
-			$idstr =~ m!(DES|DESCRIPTION):([^;]+);!i
-			    and $entry->{deviddesc} = $2;
-			$idstr =~ m!(CMD|COMMAND\s*SET):([^;]+);!i
-			    and $entry->{devidcmdset} = $2;
-		    }
-		} else {
-		    if (m!^.*</autodetect>\s*$!) {
-			# End of autodetect block
-			$inautodetect = 0;
-		    } elsif (m!^\s*<(general|parallel|usb|snmp)>\s*$!) {
-			# Beginning of parallel, USB, or SNMP section
-			$autodetecttype = $1;
-		    }
-		}
-	    } else {
-		if (m!^\s*</printer>\s*$!) {
-		    # entry completed
-		    $inentry = 0;
-		    # Expert mode:
-		    # Make one database entry per driver with the entry name
-		    # manufacturer|model|driver
-		    if ($printer->{expert}) {
-			foreach my $driver (@{$entry->{drivers}}) {
-			    my $driverstr;
-			    if ($driver eq "Postscript") {
-				$driverstr = "PostScript";
-			    } else {
-				$driverstr = "GhostScript + $driver";
-			    }
-			    if ($driver eq $entry->{defaultdriver}) {
-				$driverstr .= " $precstr";
-			    }
-			    $entry->{ENTRY} = "$entry->{make}|$entry->{model}|$driverstr";
-			    $entry->{ENTRY} =~ s/^CITOH/C.ITOH/i;
-			    $entry->{ENTRY} =~ 
-				s/^KYOCERA[\s\-]*MITA/KYOCERA/i;
-			    $entry->{driver} = $driver;
-			    if (defined($ppds->{$driver})) {
-				$entry->{ppd} = $ppds->{$driver};
-				$ppds->{$driver} =~ m!([^/]+)$!;
-				push(@{$linkedppds{$1}}, $entry->{ENTRY});
-			    } else {
-				undef $entry->{ppd};
-			    }
-			    # Duplicate contents of $entry because it is multiply entered to the database
-			    map { $thedb{$entry->{ENTRY}}{$_} = $entry->{$_} } keys %$entry;
-			}
-		    } else {
-			# Recommended mode
-			# Make one entry per printer, with the recommended
-			# driver (manufacturerer|model)
-			$entry->{ENTRY} = "$entry->{make}|$entry->{model}";
-			$entry->{ENTRY} =~ s/^CITOH/C.ITOH/i;
-			$entry->{ENTRY} =~ 
-			    s/^KYOCERA[\s\-]*MITA/KYOCERA/i;
-			if (($entry->{defaultdriver}) &&
-			    (member($entry->{defaultdriver},
-			            @{$entry->{drivers}}))) {
-			    my $driver = $entry->{defaultdriver};
-			    $entry->{driver} = $driver;
-			    if (defined($ppds->{$driver})) {
-				$entry->{ppd} = $ppds->{$driver};
-				$ppds->{$driver} =~ m!([^/]+)$!;
-				push(@{$linkedppds{$1}}, $entry->{ENTRY});
-			    } else {
-				undef $entry->{ppd};
-			    }
-			    map { $thedb{$entry->{ENTRY}}{$_} = $entry->{$_} } keys %$entry;
-			}
-		    }
-		    $entry = {};
-		    @{$entry->{drivers}} = (); 
-		    $ppds = {};
-		} elsif (m!^\s*<id>\s*([^\s<>]+)\s*</id>\s*$!) {
-		    # Foomatic printer ID
-		    $entry->{printer} = $1;
-		} elsif (m!^\s*<make>(.+)</make>\s*$!) {
-		    # Printer manufacturer
-		    $entry->{make} = uc($1);
-		} elsif (m!^\s*<model>(.+)</model>\s*$!) {
-		    # Printer model
-		    $entry->{model} = $1;
-		} elsif (m!<driver>(.+)</driver>!) {
-		    # Printer default driver
-		    $entry->{defaultdriver} = $1;
-		} elsif (m!^\s*<drivers>\s*$!) {
-		    # Drivers block
-		    $indrivers = 1;
-		} elsif (m!^\s*<ppds>\s*$!) {
-		    # PPDs block
-		    $inppds = 1;
-		} elsif (m!^\s*<autodetect>\s*$!) {
-		    # Autodetect block
-		    $inautodetect = 1;
-		}
-	    }
-	} else {
-	    if (m!^\s*<printer>\s*$!) {
-		# new entry
-		$inentry = 1;
-	    }
-	}
-    }
-    close $DBPATH;
-
-    # Add raw queue
-    $entry->{ENTRY} = N("Raw printer (No driver)");
-    $entry->{driver} = "raw";
-    $entry->{make} = "";
-    $entry->{model} = N("Unknown model");
-    $thedb{$entry->{ENTRY}}{$_} = $entry->{$_} foreach keys %$entry;
-
-    #- Load CUPS driver database if CUPS is used as spooler
-    if ($spooler && $spooler eq "cups") {
-        $ppdentry = poll_ppd_base($printer, $newppd);
-    }
-
-    #my @entries_db_short     = sort keys %printer::thedb;
-    #%descr_to_db          = map { $printer::thedb{$_}{DESCR}, $_ } @entries_db_short;
-    #%descr_to_help        = map { $printer::thedb{$_}{DESCR}, $printer::thedb{$_}{ABOUT} } @entries_db_short;
-    #@entry_db_description = keys %descr_to_db;
-    #db_to_descr          = reverse %descr_to_db;
-
-    return $ppdentry if $newppd;
-
-}
-
-sub read_foomatic_options ($) {
-    my ($printer) = @_;
-    # Generate the option data for the chosen printer/driver combo
-    my $COMBODATA;
-    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	"foomatic-configure -P -q -p $printer->{currentqueue}{printer}" .
-	" -d $printer->{currentqueue}{driver}" . 
-	($printer->{OLD_QUEUE} ?
-	 " -s $printer->{SPOOLER} -n $printer->{OLD_QUEUE}" : "") .
-	 ($printer->{SPECIAL_OPTIONS} ?
-	  " $printer->{SPECIAL_OPTIONS}" : "") 
-	 . " |") or
-	 die "Could not run foomatic-configure";
-    eval join('', (<$F>)); 
-    close $F;
-    # Return the arguments field
-    return $COMBODATA->{args};
-}
-
-sub read_ppd_options ($) {
-    my ($printer) = @_;
-    # Generate the option data for a given PPD file
-    my $COMBODATA;
-    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	"foomatic-configure -P -q" .
-	 if_($printer->{currentqueue}{ppd} &&
-	     ($printer->{currentqueue}{ppd} ne '1'),
-	     " --ppd \'" . ($printer->{currentqueue}{ppd} !~ m!^/! ?
-			    "/usr/share/cups/model/" : "") .
-			   $printer->{currentqueue}{ppd} . "\'") .
-	($printer->{OLD_QUEUE} ?
-	 " -s $printer->{SPOOLER} -n $printer->{OLD_QUEUE}" : "") .
-	 ($printer->{SPECIAL_OPTIONS} ?
-	  " $printer->{SPECIAL_OPTIONS}" : "") 
-		    . " |") or
-	    die "Could not run foomatic-configure";
-    eval join('', (<$F>));
-    close $F;
-    # Return the arguments field
-    return $COMBODATA->{args};
-}
-
-sub set_cups_special_options {
-    my ($printer, $queue) = @_;
-    # Set some special CUPS options
-    my @lpoptions = cat_("$::prefix/etc/cups/lpoptions");
-    # If nothing is already configured, set text file borders of half
-    # an inch so nothing of the text gets cut off by unprintable
-    # borders. Do this only when the driver is not Gutenprint or HPIJS, as 
-    # both drivers decent border settings are already done and with
-    # Gutenprint this will even break PostScript printing
-    if ((($queue eq $printer->{currentqueue}{$queue}) &&
-	 (($printer->{currentqueue}{driver} =~
-	   /(guten.*print|hpijs|hplip)/i) ||
-	  ($printer->{currentqueue}{ppd} =~
-	   /(guten.*print|hpijs|hplip)/i))) ||
-	((defined($printer->{configured}{$queue})) &&
-	 (($printer->{configured}{$queue}{queuedata}{driver} =~
-	   /(guten.*print|hpijs|hplip)/i) ||
-	  ($printer->{configured}{$queue}{queuedata}{ppd} =~
-	   /(guten.*print|hpijs|hplip)/i))) ||
-	(($printer->{SPOOLER} eq "cups") &&
-	 (-r "$::prefix/etc/cups/ppd/$queue.ppd") &&
-	 (`egrep -ic '(gutenprint|hpijs|hplip)' $::prefix/etc/cups/ppd/$queue.ppd` > 2))) {
-	# Remove page margin settings
-	foreach (@lpoptions) {
-	    s/\s*page-(top|bottom|left|right)=\S+//g if /$queue/;
-	}
-	output("$::prefix/etc/cups/lpoptions", @lpoptions);
-    } else {
-	if (!any { /$queue.*\spage-(top|bottom|left|right)=/ } @lpoptions) {
-	    run_program::rooted($::prefix, "lpoptions",
-				"-p", $queue,
-				"-o", "page-top=36", "-o", "page-bottom=36",
-				"-o", "page-left=36", "-o page-right=36");
-	}
-    }
-    # Let images fill the whole page by default and let text be word-wrapped
-    # and printed in a slightly smaller font
-    if (!any { /$queue.*\s(scaling|natural-scaling|ppi)=/ } @lpoptions) {
-	run_program::rooted($::prefix, "lpoptions",
-			    "-p", $queue,
-			    "-o", "scaling=100");
-    }
-    if (!any { /$queue.*\s(cpi|lpi)=/ } @lpoptions) {
-	run_program::rooted($::prefix, "lpoptions",
-			    "-p", $queue,
-			    "-o", "cpi=12", "-o", "lpi=7", "-o", "wrap");
-    }
-    return 1;
-}
-
-my %sysconfig = getVarsFromSh("$::prefix/etc/sysconfig/printing");
-
-sub set_cups_autoconf {
-    my ($autoconf) = @_;
-    $sysconfig{CUPS_CONFIG} = $autoconf ? "automatic" : "manual";
-    setVarsInSh("$::prefix/etc/sysconfig/printing", \%sysconfig);
-    # Restart CUPS
-    printer::services::restart("cups") if $autoconf;
-    return 1;
-}
-
-sub get_cups_autoconf() { $sysconfig{CUPS_CONFIG} ne 'manual' ? 1 : 0 }
-
-sub set_usermode {
-    my ($usermode) = @_;
-    $sysconfig{USER_MODE} = $usermode ? "expert" : "recommended";
-    setVarsInSh("$::prefix/etc/sysconfig/printing", \%sysconfig) if !$::testing;
-    return $usermode;
-}
-
-sub get_usermode() { $sysconfig{USER_MODE} eq 'expert' ? 1 : 0 }
-
-sub set_auto_admin {
-    my ($printer) = @_;
-    $sysconfig{ENABLE_QUEUES_ON_PRINTER_CONNECTED} = 
-	$printer->{enablequeuesonnewprinter} ? "yes" : "no";
-    $sysconfig{AUTO_SETUP_QUEUES_ON_PRINTER_CONNECTED} = 
-	$printer->{autoqueuesetuponnewprinter} ? "yes" : "no";
-    $sysconfig{ENABLE_QUEUES_ON_SPOOLER_START} = 
-	$printer->{enablequeuesonspoolerstart} ? "yes" : "no";
-    $sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START} = 
-	$printer->{autoqueuesetuponstart} ? "yes" : "no";
-    $sysconfig{AUTO_SETUP_QUEUES_MODE} = 
-	$printer->{autoqueuesetupgui} ? "waitforgui" : "nogui";
-    setVarsInSh("$::prefix/etc/sysconfig/printing", \%sysconfig);
-    return 1;
-}
-
-sub get_auto_admin {
-    my ($printer) = @_;
-    $printer->{enablequeuesonnewprinter} = 
-	(!defined($sysconfig{ENABLE_QUEUES_ON_PRINTER_CONNECTED}) ||
-	 ($sysconfig{ENABLE_QUEUES_ON_PRINTER_CONNECTED} =~ /no/i) ?
-	 0 : 1);
-    $printer->{autoqueuesetuponnewprinter} = 
-	(!defined($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTER_CONNECTED}) ||
-	 ($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTER_CONNECTED} =~ /yes/i) ?
-	 1 : 0);
-    $printer->{enablequeuesonspoolerstart} = 
-	(!defined($sysconfig{ENABLE_QUEUES_ON_SPOOLER_START}) ||
-	 ($sysconfig{ENABLE_QUEUES_ON_SPOOLER_START} =~ /no/i) ?
-	 0 : 1);
-    $printer->{autoqueuesetuponstart} = 
-	(!defined($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START}) ||
-	 ($sysconfig{AUTO_SETUP_QUEUES_ON_PRINTERDRAKE_START} =~ /yes/i) ?
-	 1 : 0);
-    $printer->{autoqueuesetupgui} = 
-	(!defined($sysconfig{AUTO_SETUP_QUEUES_MODE}) ||
-	 ($sysconfig{AUTO_SETUP_QUEUES_MODE} =~ /waitforgui/i) ?
-	 1 : 0);
-}
-
-sub set_jap_textmode {
-    my $textmode = ($_[0] ? 'cjk' : '');
-    # Do not write mime.convs if the file does not exist, as then
-    # CUPS is not installed and the created mime.convs will be broken.
-    # When installing CUPS later it will not work.
-    return 1 if (! -r "$::prefix/etc/cups/mime.convs");
-    substInFile {
-        s!^(\s*text/plain\s+\S+\s+\d+\s+)\S+(\s*$)!$1${textmode}texttops$2!;
-    } "$::prefix/etc/cups/mime.convs";
-    return 1;
-}
-
-sub get_jap_textmode() {
-    my @mimeconvs = cat_("$::prefix/etc/cups/mime.convs");
-    (m!^\s*text/plain\s+\S+\s+\d+\s+(\S+)\s*$!m and
-     $1 eq 'cjktexttops' and return 1) foreach @mimeconvs;
-    return 0;
-}
-
-#----------------------------------------------------------------------
-# Handling of /etc/cups/cupsd.conf
-
-sub read_cupsd_conf() {
-    # If /etc/cups/cupsd.conf does not exist a default cupsd.conf will be 
-    # put out to avoid writing of a broken cupsd.conf file when we write 
-    # it back later.
-    my @cupsd_conf = cat_("$::prefix/etc/cups/cupsd.conf");
-    if (!@cupsd_conf) {
-	@cupsd_conf = map { /\n$/s or "$_\n" } split('\n',
-'LogLevel info
-TempDir /var/spool/cups/tmp
-Port 631
-Browsing On
-BrowseAddress @LOCAL
-BrowseDeny All
-BrowseAllow 127.0.0.1
-BrowseAllow @LOCAL
-BrowseOrder deny,allow
-<Location />
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
-Allow From @LOCAL
-</Location>
-<Location /admin>
-AuthType Basic
-AuthClass System
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
-</Location>
-');
-    }
-    return @cupsd_conf;
-}
-
-sub write_cupsd_conf {
-    my (@cupsd_conf) = @_;
-    # Do not write cupsd.conf if the file does not exist, as then
-    # CUPS is not installed and the created cupsd.conf will be broken.
-    # When installing CUPS later it will not start.
-    return 1 if (! -r "$::prefix/etc/cups/cupsd.conf");
-    output("$::prefix/etc/cups/cupsd.conf", @cupsd_conf);
-}
-
-sub read_location {
-
-    # Return the lines inside the [path] location block
-    #
-    #   <Location [path]>
-    #   ...
-    #   </Location>
-
-    my ($cupsd_conf_ptr, $path) = @_;
-
-    my @result;
-    if (any { m!^\s*<Location\s+$path\s*>! } @$cupsd_conf_ptr) {
-	my $location_start = -1;
-	my $location_end = -1;
-	# Go through all the lines, bail out when start and end line found
-	for (my $i = 0; 
-	     $i <= $#{$cupsd_conf_ptr} && $location_end == -1;
-	     $i++) {
-	    if ($cupsd_conf_ptr->[$i] =~ m!^\s*<\s*Location\s+$path\s*>!) {
-		# Start line of block
-		$location_start = $i;
-	    } elsif ($cupsd_conf_ptr->[$i] =~ 
-		      m!^\s*<\s*/Location\s*>! &&
-		     $location_start != -1) {
-		# End line of block
-		$location_end = $i;
-		last;
-	    } elsif ($location_start >= 0 && $location_end < 0) {
-		# Inside the location block
-		push(@result, $cupsd_conf_ptr->[$i]);
-	    }
-	}
-    } else {
-	# If there is no root location block, set the result array to
-	# "undef"
-	@result = undef;
-    }
-    return @result;
-}
-
-sub rip_location {
-
-    # Cut out the [path]  location block
-    #
-    #   <Location [path]>
-    #   ...
-    #   </Location>
-    #
-    # so that it can be treated seperately without affecting the
-    # rest of the file
-
-    my ($cupsd_conf_ptr, $path) = @_;
-
-    my @location;
-    my $location_start = -1;
-    my $location_end = -1;
-    if (any { m!^\s*<Location\s+$path\s*>! } @$cupsd_conf_ptr) {
-	# Go through all the lines, bail out when start and end line found
-	for (my $i = 0; 
-	     $i <= $#{$cupsd_conf_ptr} && $location_end == -1;
-	     $i++) {
-	    if ($cupsd_conf_ptr->[$i] =~ m!^\s*<\s*Location\s+$path\s*>!) {
-		# Start line of block
-		$location_start = $i;
-	    } elsif ($cupsd_conf_ptr->[$i] =~ 
-		      m!^\s*<\s*/Location\s*>! &&
-		     $location_start != -1) {
-		# End line of block
-		$location_end = $i;
-		last;
-	    }
-	}
-	# Rip out the block and store it seperately
-	@location = 
-	    splice(@$cupsd_conf_ptr, $location_start,
-		   $location_end - $location_start + 1);
-    } else {
-	# If there is no location block, create one
-	$location_start = $#{$cupsd_conf_ptr} + 1;
-	@location = ("<Location $path>\n", "</Location>\n");
-    }
-
-    return $location_start, @location;
-}
-
-sub insert_location {
-
-    # Re-insert a location block ripped with "rip_location"
-
-    my ($cupsd_conf_ptr, $location_start, @location) = @_;
-
-    splice(@$cupsd_conf_ptr, $location_start,0,@location);
-}
-
-sub add_to_location {
-
-    # Add a directive to a given location (only if it is not already there)
-
-    my ($cupsd_conf_ptr, $path, $directive) = @_;
-
-    my ($location_start, @location) = rip_location($cupsd_conf_ptr, $path);
-    my $success = handle_configs::insert_directive(\@location, $directive);
-    insert_location($cupsd_conf_ptr, $location_start, @location);
-    return $success;
-}
-
-sub remove_from_location {
-
-    # Remove a directive from a given location
-
-    my ($cupsd_conf_ptr, $path, $directive) = @_;
-
-    my ($location_start, @location) = rip_location($cupsd_conf_ptr, $path);
-    my $success = handle_configs::remove_directive(\@location, $directive);
-    insert_location($cupsd_conf_ptr, $location_start, @location);
-    return $success;
-}
-
-sub replace_in_location {
-
-    # Replace a directive in a given location
-
-    my ($cupsd_conf_ptr, $path, $olddirective, $newdirective) = @_;
-
-    my ($location_start, @location) = rip_location($cupsd_conf_ptr, $path);
-    my $success = handle_configs::replace_directive(\@location, 
-						    $olddirective, 
-						    $newdirective);
-    insert_location($cupsd_conf_ptr, $location_start, @location);
-    return $success;
-}
-
-sub add_allowed_host {
-
-    # Add a host or network which should get access to the local printer(s)
-    my ($cupsd_conf_ptr, $host) = @_;
-    
-    return (handle_configs::insert_directive($cupsd_conf_ptr, 
-					     "BrowseAddress $host") and
-	    add_to_location($cupsd_conf_ptr, "/", "Allow From $host"));
-}
-
-sub remove_allowed_host {
-
-    # Remove a host or network which should get access to the local 
-    # printer(s)
-    my ($cupsd_conf_ptr, $host) = @_;
-    
-    return (handle_configs::remove_directive($cupsd_conf_ptr, "BrowseAddress $host") and
-	    remove_from_location($cupsd_conf_ptr, "/",
-				 "Allow From $host"));
-}
-
-sub replace_allowed_host {
-
-    # Remove a host or network which should get access to the local 
-    # printer(s)
-    my ($cupsd_conf_ptr, $oldhost, $newhost) = @_;
-    
-    return (handle_configs::replace_directive($cupsd_conf_ptr,
-					      "BrowseAddress $oldhost",
-					      "BrowseAddress $newhost") and
-	    replace_in_location($cupsd_conf_ptr, "/", "Allow From $newhost",
-				"Allow From $newhost"));
-}
-
-sub broadcastaddress {
-    
-    # Determines the broadcast address (for "BrowseAddress" line) for
-    # a given network IP
-
-    my ($address) = @_;
-
-    if ($address =~ /^\d+\.\*$/) {
-	$address =~ s/\*$/255.255.255/;
-    } elsif ($address =~ /^\d+\.\d+\.\*$/) {
-	$address =~ s/\*$/255.255/;
-    } elsif ($address =~ /^\d+\.\d+\.\d+\.\*$/) {
-	$address =~ s/\*$/255/;
-    } elsif ($address =~ m!^(\d+)\.(\d+)\.(\d+)\.(\d+)/(\d+)$!) {
-	my $numadr = ($1 << 24) + ($2 << 16) + ($3 << 8) + $4;
-	my $mask = ((1 << $5) - 1) << (32 - $5);
-	my $broadcast = $numadr | (~$mask);
-	$address =
-	    (($broadcast & (255 << 24)) >> 24) . '.' .
-	    (($broadcast & (255 << 16)) >> 16) . '.' .
-	    (($broadcast & (255 << 8)) >> 8) . '.' .
-	    ($broadcast & 255);
-    } elsif ($address =~
-	     m!^(\d+)\.(\d+)\.(\d+)\.(\d+)/(\d+)\.(\d+)\.(\d+)\.(\d+)$!) {
-	my $numadr = ($1 << 24) + ($2 << 16) + ($3 << 8) + $4;
-	my $mask = ($5 << 24) + ($6 << 16) + ($7 << 8) + $8;
-	my $broadcast = $numadr | (~$mask);
-	$address =
-	    (($broadcast & (255 << 24)) >> 24) . '.' .
-	    (($broadcast & (255 << 16)) >> 16) . '.' .
-	    (($broadcast & (255 << 8)) >> 8) . '.' .
-	    ($broadcast & 255);
-    }
-    
-    return $address;
-}
-
-sub networkaddress {
-    
-    # Guesses a network address for a given broadcast address
-    
-    my ($address) = @_;
-
-    if ($address =~ /\.255$/) {
-	while ($address =~ s/\.255$//) {}
-	$address .= ".*";
-    }
- 
-    return $address;
-}
-
-sub localprintersshared {
-
-    # Do we broadcast our local printers
-
-    my ($printer) = @_;
-
-    return ($printer->{cupsconfig}{keys}{Browsing} !~ /off/i &&
-	    $printer->{cupsconfig}{keys}{BrowseInterval} != 0 &&
-	    $#{$printer->{cupsconfig}{keys}{BrowseAddress}} >= 0);
-}
-
-sub remotebroadcastsaccepted {
-    
-    # Do we accept broadcasts from remote CUPS servers?
-
-    my ($printer) = @_;
-
-    # Is browsing not turned on at all?
-    if ($printer->{cupsconfig}{keys}{Browsing} =~ /off/i) {
-	return 0;
-    }
-
-    # No "BrowseDeny" lines at all
-    if ($#{$printer->{cupsconfig}{keys}{BrowseDeny}} < 0) {
-	return 1;
-    }
-
-    my $havedenyall = 
-	join('', @{$printer->{cupsconfig}{keys}{BrowseDeny}}) =~
-	 /All/im;
-    my $havedenylocal = 
-	join('', @{$printer->{cupsconfig}{keys}{BrowseDeny}}) =~
-	 /\@LOCAL/im;
-    my $orderallowdeny =
-	$printer->{cupsconfig}{keys}{BrowseOrder} =~
-	 /allow\s*,\s*deny/i;
-    my $haveallowremote = 0;
-    foreach my $allowline (@{$printer->{cupsconfig}{keys}{BrowseAllow}}) {
-	next if 
-	    $allowline =~ /^\s*(localhost|0*127\.0+\.0+\.0*1|none)\s*$/i;
-	$haveallowremote = 1;
-    }
-
-    # A line denying all (or at least the all LANs) together with the order
-    # "allow,deny" or without "BrowseAllow" lines (which allow the
-    # broadcasts of at least one remote resource).
-    if (($havedenyall || $havedenylocal) &&
-	($orderallowdeny || !$haveallowremote)) {
-	return 0;
-    }
-
-    return 1;
-}
-
-sub clientnetworks {
-
-    # Determine the client networks to which the printers will be
-    # shared If the configuration is supported by our simplified
-    # interface ("Deny From All", "Order Deny,Allow", "Allow From ..."
-    # lines in "<location /> ... </location>", a "BrowseAddress ..."
-    # line for each "Allow From ..." line), return the list of allowed
-    # client networks ("Allow"/"BrowseAddress" lines), if not, return
-    # the list of all items which are at least one of the
-    # "BrowseAddresse"s or one of the "Allow From" addresses together
-    # with a flag that the setup is not supported.
-
-    my ($printer) = @_;
-
-    # Check for a "Deny From All" line
-    my $havedenyfromall =
-	(join('', @{$printer->{cupsconfig}{root}{DenyFrom}}) =~
-	 /All/im ? 1 : 0);
-
-    # Check for "Deny From XXX" with XXX != All
-    my $havedenyfromnotall =
-	($#{$printer->{cupsconfig}{root}{DenyFrom}} - $havedenyfromall < 0 ?
-	 0 : 1);
-    
-    # Check for a "BrowseDeny All" line
-    my $havebrowsedenyall =
-	(join('', @{$printer->{cupsconfig}{keys}{BrowseDeny}}) =~
-	 /All/im ? 1 : 0);
-
-    # Check for "BrowseDeny XXX" with XXX != All
-    my $havebrowsedenynotall =
-	($#{$printer->{cupsconfig}{keys}{BrowseDeny}} - 
-	 $havebrowsedenyall < 0 ? 0 : 1);
-    
-    my @sharehosts;
-    my $haveallowfromlocalhost = 0;
-    my $haveallowedhostwithoutbrowseaddress = 0;
-    my $haveallowedhostwithoutbrowseallow = 0;
-    # Go through all "Allow From" lines
-    foreach my $line (@{$printer->{cupsconfig}{root}{AllowFrom}}) {
-	if ($line =~ /^\s*(localhost|0*127\.0+\.0+\.0*1)\s*$/i) {
-	    # Line pointing to localhost
-	    $haveallowfromlocalhost = 1;
-	} elsif ($line =~ /^\s*(none)\s*$/i) {
-	    # Skip "Allow From None" lines
-	} elsif (!member($line, @sharehosts)) {
-	    # Line pointing to remote server
-	    push(@sharehosts, $line);
-	    if (!member(broadcastaddress($line),
-			@{$printer->{cupsconfig}{keys}{BrowseAddress}})) {
-		$haveallowedhostwithoutbrowseaddress = 1;
-	    }
-	    if (!member($line,
-			@{$printer->{cupsconfig}{keys}{BrowseAllow}})) {
-		$haveallowedhostwithoutbrowseallow = 1;
-	    }
-	}
-    }
-    my $havebrowseaddresswithoutallowedhost = 0;
-    # Go through all "BrowseAdress" lines
-    foreach my $line (@{$printer->{cupsconfig}{keys}{BrowseAddress}}) {
-	if ($line =~ /^\s*(localhost|0*127\.0+\.0+\.0*1)\s*$/i) {
-	    # Skip lines pointing to localhost
-	} elsif ($line =~ /^\s*(none)\s*$/i) {
-	    # Skip "Allow From None" lines
-	} elsif (!member($line, map { broadcastaddress($_) } @sharehosts)) {
-	    # Line pointing to remote server
-	    push(@sharehosts, networkaddress($line));
-	    if ($printer->{cupsconfig}{localprintersshared}) {
-		$havebrowseaddresswithoutallowedhost = 1;
-	    }
-	}
-    }
-    my $havebrowseallowwithoutallowedhost = 0;
-    # Go through all "BrowseAllow" lines
-    foreach my $line (@{$printer->{cupsconfig}{keys}{BrowseAllow}}) {
-	if ($line =~ /^\s*(localhost|0*127\.0+\.0+\.0*1)\s*$/i) {
-	    # Skip lines pointing to localhost
-	} elsif ($line =~ /^\s*(none)\s*$/i) {
-	    # Skip "BrowseAllow None" lines
-	} elsif (!member($line, @sharehosts)) {
-	    # Line pointing to remote server
-	    push(@sharehosts, $line);
-	    #$havebrowseallowwithoutallowedhost = 1;
-	}
-    }
-
-    my $configunsupported = (!$havedenyfromall || $havedenyfromnotall ||
-			     !$havebrowsedenyall || $havebrowsedenynotall ||
-			     !$haveallowfromlocalhost ||
-			     $haveallowedhostwithoutbrowseaddress ||
-			     $havebrowseaddresswithoutallowedhost ||
-			     $haveallowedhostwithoutbrowseallow ||
-			     $havebrowseallowwithoutallowedhost);
-
-    return $configunsupported, @sharehosts;
-}
-
-sub makesharehostlist {
-
-    # Human-readable strings for hosts onto which the local printers
-    # are shared
-
-    my ($printer) = @_;
-
-    my @sharehostlist; 
-    my %sharehosthash;
-    foreach my $host (@{$printer->{cupsconfig}{clientnetworks}}) {
-	if ($host =~ /\@LOCAL/i) {
-	    $sharehosthash{$host} = N("Local network(s)");
-	} elsif ($host =~ /\@IF\((.*)\)/i) {
-	    $sharehosthash{$host} = N("Interface \"%s\"", $1);
-	} elsif ($host =~ m!(/|^\*|\*$|^\.)!) {
-	    $sharehosthash{$host} = N("Network %s", $host);
-	} else {
-	    $sharehosthash{$host} = N("Host %s", $host);
-	}
-	push(@sharehostlist, $sharehosthash{$host});
-    }
-    my %sharehosthash_inv = reverse %sharehosthash;
-
-    return { list => \@sharehostlist, 
-	     hash => \%sharehosthash, 
-	     invhash => \%sharehosthash_inv };
-}
-
-sub makebrowsepolllist {
-
-    # Human-readable strings for hosts from which the print queues are
-    # polled
-
-    my ($printer) = @_;
-
-    my @browsepolllist; 
-    my %browsepollhash;
-    foreach my $host (@{$printer->{cupsconfig}{BrowsePoll}}) {
-	my ($ip, $port);
-	if ($host =~ /^([^:]+):([^:]+)$/) {
-	    $ip = $1;
-	    $port = $2;
-	} else {
-	    $ip = $host;
-	    $port = '631';
-	}
-	$browsepollhash{$host} = N("%s (Port %s)", $ip, $port);
-	push(@browsepolllist, $browsepollhash{$host});
-    }
-    my %browsepollhash_inv = reverse %browsepollhash;
-
-    return { list => \@browsepolllist, 
-	     hash => \%browsepollhash, 
-	     invhash => \%browsepollhash_inv };
-}
-
-sub is_network_ip {
-
-    # Determine whwther the given string is a valid network IP
-
-    my ($address) = @_;
-
-    $address =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/ ||
-	$address =~ /^(\d+\.){1,3}\*$/ ||
-	$address =~ m!^(\d+)\.(\d+)\.(\d+)\.(\d+)/(\d+)$! ||
-	$address =~
-	 m!^(\d+)\.(\d+)\.(\d+)\.(\d+)/(\d+)\.(\d+)\.(\d+)\.(\d+)$!;
-
-}
-
-sub read_cups_config {
-    
-    # Read the information relevant to the printer sharing dialog from
-    # the CUPS configuration
-
-    my ($printer) = @_;
-
-    # From /etc/cups/cupsd.conf
-
-    # Keyword "Browsing" 
-    $printer->{cupsconfig}{keys}{Browsing} =
-	handle_configs::read_unique_directive($printer->{cupsconfig}{cupsd_conf},
-					      'Browsing', 'On');
-
-    # Keyword "BrowseInterval"
-    $printer->{cupsconfig}{keys}{BrowseInterval} =
-	handle_configs::read_unique_directive($printer->{cupsconfig}{cupsd_conf},
-					      'BrowseInterval', '30');
-
-    # Keyword "BrowseAddress" 
-    @{$printer->{cupsconfig}{keys}{BrowseAddress}} =
-	handle_configs::read_directives($printer->{cupsconfig}{cupsd_conf},
-					'BrowseAddress');
-
-    # Keyword "BrowseAllow" 
-    @{$printer->{cupsconfig}{keys}{BrowseAllow}} =
-	handle_configs::read_directives($printer->{cupsconfig}{cupsd_conf},
-					'BrowseAllow');
-
-    # Keyword "BrowseDeny" 
-    @{$printer->{cupsconfig}{keys}{BrowseDeny}} =
-	handle_configs::read_directives($printer->{cupsconfig}{cupsd_conf},
-					'BrowseDeny');
-
-    # Keyword "BrowseOrder" 
-    $printer->{cupsconfig}{keys}{BrowseOrder} =
-	handle_configs::read_unique_directive($printer->{cupsconfig}{cupsd_conf},
-					      'BrowseOrder', 'deny,allow');
-
-    # Keyword "BrowsePoll" (needs "Browsing On")
-    if ($printer->{cupsconfig}{keys}{Browsing} !~ /off/i) {
-	@{$printer->{cupsconfig}{BrowsePoll}} =
-	    handle_configs::read_directives($printer->{cupsconfig}{cupsd_conf},
-					    'BrowsePoll');
-    }
-
-    # Root location
-    @{$printer->{cupsconfig}{rootlocation}} =
-	read_location($printer->{cupsconfig}{cupsd_conf}, '/');
-
-    # Keyword "Allow from" 
-    @{$printer->{cupsconfig}{root}{AllowFrom}} =
-	handle_configs::read_directives($printer->{cupsconfig}{rootlocation},
-					'Allow From');
-    # Remove the IPs pointing to the local machine
-    my @localips = printer::detect::getIPsOfLocalMachine();
-    @{$printer->{cupsconfig}{root}{AllowFrom}} =
-	grep {
-	    !member($_, @localips);
-	} @{$printer->{cupsconfig}{root}{AllowFrom}};
-
-    # Keyword "Deny from" 
-    @{$printer->{cupsconfig}{root}{DenyFrom}} =
-	handle_configs::read_directives($printer->{cupsconfig}{rootlocation},
-					'Deny From');
-
-    # Keyword "Order" 
-    $printer->{cupsconfig}{root}{Order} =
-	handle_configs::read_unique_directive($printer->{cupsconfig}{rootlocation},
-					      'Order', 'Deny,Allow');
-
-    # Widget settings
-
-    # Local printers available to other machines?
-    $printer->{cupsconfig}{localprintersshared} = 
-	localprintersshared($printer);
-
-    # This machine is accepting printers shared by remote machines?
-    $printer->{cupsconfig}{remotebroadcastsaccepted} =
-	remotebroadcastsaccepted($printer);
-
-    # To which machines are the local printers available?
-    ($printer->{cupsconfig}{customsharingsetup},
-     @{$printer->{cupsconfig}{clientnetworks}}) =
-	 clientnetworks($printer);
-
-}
-
-sub write_cups_config {
-    
-    # Write the information edited via the printer sharing dialog into
-    # the CUPS configuration
-
-    my ($printer) = @_;
-
-    # Local printers available to other machines?
-    if ($printer->{cupsconfig}{localprintersshared}) {
-	handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-				      'Browsing On');
-	if ($printer->{cupsconfig}{keys}{BrowseInterval} == 0) {
-	    handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-					  'BrowseInterval 30');
-	}  
-    } else {
-	handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-				      'BrowseInterval 0');
-    }
-
-    # This machine is accepting printers shared by remote machines?
-    if ($printer->{cupsconfig}{remotebroadcastsaccepted}) {
-	handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-				      'Browsing On');
-	if (!$printer->{cupsconfig}{customsharingsetup}) {
-	    # If we broadcast our printers, let's accept the broadcasts
-	    # from the machines to which we broadcast
-	    handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-					  'BrowseDeny All');
-	    handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-					  'BrowseOrder Deny,Allow');
-	}
-    } else {
-	if ($printer->{cupsconfig}{localprintersshared} ||
-	    $#{$printer->{cupsconfig}{BrowsePoll}} >= 0) {
-	    # Deny all broadcasts, but leave all "BrowseAllow" lines
-	    # untouched
-	    handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-					  'BrowseDeny All');
-	      handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-					    'BrowseOrder Allow,Deny');
-	} else {
-	    # We also do not share printers, if we also do not
-	    # "BrowsePoll", we turn browsing off to do not need to deal 
-	    # with any addresses
-	    handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-					  'Browsing Off');
-	}
-    }
-
-    # To which machines are the local printers available?
-    if (!$printer->{cupsconfig}{customsharingsetup}) {
-	my @localips = printer::detect::getIPsOfLocalMachine();
-	# root location block
-	@{$printer->{cupsconfig}{rootlocation}} =
-	    "<Location />\n" .
-	    "Order Deny,Allow\n" .
-	    "Deny From All\n" .
-	    "Allow From 127.0.0.1\n" .
-	    (@localips ?
-	     "Allow From " .
-	     join("\nAllow From ", @localips) .
-	     "\n" : "") .
-	    ($printer->{cupsconfig}{localprintersshared} &&
-	     $#{$printer->{cupsconfig}{clientnetworks}} >= 0 ?
-	     "Allow From " .
-	     join("\nAllow From ", 
-		  grep {
-		      !member($_, @localips);
-		  } @{$printer->{cupsconfig}{clientnetworks}}) .
-	     "\n" : "") .
-	    "</Location>\n";
-	my ($location_start, @_location) = 
-	    rip_location($printer->{cupsconfig}{cupsd_conf}, "/");
-	insert_location($printer->{cupsconfig}{cupsd_conf}, $location_start,
-			@{$printer->{cupsconfig}{rootlocation}});
-	# "BrowseAddress" lines
-	if ($#{$printer->{cupsconfig}{clientnetworks}} >= 0) {
-	    handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-					  'BrowseAddress ' .
-					  join("\nBrowseAddress ",
-						map { broadcastaddress($_) }
-						@{$printer->{cupsconfig}{clientnetworks}}));
-	} else {
-	    handle_configs::comment_directive($printer->{cupsconfig}{cupsd_conf},
-					      'BrowseAddress');
-	}
-	# Set "BrowseAllow" lines
-	if ($#{$printer->{cupsconfig}{clientnetworks}} >= 0) {
-	    handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-					  'BrowseAllow ' .
-					  join("\nBrowseAllow ", 
-						@{$printer->{cupsconfig}{clientnetworks}}));
-	} else {
-	    handle_configs::comment_directive($printer->{cupsconfig}{cupsd_conf},
-					      'BrowseAllow');
-	}
-    }
-
-    # Set "BrowsePoll" lines
-    if ($#{$printer->{cupsconfig}{BrowsePoll}} >= 0) {
-	handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-				      'BrowsePoll ' .
-				      join("\nBrowsePoll ", 
-					    @{$printer->{cupsconfig}{BrowsePoll}}));
-	# "Browsing" must be on for "BrowsePoll" to work
-	handle_configs::set_directive($printer->{cupsconfig}{cupsd_conf},
-				      'Browsing On');
-    } else {
-	handle_configs::comment_directive($printer->{cupsconfig}{cupsd_conf},
-					  'BrowsePoll');
-    }
-
-}
-
-sub clean_cups_config {
-    
-    # Clean $printer data structure from all settings not related to
-    # the CUPS printer sharing dialog
-
-    my ($printer) = @_;
-
-    delete $printer->{cupsconfig}{keys};
-    delete $printer->{cupsconfig}{root};
-    delete $printer->{cupsconfig}{cupsd_conf};
-    delete $printer->{cupsconfig}{rootlocation};
-}
-
-#----------------------------------------------------------------------
-# Handling of /etc/cups/client.conf
-
-sub read_client_conf() {
-    return (0, undef) if (! -r "$::prefix/etc/cups/client.conf");
-    my @client_conf = cat_("$::prefix/etc/cups/client.conf");
-    my @servers = handle_configs::read_directives(\@client_conf, 
-						  "ServerName");
-    return (@servers > 0, 
-	    $servers[0]); # If there is more than one entry in client.conf,
-                          # the first one counts.
-}
-
-sub write_client_conf {
-    my ($daemonless_cups, $remote_cups_server) = @_;
-    # Create the directory for client.conf if needed
-    (-d "$::prefix/etc/cups/") || mkdir("$::prefix/etc/cups/") || return 1;
-    my (@client_conf) = cat_("$::prefix/etc/cups/client.conf");
-    if ($daemonless_cups) {
-	handle_configs::set_directive(\@client_conf, 
-				      "ServerName $remote_cups_server");
-    } else {
-	handle_configs::comment_directive(\@client_conf, "ServerName");
-    }
-    output("$::prefix/etc/cups/client.conf", @client_conf);
-}
-
-
-
-#----------------------------------------------------------------------
-sub read_printers_conf {
-    my ($printer) = @_;
-    my $current;
-
-    #- read /etc/cups/printers.conf file.
-    #- according to this code, we are now using the following keys for each queues.
-    #-    DeviceURI > lpd://printer6/lp
-    #-    Info      > Info Text
-    #-    Location  > Location Text
-    #-    State     > Idle|Stopped
-    #-    Accepting > Yes|No
-    open(my $PRINTERS, "$::prefix/etc/cups/printers.conf") or return;
-    local $_;
-    while (<$PRINTERS>) {
-	chomp;
-	/^\s*#/ and next;
-	if (/^\s*<(?:DefaultPrinter|Printer)\s+([^>]*)>/) { $current = { mode => 'cups', QUEUE => $1, } }
-	elsif (m!\s*</Printer>!) { $current->{QUEUE} && $current->{DeviceURI} or next; #- minimal check of synthax.
-				   add2hash($printer->{configured}{$current->{QUEUE}} ||= {}, $current); $current = undef }
-	elsif (/\s*(\S*)\s+(.*)/) { $current->{$1} = $2 }
-    }
-    close $PRINTERS;
-
-    #- assume this printing system.
-    $printer->{SPOOLER} ||= 'cups';
-}
-
-sub get_direct_uri() {
-    #- get the local printer to access via a Device URI.
-    my @direct_uri;
-    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . "/usr/sbin/lpinfo -v |");
-    local $_;
-    while (<$F>) {
-	/^(direct|usb|serial)\s+(\S*)/ and push @direct_uri, $2;
-    }
-    close $F;
-    @direct_uri;
-}
-
-sub checkppd {
-    # Check whether the PPD file is valid
-    my ($printer, $ppdfile) = @_;
-    return 1 if $printer->{SPOOLER} ne "cups";
-    return run_program::rooted($::prefix, "cupstestppd", "-q",
-			       $ppdfile);
-}
-
-sub installppd {
-    # Install the PPD file in /usr/share/cups/model/printerdrake/
-    my ($printer, $ppdfile) = @_;
-    return "" if !$ppdfile;
-    # Install PPD file
-    mkdir_p("$::prefix/usr/share/cups/model/printerdrake");
-    # "cp_f()" is broken, it hangs infinitely
-    # cp_f($ppdfile, "$::prefix/usr/share/cups/model/printerdrake");
-    run_program::rooted($::prefix, "cp", "-f", $ppdfile,
-			"$::prefix/usr/share/cups/model/printerdrake");
-    $ppdfile =~ s!^(.*)(/[^/]+)$!/usr/share/cups/model/printerdrake$2!;
-    chmod 0644, "$::prefix$ppdfile";
-    # Restart CUPS to register new PPD file
-    printer::services::restart("cups") if $printer->{SPOOLER} eq "cups";
-    # Re-read printer database
-    %thedb = ();
-    # Supplying $ppdfile returns us the key for this PPD file in the
-    # so that we can point to it in the printer/driver list
-    return read_printer_db($printer, $printer->{SPOOLER}, $ppdfile);
-}
-
-sub clean_manufacturer_name {
-    my ($make) = @_;
-    # Clean some manufacturer's names so that every manufacturer has only
-    # one entry in the tree list
-    $make =~ s/^CANON\W.*$/CANON/i;
-    $make =~ s/^LEXMARK.*$/LEXMARK/i;
-    $make =~ s/^HEWLETT?[\s\-]*PACKARD/HP/i;
-    $make =~ s/^SEIKO[\s\-]*EPSON/EPSON/i;
-    $make =~ s/^KYOCERA[\s\-]*MITA/KYOCERA/i;
-    $make =~ s/^CITOH/C.ITOH/i;
-    $make =~ s/^OKI(|[\s\-]*DATA)\s*$/OKIDATA/i;
-    $make =~ s/^(SILENTWRITER2?|COLORMATE)/NEC/i;
-    $make =~ s/^(XPRINT|MAJESTIX)/XEROX/i;
-    $make =~ s/^QMS-PS/QMS/i;
-    $make =~ s/^(PERSONAL|LASERWRITER)/APPLE/i;
-    $make =~ s/^DIGITAL/DEC/i;
-    $make =~ s/\s+Inc\.//i;
-    $make =~ s/\s+Corp\.//i;
-    $make =~ s/\s+SA\.//i;
-    $make =~ s/\s+S\.\s*A\.//i;
-    $make =~ s/\s+Ltd\.//i;
-    $make =~ s/\s+International//i;
-    $make =~ s/\s+Int\.//i;
-    return uc($make);
-}    
-
-sub ppd_entry_str {
-    my ($mf, $descr, $lang) = @_;
-    my ($model, $driver);
-    if ($descr) {
-	# Apply the beautifying rules of poll_ppd_base
-	if ($descr =~ /Foomatic \+ Postscript/) {
-	    $descr =~ s/Foomatic \+ Postscript/PostScript/;
-	} elsif ($descr =~ /Foomatic/i) {
-	    $descr =~ s/Foomatic/GhostScript/i;
-	} elsif ($descr =~ /CUPS\+Gimp-Print/i) {
-	    $descr =~ s/CUPS\+Gimp-Print/CUPS + Gimp-Print/i;
-	} elsif ($descr =~ /CUPS\+Gutenprint/i) {
-	    $descr =~ s/CUPS\+Gutenprint/CUPS + Gutenprint/i;
-	} elsif ($descr =~ /Series CUPS/i) {
-	    $descr =~ s/Series CUPS/Series, CUPS/i;
-	} elsif ($descr !~ /(PostScript|GhostScript|CUPS|Foomatic|PCL|PXL)/i) {
-	    $descr .= ", PostScript";
-	}
-	# Avoid duplicate entries produced by ready-made Foomatic PPDs vs.
-	# the Foomatic XML database
-	$descr =~ s!(Foomatic|GhostScript)\s*/\s*(\S+)!$1 + $2!i;
-	# Split model and driver
-	$descr =~ s/\s*Series//i;
-	$descr =~ s/\((.*?(PostScript|PS.*).*?)\)/$1/i;
-	if ($descr =~
-	     /^\s*(Generic\s*PostScript\s*Printer)\s*,?\s*(.*)$/i ||
-	    $descr =~
-	     /^\s*(PostScript\s*Printer)\s*,?\s*(.*)$/i ||
-	    $descr =~ /^([^,]+?)\s*,?\s*(Foomatic.*)$/i ||
-	    $descr =~ /^([^,]+?)\s*,?\s*(GhostScript.*)$/i ||
-	    $descr =~ /^([^,]+?)\s*,?\s*(CUPS.*)$/i ||
-	    $descr =~ /^([^,]+?)\s*,\s+(PS.*)$/i ||
-	    $descr =~ /^([^,]+?)\s*,\s+(PXL.*)$/i ||
-	    $descr =~ /^([^,]+?)\s*,\s+(PCL.*)$/i ||
-	    $descr =~
-	     /^([^,]+?)\s*,?\s*(\(v?\.?\s*\d\d\d\d\.\d\d\d\).*)$/i ||
-	    $descr =~ /^([^,]+?)\s*,?\s*(v?\.?\s*\d+\.\d+.*)$/i ||
-	    $descr =~ /^([^,]+?)\s*,?\s*(PostScript.*)$/i ||
-	    $descr =~ /^([^,]+?)\s*,\s*(.+?)$/) {
-	    $model = $1;
-	    $driver = $2;
-	    $model =~ s/[\-\s,]+$//;
-	    $driver =~ s/\b(PS|PostScript\b)/PostScript/gi;
-	    $driver =~ s/(PostScript)(.*)(PostScript)/$1$2/i;
-	    $driver =~ s/\b(PXL|PCL[\s\-]*(6|XL)\b)/PCL-XL/gi;
-	    $driver =~ s/(PCL-XL)(.*)(PCL-XL)/$1$2/i;
-	    $driver =~ s/\b(PCL[\s\-]*(|4|5|5c|5e)\b)/PCL/gi;
-	    $driver =~ s/(PCL)(.*)(PCL)/$1$2/i;
-	    $driver =~ 
-	      s/^\s*(\(?v?\.?\s*\d\d\d\d\.\d\d\d\)?|v\d+\.\d+)([,\s]*)(.*?)\s*$/$3$2$1/i;
-	    $driver =~ s/,\s*\(/ (/g;
-	    $driver =~ s/[\-\s,]+$//;
-	    $driver =~ s/^[\-\s,]+//;
-	    $driver =~ s/\s+/ /g;
-	    if ($driver !~ /[a-z]/i) {
-		$driver = "PostScript " . $driver;
-		$driver =~ s/ $//;
-	    }
-	} else {
-	    # Some PPDs do not have the ", <driver>" part.
-	    $model = $descr;
-	    if ($model =~ /\b(PXL|PCL[\s\-]*(6|XL))\b/i) {
-		$driver = "PCL-XL";
-	    } elsif ($model =~ /\b(PCL[\s\-]*(|4|5|5c|5e)\b)/i) {
-		$driver = "PCL";
-	    } else {
-		$driver = "PostScript";
-	    }
-	}
-    }
-    # Remove manufacturer's name from the beginning of the model
-    # name (do not do this with manufacturer names which contain
-    # odd characters)
-    $model =~ s/^$mf[\s\-]+//i 
-	if $mf && $mf !~ m![\\/\(\)\[\]\|\.\$\@\%\*\?]!;
-    # Clean some manufacturer's names
-    $mf = clean_manufacturer_name($mf);
-    # Rename Canon "BJC XXXX" models into "BJC-XXXX" so that the 
-    # models do not appear twice
-    if ($mf eq "CANON") {
-	$model =~ s/BJC\s+/BJC-/;
-    }
-    # New MF devices from Epson have mis-spelled name in PPD files for
-    # native CUPS drivers of Gimp-Print
-    if ($mf eq "EPSON") {
-	$model =~ s/Stylus CX\-/Stylus CX/;
-    }
-    # Remove the "Oki" from the beginning of the model names of Okidata
-    # printers
-    if ($mf eq "OKIDATA") {
-	$model =~ s/Oki\s+//i;
-    }
-    # Try again to remove manufacturer's name from the beginning of the 
-    # model name, this time with the cleaned manufacturer name
-    $model =~ s/^$mf[\s\-]+//i 
-	if $mf && $mf !~ m![\\/\(\)\[\]\|\.\$\@\%\*\?]!;
-    # Translate "(recommended)" in the driver string
-    $driver =~ s/\(recommended\)/$precstr/gi;
-    # Put out the resulting description string
-    uc($mf) . '|' . $model . '|' . $driver .
-      ($lang && " (" . lang::locale_to_main_locale($lang) . ")");
-}
-
-sub get_descr_from_ppd {
-    my ($printer) = @_;
-    #- if there is no ppd, this means this is a raw queue.
-    if (! -r "$::prefix/etc/cups/ppd/$printer->{OLD_QUEUE}.ppd") {
-	return "|" . N("Unknown model");
-    }
-    return get_descr_from_ppdfile($printer, "/etc/cups/ppd/$printer->{OLD_QUEUE}.ppd");
-}
-
-sub get_descr_from_ppdfile {
-    my ($printer, $ppdfile) = @_;
-    my %ppd;
-
-    # Remove ".gz" from end of file name, so that "catMaybeCompressed" works
-    $ppdfile =~ s/\.gz$//;
-
-    eval {
-	local $_;
-	foreach (catMaybeCompressed("$::prefix$ppdfile")) {
-	    # "OTHERS|Generic PostScript printer|PostScript (en)";
-	    /^\*([^\s:]*)\s*:\s*"([^"]*)"/ and
-		do { $ppd{$1} = $2; next };
-	    /^\*([^\s:]*)\s*:\s*([^\s"]*)/   and
-		do { $ppd{$1} = $2; next };
-	}
-    };
-    my $descr = ($ppd{NickName} || $ppd{ShortNickName} || $ppd{ModelName});
-    my $make = $ppd{Manufacturer};
-    my $lang = $ppd{LanguageVersion};
-    my $entry = ppd_entry_str($make, $descr, $lang);
-    if (!$printer->{expert}) {
-	# Remove driver from printer list entry when in recommended mode
-	$entry =~ s/^([^\|]+\|[^\|]+)\|.*$/$1/;
-    }
-    return $entry;
-}
-
-sub ppd_devid_data {
-    my ($ppd) = @_;
-    $ppd = "$::prefix/usr/share/cups/model/$ppd";
-    my @content = eval { catMaybeCompressed($ppd) } or return "", "";
-
-    my ($devidmake, $devidmodel);
-    /^\*Manufacturer:\s*"(.*)"\s*$/ and $devidmake = $1
-	foreach @content;
-    /^\*Product:\s*"\(?(.*?)\)?"\s*$/ and $devidmodel = $1 
-	foreach @content;
-    return $devidmake, $devidmodel;
-}
-
-sub poll_ppd_base {
-    my ($printer, $ppdfile) = @_;
-
-    # If a $ppdfile is supplied, we return the key of the DB entry which
-    # is for this file. This way we can pre-select a freshly added PPD in
-    # the model/driver list.
-
-    #- Before trying to poll the ppd database available to cups, we have 
-    #- to make sure the file /etc/cups/ppds.dat is no more modified.
-    #- If cups continue to modify it (because it reads the ppd files 
-    #- available), the poll_ppd_base program simply cores :-)
-    # else cups will not be happy! and ifup lo do not run ?
-    run_program::rooted($::prefix, 'ifconfig', 'lo', '127.0.0.1');
-    printer::services::start_not_running_service("cups");
-    my $driversthere = scalar(keys %thedb);
-    my $ppdentry = "";
-    $ppdfile = "" if !defined($ppdfile);
-    foreach (1..60) {
-	open(my $PPDS, ($::testing ? $::prefix :
-				 "chroot $::prefix/ ") .
-				 "/usr/bin/poll_ppd_base -a |");
-	local $_;
-	while (<$PPDS>) {
-	    chomp;
-	    my ($ppd, $mf, $descr, $lang) = split /\|/;
-	    if ($ppd eq "raw") { next }
-	    $ppd && $mf && $descr and do {
-		my $key = ppd_entry_str($mf, $descr, $lang);
-		my ($model, $driver) = ($1, $2) if $key =~ /^[^\|]+\|([^\|]+)\|(.*)$/;
-		# Clean some manufacturer's names
-		$mf = clean_manufacturer_name($mf);
-		# Remove language tag
-		$driver =~ s/\s*\([a-z]{2}(|_[A-Z]{2})\)\s*$//;
-		# Recommended Foomatic PPD? Extract "(recommended)"
-		my $isrecommended = 
-		    $driver =~ s/\s+$sprecstr\s*$//i;
-		# Remove trailing white space
-		$driver =~ s/\s+$//;
-		# For Foomatic: Driver with "GhostScript + "
-		my $fullfoomaticdriver = $driver;
-		# Foomatic PPD? Extract driver name
-		my $isfoomatic = 
-		    $driver =~ s!^\s*(GhostScript|Foomatic)(\s*\+\s*|/)!!i;
-		# Foomatic PostScript driver?
-		$isfoomatic ||= $descr =~ /Foomatic/i;
-		# Native CUPS?
-		my $isnativecups = $driver =~ /CUPS/i;
-		# Native PostScript
-		my $isnativeps = !$isfoomatic && !$isnativecups;
-		# Key without language tag (key as it was produced for the
-		# entries from the Foomatic XML database)
-		my $keynolang = $key;
-		$keynolang =~ s/\s*\([a-z]{2}(|_[A-Z]{2})\)\s*$//;
-		if (!$isfoomatic) {
-		    # Driver is PPD when the PPD is a non-Foomatic one
-		    $driver = "PPD";
-		} else {
-		    # Remove language tag in menu entry when PPD is from
-		    # Foomatic
-		    $key = $keynolang;
-		}
-	        my ($devidmake, $devidmodel, $deviddesc, $devidcmdset);
-		# Replace an existing printer entry if it has linked
-		# to the current PPD file.
-		my ($filename, $ppdkey);
-		$ppd =~ m!([^/]+\.ppd)(\.gz|\.bz2|)$!;
-		if (($filename = $1) && 
-		    ($#{$linkedppds{$filename}} >= 0)) {
-		    foreach $ppdkey (@{$linkedppds{$filename}}) {
-			next if !defined($thedb{$ppdkey});
-			# Save the autodetection data
-			$devidmake = $thedb{$ppdkey}{devidmake};
-			$devidmodel = $thedb{$ppdkey}{devidmodel};
-			$deviddesc = $thedb{$ppdkey}{deviddesc};
-			$devidcmdset = $thedb{$ppdkey}{devidcmdset};
-			# We must preserve make and model if we have one
-			# PPD for multiple printers
-			my $oldmake = $thedb{$ppdkey}{make};
-			my $oldmodel = $thedb{$ppdkey}{model};
-			# Remove the old entry
-			delete $thedb{$ppdkey};
-			my $newkey = $key;
-			# User-added PPD file, mark it
-			if ($ppd =~ m!printerdrake/!i) {
-			    $newkey .= ", " . N("user-supplied");
-			}
-			# Newly added PPD file, mark it
-			if ($ppdfile eq "/usr/share/cups/model/$ppd") {
-			    $newkey .= ", " . N("NEW");
-			}
-			if (!$printer->{expert}) {
-			    # Remove driver part in recommended mode
-			    $newkey =~ s/^([^\|]+\|[^\|]+)\|.*$/$1/;
-			} else {
-			    # If the Foomatic entry is "recommended" let
-			    # the new PPD entry be "recommended" and
-			    # otherwise not
-			    $newkey =~ s/\s*$sprecstr//g;
-			    $newkey .= " $precstr" 
-				if $ppdkey =~ m!$sprecstr!;
-			    # Remove duplicate "recommended" tags and have 
-			    # the "recommended" tag at the end
-			    $newkey =~
-				s/(\s*$sprecstr)(.*?)(\s*$sprecstr)/$2$3/;
-			    $newkey =~ s/(\s*$sprecstr)(.+)$/$2$1/;
-			}
-			# Conserve the make and model of the original entry
-			$newkey =~
-			    s/^([^\|]+)(\|[^\|]+)(\|.*|)$/$oldmake$2$3/;
-			$newkey =~
-			    s/^([^\|]+\|)([^\|]+)(\|.*|)$/$1$oldmodel$3/;
-			# Do not overwrite another entry which has the
-			# same key, consider different PPD files with
-			# the same identity as a bug and drop them
-			if ($thedb{$newkey}) {
-			    next;
-			}
-			# Create the new entry
-			$thedb{$newkey}{ppd} = $ppd;
-			$thedb{$newkey}{make} = $oldmake;
-			$thedb{$newkey}{model} = $oldmodel;
-			$thedb{$newkey}{driver} = $driver;
-			# Recover saved autodetection data
-			$thedb{$newkey}{devidmake} = $devidmake
-			    if $devidmake;
-			$thedb{$newkey}{devidmodel} = $devidmodel
-			    if $devidmodel;
-			$thedb{$newkey}{deviddesc} = $deviddesc
-			    if $deviddesc;
-			$thedb{$newkey}{devidcmdset} = $devidcmdset
-			    if $devidcmdset;
-			# Rememeber which entry is the freshly added 
-			# PPD file
-			$ppdentry = $newkey if
-			    $ppdfile eq "/usr/share/cups/model/$ppd";
-		    }
-		    next;
-		} elsif (!$printer->{expert}) {
-		    # Remove driver from printer list entry when in
-		    # recommended mode
-		    $key =~ s/^([^\|]+\|[^\|]+)\|.*$/$1/;
-		    # Only replace an existing printer entry if
-		    #  - its driver is not the same as the driver of the
-		    #    new one
-		    # AND if one of the following items is true
-		    #  - The existing entry uses a "Foomatic + Postscript" 
-		    #    driver and the new one is native PostScript
-		    #  - The existing entry is a Foomatic entry and the new 
-		    #    one is "recommended"
-		    #  - The existing entry is a native PostScript entry
-		    #    and the new entry is a "recommended" driver other
-		    #    then "Foomatic + Postscript"
-		    if (defined($thedb{$key})) {
-			next if lc($thedb{$key}{driver}) eq
-				     lc($driver);
-			if ($isnativeps &&
-                            $thedb{$key}{driver} =~ /^PostScript$/i ||
-                            $thedb{$key}{driver} ne "PPD" && $isrecommended ||
-                            $thedb{$key}{driver} eq "PPD" && $isrecommended && $driver ne "PostScript") {
-			    # Save the autodetection data
-			    $devidmake = $thedb{$key}{devidmake};
-			    $devidmodel = $thedb{$key}{devidmodel};
-			    $deviddesc = $thedb{$key}{deviddesc};
-			    $devidcmdset = $thedb{$key}{devidcmdset};
-                            # Remove the old entry
-                            delete $thedb{$key};
-                        } else {
-                            next;
-                        }
-		    }
-		} elsif ((defined 
-			   $thedb{"$mf|$model|$fullfoomaticdriver"} ||
-			  defined 
-			   $thedb{"$mf|$model|$fullfoomaticdriver $precstr"}) && 
-			 $isfoomatic) {
-		    # Expert mode: There is already an entry for the
-		    # same printer/driver combo produced by the
-		    # Foomatic XML database, so do not make a second
-		    # entry
-		    next;
-		} elsif (defined
-			 $thedb{"$mf|$model|PostScript $precstr"} &&
-			 $isnativeps) {
-		    # Expert mode: "Foomatic + Postscript" driver is
-		    # recommended and this is a PostScript PPD? Make
-		    # this PPD the recommended one
-		    foreach (keys 
-		         %{$thedb{"$mf|$model|PostScript $precstr"}}) {
-			$thedb{"$mf|$model|PostScript"}{$_} =
-			  $thedb{"$mf|$model|PostScript $precstr"}{$_};
-		    }
-		    delete
-			$thedb{"$mf|$model|PostScript $precstr"};
-		    if (!$isrecommended) {
-			$key .= " $precstr";
-		    }
-		} elsif ($driver =~ /PostScript/i &&
-			 $isrecommended && $isfoomatic &&
-			 (my @foundkeys = grep {
-			     /^$mf\|$model\|/ && !/CUPS/i &&
-			     $thedb{$_}{driver} eq "PPD";
-			 } keys %thedb)) {
-		    # Expert mode: "Foomatic + Postscript" driver is
-		    # recommended and there was a PostScript PPD? Make
-		    # the PostScript PPD the recommended one
-		    my $firstfound = $foundkeys[0];
-		    if (!(any { /$sprecstr/ } @foundkeys)) {
-			# Do it only if none of the native PostScript
-			# PPDs for this printer is already "recommended"
-			foreach (keys %{$thedb{$firstfound}}) {
-			    $thedb{"$firstfound $precstr"}{$_} =
-				$thedb{$firstfound}{$_};
-			}
-			delete $thedb{$firstfound};
-		    }
-		    $key =~ s/\s*$sprecstr//;
-		} elsif ($driver !~ /PostScript/i &&
-			 $isrecommended && $isfoomatic &&
-			 (@foundkeys = grep {
-			     /^$mf\|$model\|.*$sprecstr/ && 
-			     !/CUPS/i && $thedb{$_}{driver} eq "PPD";
-			 } keys %thedb)) {
-		    # Expert mode: Foomatic driver other than "Foomatic +
-		    # Postscript" is recommended and there was a PostScript 
-		    # PPD which was recommended? Make the Foomatic driver
-		    # the recommended one
-		    foreach my $sourcekey (@foundkeys) {
-			# Remove the "recommended" tag
-			my $destkey = $sourcekey;
-			$destkey =~ s/\s+$sprecstr\s*$//i;
-			foreach (keys %{$thedb{$sourcekey}}) {
-			    $thedb{$destkey}{$_} = $thedb{$sourcekey}{$_};
-			}
-			delete $thedb{$sourcekey};
-		    }
-		}
-		
-		# User-added PPD file, mark it
-		if ($ppd =~ m!printerdrake/!i) {
-		    $key .= ", " . N("user-supplied");
-		}
-		# Newly added PPD file, mark it
-		if ($ppdfile eq "/usr/share/cups/model/$ppd") {
-		    $key .= ", " . N("NEW");
-		}
-		# Remove duplicate "recommended" tags and have the
-		# "recommended" tag at the end
-		$key =~ s/(\s*$sprecstr)(.*?)(\s*$sprecstr)/$2$3/;
-		$key =~ s/(\s*$sprecstr)(.+)$/$2$1/;
-		# Do not overwrite another entry which has the same
-		# key, consider different PPD files with the same identity
-		# as a bug and drop them
-		if ($thedb{$key}) {
-		    next;
-		}
-		# Create the new entry
-	        $thedb{$key}{ppd} = $ppd;
-		$thedb{$key}{make} = $mf;
-		$thedb{$key}{model} = $model;
-		$thedb{$key}{driver} = $driver;
-		# Recover saved autodetection data
-		$thedb{$key}{devidmake} = $devidmake if $devidmake;
-		$thedb{$key}{devidmodel} = $devidmodel if $devidmodel;
-		$thedb{$key}{deviddesc} = $deviddesc if $deviddesc;
-		$thedb{$key}{devidcmdset} = $devidcmdset if $devidcmdset;
-		# Get autodetection data
-		#my ($devidmake, $devidmodel) = ppd_devid_data($ppd);
-		#$thedb{$key}{devidmake} = $devidmake;
-		#$thedb{$key}{devidmodel} = $devidmodel;
-		# Rememeber which entry is the freshly added PPD file
-		$ppdentry = $key if
-		    $ppdfile eq "/usr/share/cups/model/$ppd";
-	    };
-	}
-	close $PPDS;
-	scalar(keys %thedb) - $driversthere > 5 and last;
-	#- we have to try again running the program, wait here a little 
-	#- before.
-	sleep 1;
-    }
-    #scalar(keys %descr_to_ppd) > 5 or 
-    #  die "unable to connect to cups server";
-
-    return $ppdentry;
-}
-
-
-
-#-******************************************************************************
-#- write functions
-#-******************************************************************************
-
-sub configure_queue($) {
-    my ($printer) = @_;
-
-    #- Create the queue with "foomatic-configure", in case of queue
-    #- renaming copy the old queue
-    my $quotedconnect = $printer->{currentqueue}{connect};
-    $quotedconnect =~ s/\$/\\\$/g; # Quote '$' in URI
-    run_program::rooted($::prefix, "foomatic-configure", "-q",
-			"-s", $printer->{currentqueue}{spooler},
-			"-n", $printer->{currentqueue}{queue},
-			($printer->{currentqueue}{queue} ne 
-			 $printer->{OLD_QUEUE} &&
-			 $printer->{configured}{$printer->{OLD_QUEUE}} ?
-			 ("-C", $printer->{OLD_QUEUE}) : ()),
-			"-c", $quotedconnect,
-			($printer->{currentqueue}{ppd} ?
-			 ($printer->{currentqueue}{ppd} ne '1' ?
-			  ("--ppd",
-			   ($printer->{currentqueue}{ppd} !~ m!^/! ?
-			    "/usr/share/cups/model/" : "") .
-			   $printer->{currentqueue}{ppd}) : ()) :
-			 ($printer->{currentqueue}{foomatic} ?
-			  ("-p", $printer->{currentqueue}{printer},
-			   "-d",($printer->{currentqueue}{driver} ne "PPD" ?
-				 $printer->{currentqueue}{driver} :
-				 "Postscript")) :
-			  ("-d", "raw"))),
-			"-N", $printer->{currentqueue}{desc},
-			"-L", $printer->{currentqueue}{loc},
-			if_($printer->{SPOOLER} eq "cups",
-			    "--backend-dont-disable=" . 
-			    $printer->{currentqueue}{dd},
-			    "--backend-attempts=" . 
-			    $printer->{currentqueue}{att},
-			    "--backend-delay=" . 
-			    $printer->{currentqueue}{delay}),
-			@{$printer->{currentqueue}{options}}
-			) or return 0;
-    if ($printer->{currentqueue}{ppd} &&
-	($printer->{currentqueue}{ppd} ne '1')) {
-	# Add a comment line containing the path of the used PPD file to the
-	# end of the PPD file
-	if ($printer->{currentqueue}{ppd} ne '1') {
-	    append_to_file("$::prefix/etc/cups/ppd/$printer->{currentqueue}{queue}.ppd", "*%MDKMODELCHOICE:$printer->{currentqueue}{ppd}\n");
-	}
-    }	  
-
-    # Make sure that queue is active
-    if ($printer->{NEW} && ($printer->{SPOOLER} ne "pdq")) {
-        run_program::rooted($::prefix, "foomatic-printjob",
-			    "-s", $printer->{currentqueue}{spooler},
-			    "-C", "up", $printer->{currentqueue}{queue});
-    }
-
-    # Check whether a USB printer is configured and activate USB printing if so
-    my $useUSB = 0;
-    foreach (values %{$printer->{configured}}) {
-	$useUSB ||= $_->{queuedata}{connect} =~ /usb/i || 
-	    $_->{DeviceURI} =~ /usb/i;
-    }
-    $useUSB ||= $printer->{currentqueue}{connect} =~ /usb/i;
-    if ($useUSB) {
-	my $f = "$::prefix/etc/sysconfig/usb";
-	my %usb = getVarsFromSh($f);
-	$usb{PRINTER} = "yes";
-	setVarsInSh($f, \%usb);
-    }
-
-    # Open permissions for device file when PDQ is chosen as spooler
-    # so normal users can print.
-    if ($printer->{SPOOLER} eq 'pdq') {
-	if ($printer->{currentqueue}{connect} =~ 
-	    m!^\s*(file|parallel|usb|serial):(\S*)\s*$!) {
-	    set_permissions($1, "666");
-	}
-    }
-
-    # Make a new printer entry in the $printer structure
-    $printer->{configured}{$printer->{currentqueue}{queue}}{queuedata} =
-        {};
-    copy_printer_params($printer->{currentqueue},
-      $printer->{configured}{$printer->{currentqueue}{queue}}{queuedata});
-    # Construct an entry line for tree view in main window of
-    # printerdrake
-    make_menuentry($printer, $printer->{currentqueue}{queue});
-
-    # Store the default option settings
-    $printer->{configured}{$printer->{currentqueue}{queue}}{args} = {};
-    $printer->{configured}{$printer->{currentqueue}{queue}}{args} =
-	$printer->{ARGS};
-
-    # In case of CUPS set some more useful defaults for text and image 
-    # printing
-    if ($printer->{SPOOLER} eq "cups") {
-	set_cups_special_options($printer,
-				 $printer->{currentqueue}{queue});
-    }
-
-    # Clean up
-    delete($printer->{ARGS});
-    $printer->{OLD_CHOICE} = "";
-    $printer->{ARGS} = {};
-    $printer->{DBENTRY} = "";
-    $printer->{currentqueue} = {};
-
-    return 1;
-}
-
-sub enable_disable_queue {
-    my ($printer, $queue, $state) = @_;
-    
-    if (($printer->{SPOOLER} ne "pdq") &&
-	($printer->{SPOOLER} ne "rcups")) {
-        run_program::rooted($::prefix, "foomatic-printjob",
-			    "-s", $printer->{SPOOLER},
-			    "-C", ($state ? "start" : "stop"), $queue);
-    }
-}
-
-sub remove_queue($$) {
-    my ($printer, $queue) = @_;
-    run_program::rooted($::prefix, "foomatic-configure", "-R", "-q",
-			"-s", $printer->{SPOOLER},
-			"-n", $queue);
-    # Delete old stuff from data structure
-    delete $printer->{configured}{$queue};
-    delete($printer->{currentqueue});
-    delete($printer->{ARGS});
-    $printer->{OLD_CHOICE} = "";
-    $printer->{ARGS} = {};
-    $printer->{DBENTRY} = "";
-    $printer->{currentqueue} = {};
-}
-
-sub restart_queue($) {
-    my ($printer) = @_;
-    my $queue = $printer->{QUEUE};
-
-    # Restart the daemon(s)
-    for ($printer->{SPOOLER}) {
-	/cups/ and do {
-	    #- restart cups.
-	    printer::services::restart("cups");
-	    last };
-	/lpr|lprng/ and do {
-	    #- restart lpd.
-	    foreach ("/var/spool/lpd/$queue/lock", "/var/spool/lpd/lpd.lock") {
-		my $pidlpd = (cat_("$::prefix$_"))[0];
-		kill 'TERM', $pidlpd if $pidlpd;
-		unlink "$::prefix$_";
-	    }
-	    printer::services::restart("lpd"); sleep 1;
-	    last };
-    }
-    # Kill the jobs
-    run_program::rooted($::prefix, "foomatic-printjob", "-R",
-			"-s", $printer->{SPOOLER},
-			"-P", $queue, "-");
-
-}
-
-sub print_pages($@) {
-    my ($printer, @pages) = @_;
-    my $queue = $printer->{QUEUE};
-    my $lpr = "/usr/bin/foomatic-printjob";
-    my $lpq = "$lpr -Q";
-    my $spooler = $printer->{SPOOLER};
-    $spooler = "cups" if $spooler eq "rcups";
-
-    # Print the pages
-    foreach (@pages) {
-	my $page = $_;
-	# Only text and PostScript can be printed directly with all
-	# spoolers, images must be treated seperately
-	if ($page =~ /\.jpg$/) {
-	    if ($spooler ne "cups") {
-		# Use "convert" from ImageMagick for non-CUPS spoolers
-		system(($::testing ? $::prefix : "chroot $::prefix/ ") .
-		       "/usr/bin/convert $page -page 427x654+100+65 PS:- | " .
-		       ($::testing ? $::prefix : "chroot $::prefix/ ") .
-		       "$lpr -s $spooler -P $queue");
-	    } else {
-		# Use CUPS's internal image converter with CUPS, tell it
-		# to let the image occupy 90% of the page size (so nothing
-		# gets cut off by unprintable borders)
-		run_program::rooted($::prefix, $lpr, "-s", $spooler,
-				    "-P", $queue, "-o", "scaling=90", $page);
-	    }		
-	} else {
-	    run_program::rooted($::prefix, $lpr, "-s", $spooler,
-				"-P", $queue, $page);
-	}
-    }
-    sleep 5; #- allow lpr to send pages.
-    # Check whether the job is queued
-    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . "$lpq -s $spooler -P $queue |");
-    my @lpq_output =
-	grep { !/^no entries/ && !(/^Rank\s+Owner/ .. /^\s*$/) } <$F>;
-    close $F;
-    @lpq_output;
-}
-
-sub help_output {
-    my ($printer, $spooler) = @_;
-    my $queue = $printer->{QUEUE};
-
-    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") . sprintf($spoolers{$spooler}{help}, $queue));
-    my $helptext = join("", <$F>);
-    close $F;
-    $helptext ||= "Option list not available!\n";
-    return $helptext;
-}
-
-sub print_optionlist {
-    my ($printer) = @_;
-    my $queue = $printer->{QUEUE};
-    my $lpr = "/usr/bin/foomatic-printjob";
-
-    # Print the option list pages
-    if ($printer->{configured}{$queue}{queuedata}{foomatic}) {
-        run_program::rooted($::prefix, $lpr, "-s", $printer->{SPOOLER},
-			    "-P", $queue, "-o", "docs",
-			    "/etc/bashrc");
-    } elsif ($printer->{configured}{$queue}{queuedata}{ppd}) {
-	system(($::testing ? $::prefix : "chroot $::prefix/ ") .
-	       "/usr/bin/lphelp $queue | " .
-	       ($::testing ? $::prefix : "chroot $::prefix/ ") .
-	       "$lpr -s $printer->{SPOOLER} -P $queue");
-    }
-}
-
-# ---------------------------------------------------------------
-#
-# Spooler config stuff
-#
-# ---------------------------------------------------------------
-
-sub get_copiable_queues {
-    my ($oldspooler, $newspooler) = @_;
-
-    # No local queues available in daemon-less CUPS mode
-    return () if ($oldspooler eq "rcups") or ($newspooler eq "rcups");
-
-    my @queuelist;      #- here we will list all Foomatic-generated queues
-    # Get queue list with foomatic-configure
-    open(my $QUEUEOUTPUT, ($::testing ? $::prefix : "chroot $::prefix/ ") .
-	    "foomatic-configure -Q -q -s $oldspooler |") or
-		die "Could not run foomatic-configure";
-
-    my $entry = {};
-    my $inentry = 0;
-    local $_;
-    while (<$QUEUEOUTPUT>) {
-	chomp;
-	if ($inentry) {
-	    # We are inside a queue entry
-	    if (m!^\s*</queue>\s*$!) {
-		# entry completed
-		$inentry = 0;
-		if ($entry->{foomatic} && $entry->{spooler} eq $oldspooler) {
-		    # Is the connection type supported by the new
-		    # spooler?
-		    if ($newspooler eq "cups" && $entry->{connect} =~ /^(file|hp|ptal|lpd|socket|smb|ipp):/ ||
-                  $newspooler =~ /^(lpd|lprng)$/ && $entry->{connect} =~ /^(file|ptal|lpd|socket|smb|ncp|postpipe):/ ||
-                  $newspooler eq "pdq" && $entry->{connect} =~ /^(file|ptal|lpd|socket):/) {
-                  push(@queuelist, $entry->{name});
-		    }
-		}
-		$entry = {};
-	    } elsif (m!^\s*<name>(.+)</name>\s*$!) {
-		    # queue name
-		    $entry->{name} = $1;
-	    } elsif (m!^\s*<connect>(.+)</connect>\s*$!) {
-		    # connection type (URI)
-		    $entry->{connect} = $1;
-	    }
-	} else {
-	    if (m!^\s*<queue\s+foomatic\s*=\s*"?(\d+)"?\s*spooler\s*=\s*"?(\w+)"?\s*>\s*$!) {
-		# new entry
-		$inentry = 1;
-		$entry->{foomatic} = $1;
-		$entry->{spooler} = $2;
-	    }
-	}
-    }
-    close $QUEUEOUTPUT;
-
-    return @queuelist;
-}
-
-sub copy_foomatic_queue {
-    my ($printer, $oldqueue, $oldspooler, $newqueue) = @_;
-    run_program::rooted($::prefix, "foomatic-configure", "-q",
-			"-s", $printer->{SPOOLER},
-			"-n", $newqueue,
-			"-C", $oldspooler, $oldqueue);
-    # In case of CUPS set some more useful defaults for text and image printing
-    if ($printer->{SPOOLER} eq "cups") {
-	set_cups_special_options($printer, $newqueue);
-    }
-}
-
-# ------------------------------------------------------------------
-#
-# Stuff for non-interactive printer configuration
-#
-# ------------------------------------------------------------------
-
-# Check whether a given URI (for example of an existing queue matches
-# one of the auto-detected printers
-
-sub autodetectionentry_for_uri {
-    my ($uri, @autodetected) = @_;
-
-    if ($uri =~ m!^usb://([^/]+)/([^\?]+)(|\?serial=(\S+))$!) {
-	# USB device with URI referring to printer model
-	my $make = $1;
-	my $model = $2;
-	my $serial = $4;
-	if ($make && $model) {
-	    $make =~ s/\%20/ /g;
-	    $model =~ s/\%20/ /g;
-	    $serial =~ s/\%20/ /g;
-	    $make =~ s/Hewlett[-\s_]Packard/HP/;
-	    $make =~ s/HEWLETT[-\s_]PACKARD/HP/;
-	    my $smake = handle_configs::searchstr($make);
-	    my $smodel = handle_configs::searchstr($model);
-	    foreach my $p (@autodetected) {
-		next if $p->{port} !~ /usb/i;
-		next if ((!$p->{val}{MANUFACTURER} ||
-                    $p->{val}{MANUFACTURER} ne $make) &&
-                   (!$p->{val}{DESCRIPTION} ||
-                    $p->{val}{DESCRIPTION} !~ /^\s*$smake\s+/));
-		next if ((!$p->{val}{MODEL} ||
-			  $p->{val}{MODEL} ne $model) &&
-			 (!$p->{val}{DESCRIPTION} ||
-			  $p->{val}{DESCRIPTION} !~ /\s+$smodel\s*$/));
-		next if ($serial &&
-			 (!$p->{val}{SERIALNUMBER} ||
-			  $p->{val}{SERIALNUMBER} ne $serial));
-		return $p;
-	    }
-	}
-    } elsif ($uri =~ m!^hp:/(usb|par|net)/!) {
-	# HP printer (controlled by HPLIP)
-	my $hplipdevice = $uri;
-	$hplipdevice =~ m!^hp:/(usb|par|net)/(\S+?)(\?(serial|device)=(\S+)|)$!;
-	my $bus = $1;
-	my $model = $2;
-	my $serial = undef;
-	my $device = undef;
-	if ($4 eq 'serial') {
-	    $serial = $5;
-	} elsif ($4 eq 'device') {
-	    $device = $5;
-	}
-	$model =~ s/_/ /g;
-	foreach my $p (@autodetected) {
-	    next if (!$p->{port}) ||
-		(($p->{port} =~ m!/usb!) && ($bus ne "usb")) ||
-		(($p->{port} =~ m!/dev/(lp|par.*|printer.*)\d+!) &&
-		 ($bus ne "par"));
-	    next if !$p->{val}{MODEL};
-	    if (uc($p->{val}{MODEL}) ne uc($model)) {
-		my $entry = hplip_device_entry($p->{port}, @autodetected);
-		next if !$entry;
-		my $m = $entry->{model};
-		$m =~ s/_/ /g;
-		next if uc($m) ne uc($model);
-	    }
-	    next if ($serial && !$p->{val}{SERIALNUMBER}) ||
-		(!$serial && $p->{val}{SERIALNUMBER}) ||
-		(uc($serial) ne uc($p->{val}{SERIALNUMBER}));
-	    if ($device) {
-		if ($bus eq "par") {
-		    $device =~ m!/dev/(lp|parport|printer/)(\d+)!;
-		    my $parporthplip = $1;
-		    $p->{port} =~ m!/dev/(lp|parport|printer/)(\d+)!;
-		    my $parportauto = $1;
-		    next if $parporthplip != $parportauto;
-		} else {
-		    next if $device ne $p->{port};
-		}
-	    }
-	    return $p;
-	}
-    } elsif ($uri =~ m!^ptal://?mlc:!) {
-	# HP multi-function device (controlled by HPOJ)
-	my $ptaldevice = $uri;
-	$ptaldevice =~ s!^ptal://?mlc:!!;
-	if ($ptaldevice =~ /^par:(\d+)$/) {
-	    my $device = "/dev/lp$1";
-	    foreach my $p (@autodetected) {
-		next if !$p->{port} ||
-			 $p->{port} ne $device;
-		return $p;
-	    }
-	} else {
-	    my $model = $2 if $ptaldevice =~ /^(usb|par):(.*)$/;
-	    $model =~ s/_/ /g;
-	    foreach my $p (@autodetected) {
-		next if !$p->{val}{MODEL} ||
-			 $p->{val}{MODEL} ne $model;
-		return $p;
-	    }
-	}
-    } elsif ($uri =~ m!^(socket|smb|file|parallel|usb|serial):/!) {
-	# Local print-only device, Ethernet-(TCP/Socket)-connected printer, 
-	# or printer on Windows server
-	my $device = $uri;
-	$device =~ s/^(file|parallel|usb|serial)://;
-	foreach my $p (@autodetected) {
-	    next if !$p->{port} ||
-		     $p->{port} ne $device;
-	    return $p;
-	}
-    }
-    return undef;
-}
-
-# ------------------------------------------------------------------
-#
-# Configuration of HP printers and multi-function devices with HPLIP
-#
-# ------------------------------------------------------------------
-
-sub read_hplip_db {
-
-    # Read the device database XML file which comes with the HPLIP
-    # package
-    open(my $F, "< $::prefix/usr/share/hplip/data/xml/models.xml") or
-	warn "Could not read /usr/share/hplip/data/xml/models.xml\n";
-
-    my $entry = {};
-    my $inentry = 0;
-    my $inrX = 0;
-    my $incomment = 0;
-    my %hplipdevices;
-    local $_;
-    while (<$F>) {
-	chomp;
-	if ($incomment) {
-	    # In a comment block, skip all except the end of the comment
-	    if (m!^(.*?)-->(.*)$!) {
-		# End of comment, keep rest of line
-		$_ = $2;
-		$incomment = 0;
-	    } else {
-		# Skip line
-		$_ = '';
-	    }
-	} else {
-	    while (m/^(.*?)<!--(.*?)-->(.*)$/) {
-		# Remove one-line comments
-		$_ = $1 . $3;
-	    }
-	    if (m/^(.*?)<!--(.*)$/) {
-		# Start of comment, keep the beginning of the line
-		$_ = $1;
-		$incomment = 1;
-	    }
-	}
-	# Is there some non-comment part left in the line
-	if (m!\S!) {
-	    if ($inentry) {
-		# We are inside a device entry
-		if ($inrX) {
-		    # We are in one of the the device's <rX> sections,
-		    # skip the section
-		    if (m!^\s*</r\d+>\s*$!) {
-			# End of <rX> section
-			$inrX = 0;
-		    }
-		} else {
-		    if (m!^\s*<r\d+>\s*$!) {
-			# Start of <rX> section
-			$inrX = 1;
-		    } elsif (m!^\s*</model>\s*$!) {
-			# End of device entry
-			$inentry = 0;
-			my $devidmodel;
-			if ($entry->{$devidmodel}) {
-			    $devidmodel = $entry->{devidmodel};
-			    $devidmodel =~ s/ /_/g;
-			} else {
-			    $devidmodel = $entry->{model};
-			}
-			$hplipdevices{$devidmodel} = $entry;
-			$entry = {};
-		    } elsif (m!^\s*<id>\s*([^<>]+)\s*</id>\s*$!) {
-			# Full ID string
-			my $idstr = $1;
-			$idstr =~ m!(MFG|MANUFACTURER):([^;]+);!i
-			    and $entry->{devidmake} = $2;
-			$idstr =~ m!(MDL|MODEL):([^;]+);!i
-			    and $entry->{devidmodel} = $2;
-			$idstr =~ m!(DES|DESCRIPTION):([^;]+);!i
-			    and $entry->{deviddesc} = $2;
-			$idstr =~ m!(CMD|COMMAND\s*SET):([^;]+);!i
-			    and $entry->{devidcmdset} = $2;
-		    } elsif (m!^\s*<io support="(\d+)".*/>\s*$!) {
-			# Input/Output ports explicitly supported by HPLIP
-			my $ports = $1;
-			$entry->{bus}{par} = 1 if ($ports & 1); 
-			$entry->{bus}{usb} = 1 if ($ports & 2); 
-			$entry->{bus}{net} = 1 if ($ports & 4); 
-		    } elsif (m!^\s*<tech type="(\d+)"/>\s*$!) {
-			# Printing technology
-			$entry->{tech} = $1;
-		    } elsif (m!^\s*<align type="(\d+)"/>\s*$!) {
-			# Head alignment type
-			$entry->{align} = $1;
-		    } elsif (m!^\s*<clean type="(\d+)"/>\s*$!) {
-			# Head cleaning type
-			$entry->{clean} = $1;
-		    } elsif (m!^\s*<color-cal type="(\d+)"/>\s*$!) {
-			# Color calibration type
-			$entry->{colorcal} = $1;
-		    } elsif (m!^\s*<status type="(\d+)"/>\s*$!) {
-			# Status request type
-			$entry->{status} = $1;
-		    } elsif (m!^\s*<scan type="(\d+)"/>\s*$!) {
-			# Scanner access type
-			$entry->{scan} = $1;
-		    } elsif (m!^\s*<fax type="(\d+)"/>\s*$!) {
-			# Fax access type
-			$entry->{fax} = $1;
-		    } elsif (m!^\s*<pcard type="(\d+)"/>\s*$!) {
-			# Memory card access type
-			$entry->{card} = $1;
-		    } elsif (m!^\s*<copy type="(\d+)"/>\s*$!) {
-			# Copier access type
-			$entry->{copy} = $1;
-		    }
-		}
-	    } else {
-		# We are not in a printer entry
-		if (m!^\s*<\s*model\s+name=\"(\S+)\"\a*>\s*$!) {
-		    $inentry = 1;
-		    # HPLIP model ID
-		    $entry->{model} = $1;
-		}
-	    }
-	}
-    }
-    close $F;
-    return \%hplipdevices;
-}
-
-sub hplip_simple_model {
-    my ($model) = @_;
-    my $simplemodel = $model;
-    $simplemodel =~ s/[^A-Za-z0-9]//g;
-    $simplemodel =~ s/HewlettPackard/HP/gi;
-    $simplemodel =~ s/HP//gi;
-    $simplemodel =~ s/(DeskJet\d+C?)([a-z]*?)/$1/gi;
-    $simplemodel =~ s/((LaserJet|OfficeJet|PhotoSmart|PSC)\d+)([a-z]*?)/$1/gi;
-    $simplemodel =~ s/DeskJet/DJ/gi;
-    $simplemodel =~ s/PhotoSmartP/PhotoSmart/gi;
-    $simplemodel =~ s/LaserJet/LJ/gi;
-    $simplemodel =~ s/OfficeJet/OJ/gi;
-    $simplemodel =~ s/Series//gi;
-    $simplemodel = uc($simplemodel);
-    return $simplemodel;
-}
-
-sub hplip_device_entry {
-    my ($device, @autodetected) = @_;
-
-    # Currently, only local or TCP/Socket device work
-    return undef if ($device !~ /usb/i) && 
-	($device !~ m!/dev/(lp|par.*|printer.*)\d+!) &&
-	($device !~ m!^socket://!i);
-
-    if (!$hplipdevicesdb) {
-	# Read the HPLIP device database if not done already
-	$hplipdevicesdb = read_hplip_db();
-    }
-
-    my $entry;
-    foreach my $a (@autodetected) {
-	$device eq $a->{port} or next;
-	# Only HP devices supported
-	return undef if $a->{val}{MANUFACTURER} !~ /^\s*HP\s*$/i;
-	my $modelstr = $a->{val}{MODEL};
-	$modelstr =~ s/ /_/g;
-	if ($entry = $hplipdevicesdb->{$modelstr}) {
-	    # Exact match
-	    return $entry;
-	}
-	my $hpmodelstr = "HP_" . $modelstr;
-	if ($entry = $hplipdevicesdb->{$hpmodelstr}) {
-	    # Exact match
-	    return $entry;
-	}
-	my $hpmodelstr = "hp_" . $modelstr;
-	if ($entry = $hplipdevicesdb->{$hpmodelstr}) {
-	    # Exact match
-	    return $entry;
-	}
-	# More 'fuzzy' matching
-	my $simplemodel = hplip_simple_model($modelstr);
-	foreach my $key (keys %{$hplipdevicesdb}) {
-	    my $simplekey = hplip_simple_model($key);
-	    return $hplipdevicesdb->{$key} if $simplemodel eq $simplekey;
-	}
-	foreach my $key (keys %{$hplipdevicesdb}) {
-	    my $simplekey = hplip_simple_model($key);
-	    $simplekey =~ s/(\d\d)00(C?)$/$1\\d\\d$2/;
-	    $simplekey =~ s/(\d\d\d)0(C?)$/$1\\d$2/;
-	    $simplekey =~ s/(\d\d)0(\dC?)$/$1\\d$2/;
-	    return $hplipdevicesdb->{$key} if 
-		$simplemodel =~ m/^$simplekey$/i;
-	}
-	# Device not supported
-	return undef;
-    }
-    # $device not in @autodetected
-    return undef;
-}
-
-sub hplip_device_entry_from_uri {
-    my ($deviceuri) = @_;
-
-    return undef if $deviceuri !~ m!^hp:/!;
-    
-    if (!$hplipdevicesdb) {
-	# Read the HPLIP device database if not done already
-	$hplipdevicesdb = read_hplip_db();
-    }
-
-    $deviceuri =~ m!^hp:/(usb|par|net)/(\S+?)(\?\S+|)$!;
-    my $model = $2;
-    return undef if !$model;
-
-    my $entry;
-    if ($entry = $hplipdevicesdb->{$model}) {
-	return $entry;
-    }
-    return undef;
-}
-
-sub start_hplip {
-    my ($device, $hplipentry, @autodetected) = @_;
-
-    # Determine connection type
-    my $bus;
-    if ($device =~ /usb/) {
-	$bus = "usb";
-    } elsif ($device =~ m!/dev/(lp|par.*|printer.*)\d+!) {
-	$bus = "par";
-    } elsif ($device =~ m!^socket://!) {
-	$bus = "net";
-    } else {
-	return undef;
-    }
-
-    # Start HPLIP daemons
-    printer::services::start_not_running_service("hplip");
-
-    # Determine HPLIP device URI for the CUPS queue
-    if ($bus eq "net") {
-	$device =~ m!^socket://([^:]+)(|:\d+)$!;
-	my $host = $1;
-	my $ip;
-	if ($host !~ m!^\d+\.\d+\.\d+\.\d+$!) {
-	    my $addr = gethostbyname("$host");
-	    my ($a,$b,$c,$d) = unpack('C4',$addr);
-	    $ip = sprintf("%d.%d.%d.%d", $a, $b, $c, $d);
-	} else {
-	    $ip = $host;
-	}
-	open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
-	     "/bin/sh -c \"export LC_ALL=C; /usr/bin/hp-makeuri $ip\" |") or
-	     die "Could not run \"/usr/bin/hp-makeuri $ip\"!";
-	while (my $line = <$F>) {
-	    if ($line =~ m!(hp:/net/\S+)!) {
-		my $uri = $1;
-		close $F;
-		return $uri;
-	    }
-	}
-	close $F;
-    } else {
-	foreach my $a (@autodetected) {
-	    $device eq $a->{port} or next;
-	    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
-		 "/bin/sh -c \"export LC_ALL=C; /usr/$lib/cups/backend/hp\" |") or
-		 die "Could not run \"/usr/$lib/cups/backend/hp\"!";
-	    while (my $line = <$F>) {
-		if (($line =~ m!^direct\s+(hp:/$bus/(\S+?)\?serial=(\S+))\s+!) ||
-		    ($line =~ m!^direct\s+(hp:/$bus/(\S+?)\?device=()(\S+))\s+!) ||
-		    ($line =~ m!^direct\s+(hp:/$bus/(\S+))\s+!)) {
-		    my $uri = $1;
-		    my $modelstr = $2;
-		    my $serial = $3;
-		    my $devicestr = $4;
-		    $devicestr =~ m!/dev/(lp|parport|printer/)(\d+)!;
-		    my $parporthplip = $1;
-		    $device =~ m!/dev/(lp|parport|printer/)(\d+)!;
-		    my $parportdevice = $1;
-		    if ((uc($modelstr) eq uc($hplipentry->{model})) &&
-			(!$serial ||
-			 (uc($serial) eq uc($a->{val}{SERIALNUMBER}))) &&
-			(!$devicestr ||
-			 ($devicestr eq $device) ||
-			 (($parporthplip ne "") &&
-			  ($parportdevice ne "") &&
-			  ($parporthplip == $parportdevice)))) {
-			close $F;
-			return $uri;
-		    }
-		}
-	    }
-	    close $F;
-	    last;
-	}
-    }
-    # HPLIP URI not found
-    return undef;
-}
-
-sub start_hplip_manual {
-
-    # Start HPLIP daemons
-    printer::services::start_not_running_service("hplip");
-
-    # Return all possible device URIs
-    open(my $F, ($::testing ? $::prefix : "chroot $::prefix/ ") .
-	 "/bin/sh -c \"export LC_ALL=C; /usr/$lib/cups/backend/hp\" |") or
-	 die "Could not run \"/usr/$lib/cups/backend/hp\"!";
-    my @uris;
-    while (<$F>) {
-        m!^direct\s+(hp:\S+)\s+!;
-	push(@uris, $1);
-    }
-    return @uris;
-}
-
-sub remove_hpoj_config {
-    my ($device, @autodetected) = @_;
-
-    for my $d (@autodetected) {
-	$device eq $d->{port} or next;
-	my $bus;
-	if ($device =~ /usb/) {
-	    $bus = "usb";
-	} elsif ($device =~ m!/dev/(lp|par.*|printer.*)\d+!) {
-	    $bus = "par";
-	} elsif ($device =~ /socket/) {
-	    $bus = "hpjd";
-	}
-	my $path = "$::prefix/etc/ptal";
-	opendir PTALDIR, "$path";
-	while (my $file = readdir(PTALDIR)) {
-	    next if $file !~ /^(mlc:|)$bus:/;
-	    $file = "$path/$file";
-	    if ($bus eq "hpjd") {
-		$device =~ m!^socket://(\S+?)(:\d+|)$!;
-		my $host = $1;
-		if ($file =~ /$host/) {
-		    closedir PTALDIR;
-		    unlink($file) or return $file;
-		    printer::services::restart("hpoj");
-		    return undef;
-		} 
-	    } else {
-		if ((grep { /$d->{val}{MODEL}/ } chomp_(cat_($file))) &&
-		    ((!$d->{val}{SERIALNUMBER}) ||
-		     (grep { /$d->{val}{SERIALNUMBER}/ } 
-		      chomp_(cat_($file))))) {
-		    closedir PTALDIR;
-		    unlink($file) or return $file;
-		    printer::services::restart("hpoj");
-		    return undef;
-		}
-	    }
-	}
-	last;
-    }
-    closedir PTALDIR;
-    return undef;
-}
-
-sub devicefound {
-    my ($usbid, $model, $serial) = @_;
-    # Compare the output of "lsusb -vv" with the elements of the device 
-    # ID string
-    if ($serial && $usbid->{SERIALNUMBER} eq $serial) {
-	# Match of serial number has absolute priority
-	return 1;
-    } elsif ($model && $usbid->{MODEL} eq $model) {
-	# Try to match the model name otherwise
-	return 1;
-    }
-    return 0;
-}
-
-sub usbdevice {
-    my ($usbid) = @_;
-    # Run "lsusb -vv" and search the given device to get its USB bus and
-    # device numbers
-    open(my $F, ($::testing ? "" : "chroot $::prefix/ ") .
-	'/bin/sh -c "export LC_ALL=C; lsusb -vv 2> /dev/null" |')
-	or return undef;
-    my ($bus, $device, $model, $serial) = ("", "", "", "");
-    my $found = 0;
-    while (my $line = <$F>) {
-	chomp $line;
-	if ($line =~ m/^\s*Bus\s+(\d+)\s+Device\s+(\d+)\s*:/i) {
-	    # head line of a new device
-	    my ($newbus, $newdevice) = ($1, $2);
-	    last if (($model || $serial) && 
-		     ($found = devicefound($usbid, $model, $serial)));
-	    ($bus, $device) = ($newbus, $newdevice);
-	} elsif ($line =~ m/^\s*iProduct\s+\d+\s+(.+)$/i) {
-	    # model line
-	    next if $device eq "";
-	    $model = $1;
-	} elsif ($line =~ m/^\s*iSerial\s+\d+\s+(.+)$/i) {
-	    # model line
-	    next if $device eq "";
-	    $serial = $1;
-	}
-    }
-    close $F;
-    # Check last entry
-    $found = devicefound($usbid, $model, $serial);
-
-    return 0 if !$found;
-    return sprintf("%%%03d%%%03d", $bus, $device);
-}
-
-sub config_sane {
-    my ($backend) = @_;
-
-    # Add HPOJ/HPLIP backend to /etc/sane.d/dll.conf if needed (no
-    # individual config file /etc/sane.d/hplip.conf or
-    # /etc/sane.d/hpoj.conf necessary, the HPLIP and HPOJ drivers find
-    # the scanner automatically)
-
-    return if (! -f "$::prefix/etc/sane.d/dll.conf");
-    return if member($backend,
-		     chomp_(cat_("$::prefix/etc/sane.d/dll.conf")));
-    eval { append_to_file("$::prefix/etc/sane.d/dll.conf",
-			  "$backend\n") } or
-	   die "can not write SANE config in /etc/sane.d/dll.conf: $!";
-}
-
-sub setcupslink {
-    my ($printer) = @_;
-    return 1 if !$::isInstall || $printer->{SPOOLER} ne "cups" || -d "/etc/cups/ppd";
-    system("ln -sf $::prefix/etc/cups /etc/cups");
-    return 1;
-}
-
-
-1;
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
deleted file mode 100644
index 70fa367d3..000000000
--- a/perl-install/printer/printerdrake.pm
+++ /dev/null
@@ -1,5548 +0,0 @@
-package printer::printerdrake;
-# $Id$
-
-use strict;
-
-use common;
-use modules;
-use network::network;
-use log;
-use interactive;
-use printer::main;
-use printer::services;
-use printer::detect;
-use printer::default;
-use printer::data;
-
-# Overtake translation for "(recommended)" from printer/main.pm
-my $recstr = $printer::main::recstr;
-my $precstr = $printer::main::precstr;
-my $sprecstr = $printer::main::sprecstr;
-
-my $shortdistroname = "Mandriva Linux";
-
-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.
-");
-
-1;
-
-sub config_cups {
-    my ($printer, $security, $in, $upNetwork) = @_;
-
-    local $::isWizard = 0;
-    local $::isEmbedded = 0;
-    # Check whether the network functionality is configured and
-    # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
-
-    #$in->set_help('configureRemoteCUPSServer') if $::isInstall;
-    #- hack to handle cups remote server printing,
-    #- first read /etc/cups/cupsd.conf for variable BrowsePoll address:port
-    # Return value: 0 when nothing was changed ("Apply" never pressed), 1
-    # when "Apply" was at least pressed once.
-    my $retvalue = 0;
-    # Read CUPS config file
-    @{$printer->{cupsconfig}{cupsd_conf}} =
-	printer::main::read_cupsd_conf();
-    printer::main::read_cups_config($printer);
-    # Read client.conf file
-    my ($daemonless_cups, $remote_cups_server) =
-	printer::main::read_client_conf();
-    # Read state of japanese text printing mode
-    my $jap_textmode = printer::main::get_jap_textmode();
-    # Read state for auto-correction of cupsd.conf
-    $printer->{cupsconfig}{autocorrection} =
-	printer::main::get_cups_autoconf();
-    my $oldautocorr = $printer->{cupsconfig}{autocorrection};
-    # Human-readable strings for hosts onto which the local printers
-    # are shared
-    my $maindone;
-    while (!$maindone) {
-	my $sharehosts = printer::main::makesharehostlist($printer);
-	my $browsepoll = printer::main::makebrowsepolllist($printer);
-	my $buttonclicked;
-	#- Show dialog
-	if ($in->ask_from_(
-	     { 
-		 title => N("CUPS printer configuration"),
-		 messages => N("Here you can choose whether the printers connected to this machine should be accessible by remote machines and by which remote machines.") .
-		     N("You can also decide here whether printers on remote machines should be automatically made available on this machine."),
-	     },
-	     [
-	      { val => N("Remote CUPS server and no local CUPS daemon") .
-		    ": " .
-		    ($daemonless_cups ? 
-		     N("On") . "; " . N("Server") . ": " . 
-		     $remote_cups_server :
-		     N("Off")),
-		help => N("In this mode the local CUPS daemon will be stopped and all printing requests go directly to the server specified below. Note that it is not possible to define local print queues then and if the specified server is down it cannot be printed at all from this machine."),
-		type => 'button',
-		clicked_may_quit => sub {
-		    $buttonclicked = "daemonlesscups";
-		    1;
-		} },
-	      { text => N("The printers on this machine are available to other computers"), type => 'bool',
-		val => \$printer->{cupsconfig}{localprintersshared},
-		disabled => sub {
-		    $daemonless_cups;
-		} },
-	      { text => N("Automatically find available printers on remote machines"), type => 'bool',
-		val => \$printer->{cupsconfig}{remotebroadcastsaccepted},
-		disabled => sub {
-		    $daemonless_cups;
-		} },
-	      { val => N("Printer sharing on hosts/networks: ") .
-		    ($printer->{cupsconfig}{customsharingsetup} ?
-		     N("Custom configuration") :
-		     ($#{$sharehosts->{list}} >= 0 ?
-		      ($#{$sharehosts->{list}} > 1 ?
-		       join(", ", @{$sharehosts->{list}}[0,1]) . " ..." :
-		       join(", ", @{$sharehosts->{list}})) :
-		      N("No remote machines"))), 
-		type => 'button',
-		clicked_may_quit => sub {
-		    $buttonclicked = "sharehosts";
-		    1;
-		},
-		disabled => sub {
-		    $daemonless_cups ||
-		    !$printer->{cupsconfig}{localprintersshared} &&
-		     !$printer->{cupsconfig}{remotebroadcastsaccepted};
-		} },
-	      { val => N("Additional CUPS servers: ") .
-		     ($#{$browsepoll->{list}} >= 0 ?
-		      ($#{$browsepoll->{list}} > 1 ?
-		       join(", ", @{$browsepoll->{list}}[0,1]) . " ..." :
-		       join(", ", @{$browsepoll->{list}})) :
-		      N("None")), 
-		type => 'button',
-		help => N("To get access to printers on remote CUPS servers in your local network you only need to turn on the \"Automatically find available printers on remote machines\" option; the CUPS servers inform your machine automatically about their printers. All printers currently known to your machine are listed in the \"Remote printers\" section in the main window of Printerdrake. If your CUPS server(s) is/are not in your local network, you have to enter the IP address(es) and optionally the port number(s) here to get the printer information from the server(s)."),
-		clicked_may_quit => sub {
-		    $buttonclicked = "browsepoll";
-		    1;
-		},
-		disabled => sub {
-		    $daemonless_cups;
-		} },
-	      { text => N("Japanese text printing mode"),
-		help => N("Turning on this allows to print plain text files in Japanese language. Only use this function if you really want to print text in Japanese, if it is activated you cannot print accentuated characters in latin fonts any more and you will not be able to adjust the margins, the character size, etc. This setting only affects printers defined on this machine. If you want to print Japanese text on a printer set up on a remote machine, you have to activate this function on that remote machine."),
-		type => 'bool',
-		val => \$jap_textmode, 
-		disabled => sub {
-		    $daemonless_cups;
-		} },
-	      if_($printer->{expert},
-		  { text => N("Automatic correction of CUPS configuration"),
-		    type => 'bool',
-		    help => N("When this option is turned on, on every startup of CUPS it is automatically made sure that
-
-- if LPD/LPRng is installed, /etc/printcap will not be overwritten by CUPS
-
-- if /etc/cups/cupsd.conf is missing, it will be created
-
-- when printer information is broadcasted, it does not contain \"localhost\" as the server name.
-
-If some of these measures lead to problems for you, turn this option off, but then you have to take care of these points."),
-		    val => \$printer->{cupsconfig}{autocorrection},
-                    disabled => sub {
-			$daemonless_cups;
-		    } }),
-	      ]
-	     )
-	    ) {
-	    if ($buttonclicked eq "sharehosts") {
-		# Show dialog to add hosts to share printers to
-		my $subdone = 0;
-		my $choice;
-		while (!$subdone) {
-		    # Entry should be edited when double-clicked
-		    $buttonclicked = "edit";
-		    $in->ask_from_(
-			 { title => N("Sharing of local printers"),
-			   messages => N("These are the machines and networks on which the locally connected printer(s) should be available:"),
-			   ok => "",
-			   cancel => "",
-		         },
-			 # List the hosts
-			 [ { val => \$choice, format => \&translate,
-			     sort => 0, separator => "####",
-			     tree_expanded => 1,
-			     quit_if_double_click => 1,
-			     allow_empty_list => 1,
-			     list => $sharehosts->{list} },
-			   { val => N("Add host/network"), 
-			     type => 'button',
-			     clicked_may_quit => sub {
-				 $buttonclicked = "add";
-				 1; 
-			     } },
-			   { val => N("Edit selected host/network"), 
-			     type => 'button',
-			     clicked_may_quit => sub {
-				 $buttonclicked = "edit";
-				 1; 
-			     },
-			     disabled => sub {
-				 return $#{$sharehosts->{list}} < 0;
-			     } },
-			   { val => N("Remove selected host/network"), 
-			     type => 'button',
-			     clicked_may_quit => sub {
-				 $buttonclicked = "remove";
-				 1; 
-			     },
-			     disabled => sub {
-				 return $#{$sharehosts->{list}} < 0;
-			     } },
-			   { val => N("Done"), 
-			     type => 'button',
-			     clicked_may_quit => sub {
-				 $buttonclicked = "";
-				 $subdone = 1;
-				 1; 
-			     } },
-			   ]
-			 );
-		    if ($buttonclicked eq "add" ||
-			$buttonclicked eq "edit") {
-			my ($hostchoice, $ip);
-			if ($buttonclicked eq "add") {
-			    # Use first entry as default for a new entry
-			    $hostchoice = N("Local network(s)");
-			} else {
-			    if ($sharehosts->{invhash}{$choice} =~ /^\@/) {
-				# Entry to edit is not an IP address
-				$hostchoice = $choice;
-			    } else {
-				# Entry is an IP address
-				$hostchoice = 
-				    N("IP address of host/network:");
-				$ip = $sharehosts->{invhash}{$choice};
-			    }
-			}
-			my @menu = N("Local network(s)");
-			my @interfaces = 
-			    printer::detect::getNetworkInterfaces();
-		        foreach my $interface (@interfaces) {
-			    push @menu, N("Interface \"%s\"", $interface);
-			}
-			push @menu, N("IP address of host/network:");
-			# Show the dialog
-			my $address;
-			my $oldaddress = 
-			    ($buttonclicked eq "edit" ?
-			     $sharehosts->{invhash}{$choice} : "");
-			if ($in->ask_from_(
-			     { title => N("Sharing of local printers"),
-			       messages => N("Choose the network or host on which the local printers should be made available:"),
-			       callbacks => {
-				   complete => sub {
-				       if ($hostchoice eq 
-					    N("IP address of host/network:") &&
-					   $ip =~ /^\s*$/) {
-					   
-					   $in->ask_warn(N("Error"), N("Host/network IP address missing."));
-					   return 1, 1;
-				       }
-				       if ($hostchoice eq 
-					    N("IP address of host/network:") &&
-					   !printer::main::is_network_ip($ip)) {
-					   
-					   $in->ask_warn(N("Error"), 
-N("The entered host/network IP is not correct.\n") .
-N("Examples for correct IPs:\n") .
-  "192.168.100.194\n" .
-  "10.0.0.*\n" .
-  "10.1.*\n" .
-  "192.168.100.0/24\n" .
-  "192.168.100.0/255.255.255.0\n"
-);
-					   return 1, 1;
-				       }
-				       if ($hostchoice eq $menu[0]) {
-					   $address = '@LOCAL';
-				       } elsif ($hostchoice eq $menu[-1]) {
-					   $address = $ip;
-				       } else {
-					   ($address) =
-					       grep { $hostchoice =~ /$_/ } 
-					       @interfaces;
-					   $address = "\@IF($address)";
-				       }
-				       # Check whether item is duplicate
-				       if ($address ne $oldaddress &&
-					   member($address,
-						  @{$printer->{cupsconfig}{clientnetworks}})) {
-					   $in->ask_warn(N("Error"), 
-							 N("This host/network is already in the list, it cannot be added again.\n"));
-					   if ($hostchoice eq 
-					       N("IP address of host/network:")) {
-					       return 1, 1;
-					   } else {
-					       return 1, 0;
-					   }
-				       }
-				       return 0;
-				   },
-			       },
-			   },
-			     # List the host types
-			     [ { val => \$hostchoice, format => \&translate,
-				 type => 'list',
-				 sort => 0,
-				 list => \@menu },
-			       { val => \$ip, 
-				 disabled => sub {
-				     $hostchoice ne 
-					 N("IP address of host/network:");
-			         } },
-			       ],
-			     )) {
-			    # OK was clicked, insert new item into the list
-			    if ($buttonclicked eq "add") {
-				push(@{$printer->{cupsconfig}{clientnetworks}},
-				     $address);
-			    } else {
-				@{$printer->{cupsconfig}{clientnetworks}} =
-				    map { ($_ eq
-					  $sharehosts->{invhash}{$choice} ?
-					  $address : $_) }
-				        @{$printer->{cupsconfig}{clientnetworks}};
-			    }
-			    # Refresh list of hosts
-			    $sharehosts = 
-			    printer::main::makesharehostlist($printer);
-			    # We have modified the configuration now
-			    $printer->{cupsconfig}{customsharingsetup} = 0;
-			    # Position the list cursor on the new/modified
-			    # item
-			    $choice = $sharehosts->{hash}{$address};
-			}
-		    } elsif ($buttonclicked eq "remove") {
-			@{$printer->{cupsconfig}{clientnetworks}} =
-			    grep { $_ ne $sharehosts->{invhash}{$choice} }
-			    @{$printer->{cupsconfig}{clientnetworks}};
-			# Refresh list of hosts
-			$sharehosts = 
-			    printer::main::makesharehostlist($printer);
-			# We have modified the configuration now
-			$printer->{cupsconfig}{customsharingsetup} = 0;
-		    }
-		}
-		# If we have no entry in the list, we do not
-		# share the local printers, mark this
-		if ($#{$printer->{cupsconfig}{clientnetworks}} < 0) {
-		    $printer->{cupsconfig}{localprintersshared} = 0;
-		    $printer->{cupsconfig}{remotebroadcastsaccepted} = 0;
-		}
-	    } elsif ($buttonclicked eq "browsepoll") {
-		# Show dialog to add hosts to "BrowsePoll" from
-		my $subdone = 0;
-		my $choice;
-		while (!$subdone) {
-		    # Entry should be edited when double-clicked
-		    $buttonclicked = "edit";
-		    $in->ask_from_(
-			 { title => N("Accessing printers on remote CUPS servers"),
-			   messages => N("Add here the CUPS servers whose printers you want to use. You only need to do this if the servers do not broadcast their printer information into the local network."),
-			   ok => "",
-			   cancel => "",
-		         },
-			 # List the hosts
-			 [ { val => \$choice, format => \&translate,
-			     sort => 0, separator => "####",
-			     tree_expanded => 1,
-			     quit_if_double_click => 1,
-			     allow_empty_list => 1,
-			     list => $browsepoll->{list} },
-			   { val => N("Add server"), 
-			     type => 'button',
-			     clicked_may_quit => sub {
-				 $buttonclicked = "add";
-				 1; 
-			     } },
-			   { val => N("Edit selected server"), 
-			     type => 'button',
-			     clicked_may_quit => sub {
-				 $buttonclicked = "edit";
-				 1; 
-			     },
-			     disabled => sub {
-				 return $#{$browsepoll->{list}} < 0;
-			     } },
-			   { val => N("Remove selected server"), 
-			     type => 'button',
-			     clicked_may_quit => sub {
-				 $buttonclicked = "remove";
-				 1; 
-			     },
-			     disabled => sub {
-				 return $#{$browsepoll->{list}} < 0;
-			     } },
-			   { val => N("Done"), 
-			     type => 'button',
-			     clicked_may_quit => sub {
-				 $buttonclicked = "";
-				 $subdone = 1;
-				 1; 
-			     } },
-			   ]
-			 );
-		    if ($buttonclicked eq "add" ||
-			$buttonclicked eq "edit") {
-			my ($ip, $port);
-			if ($buttonclicked eq "add") {
-			    # Use default port
-			    $port = '631';
-			} else {
-			    if ($browsepoll->{invhash}{$choice} =~
-				/^([^:]+):([^:]+)$/) {
-				# Entry to edit has IP and port
-				$ip = $1;
-				$port = $2;
-			    } else {
-				# Entry is only an IP, no port, so take
-				# the default port 631
-				$ip = $browsepoll->{invhash}{$choice};
-				$port = '631';
-			    }
-			}
-			# Show the dialog
-			my $address;
-			my $oldaddress = 
-			    ($buttonclicked eq "edit" ?
-			     $browsepoll->{invhash}{$choice} : "");
-			if ($in->ask_from_(
-			     { title => N("Accessing printers on remote CUPS servers"),
-			       messages => N("Enter IP address and port of the host whose printers you want to use.") . ' ' .
-				   N("If no port is given, 631 will be taken as default."),
-			       callbacks => {
-				   complete => sub {
-				       if ($ip =~ /^\s*$/) {
-					   $in->ask_warn(N("Error"), N("Server IP missing!"));
-					   return 1, 0;
-				       }
-				       if ($ip !~ 
-					   /^\s*(\d+\.\d+\.\d+\.\d+)\s*$/) {
-					   $in->ask_warn(N("Error"), 
-N("The entered IP is not correct.\n") .
-N("Examples for correct IPs:\n") .
-  "192.168.100.194\n" .
-  "10.0.0.2\n"
-);
-					   return 1, 0;
-				       } else {
-					   $ip = $1;
-				       }
-				       if ($port !~ /\S/) {
-					   $port = '631';
-				       } elsif ($port !~ /^\s*(\d+)\s*$/) {
-					   $in->ask_warn(N("Error"), N("The port number should be an integer!"));
-					   return 1, 1;
-				       } else {
-					   $port = $1;
-				       }
-				       $address = "$ip:$port";
-				       # Check whether item is duplicate
-				       if ($address ne $oldaddress &&
-					   member($address,
-						  @{$printer->{cupsconfig}{BrowsePoll}})) {
-					   $in->ask_warn(N("Error"), 
-							 N("This server is already in the list, it cannot be added again.\n"));
-					   return 1, 0;
-				       }
-				       return 0;
-				   },
-			       },
-			   },
-			     # Ask for IP and port
-			     [ { val => \$ip, 
-				 label => N("IP address") },
-			       { val => \$port, 
-				 label => N("Port") },
-			       ],
-			     )) {
-			    # OK was clicked, insert new item into the list
-			    if ($buttonclicked eq "add") {
-				push(@{$printer->{cupsconfig}{BrowsePoll}},
-				     $address);
-			    } else {
-				@{$printer->{cupsconfig}{BrowsePoll}} =
-				    map { ($_ eq
-					  $browsepoll->{invhash}{$choice} ?
-					  $address : $_) }
-				        @{$printer->{cupsconfig}{BrowsePoll}};
-			    }
-			    # Refresh list of hosts
-			    $browsepoll = 
-			    printer::main::makebrowsepolllist($printer);
-			    # Position the list cursor on the new/modified
-			    # item
-			    $choice = $browsepoll->{hash}{$address};
-			}
-		    } elsif ($buttonclicked eq "remove") {
-			@{$printer->{cupsconfig}{BrowsePoll}} =
-			    grep { $_ ne $browsepoll->{invhash}{$choice} }
-			    @{$printer->{cupsconfig}{BrowsePoll}};
-			# Refresh list of hosts
-			$browsepoll = 
-			    printer::main::makebrowsepolllist($printer);
-		    }
-		}
-	    } elsif ($buttonclicked eq "daemonlesscups") {
-		my ($modechoice, $rserver);
-		if ($daemonless_cups) {
-		    $modechoice = N("On, Name or IP of remote server:");
-		    $rserver = $remote_cups_server;
-		} else {
-		    $modechoice = N("Off");
-		}
-		# Show the dialog
-		#my $address;
-		#my $oldaddress = 
-		#    ($buttonclicked eq "edit" ?
-		#     $sharehosts->{invhash}{$choice} : "");
-		if ($in->ask_from_
-		    ({ title => N("Remote CUPS server and no local CUPS daemon"),
-		       messages => N("In this mode the local CUPS daemon will be stopped and all printing requests go directly to the server specified below. Note that it is not possible to define local print queues then and if the specified server is down it cannot be printed at all from this machine."),
-		       callbacks => {
-			   complete => sub {
-			       if ($modechoice eq 
-				   N("On, Name or IP of remote server:") &&
-				   $rserver =~ /^\s*$/) {
-				   
-				   $in->ask_warn(N("Error"), N("CUPS server name or IP address missing."));
-				   return 1, 1;
-			       }
-			       return 0;
-			   },
-		       },
-		   },
-		     # Show the widgets
-		     [ { val => \$modechoice, format => \&translate,
-			 type => 'list',
-			 sort => 0,
-			 list => [ N("Off"),
-				   N("On, Name or IP of remote server:") ] },
-		       { val => \$rserver, 
-			 disabled => sub {
-			     $modechoice ne 
-				 N("On, Name or IP of remote server:");
-			 } },
-		       ],
-		     )) {
-		    # OK was clicked, update the data
-		    $daemonless_cups = 
-			$modechoice eq N("On, Name or IP of remote server:");
-		    $remote_cups_server = $rserver;
-		}
-	    } else {
-		# We have clicked "OK"
-		$retvalue = 1;
-		$maindone = 1;
-		# Write state for auto-correction of cupsd.conf
-		if ($oldautocorr != 
-		    $printer->{cupsconfig}{autocorrection}) {
-		    printer::main::set_cups_autoconf(
-			$printer->{cupsconfig}{autocorrection});
-		}
-		# Write state of japanese text printing mode
-		printer::main::set_jap_textmode($jap_textmode);
-		# Switch state of daemon-less CUPS mode and write
-		# client.conf
-		if ($daemonless_cups && $printer->{SPOOLER} ne "rcups" ||
-		    !$daemonless_cups && $printer->{SPOOLER} eq "rcups") {
-		    my $oldspooler = $printer->{SPOOLER};
-		    $printer->{SPOOLER} = ($daemonless_cups ? 
-					  "rcups" : "cups");
-		    if (install_spooler($printer, $security, $in->do_pkgs, $in, $upNetwork, 1)) {
-			printer::default::set_spooler($printer);
-			printer::main::write_client_conf
-			    ($daemonless_cups, $remote_cups_server);
-			$printer->{remote_cups_server} =
-			    $remote_cups_server;
-			# Get the queues of this spooler
-			my $w = $in->wait_message
-			    (N("Printerdrake"),
-			     N("Reading printer data..."));
-			printer::main::read_configured_queues($printer);
-			undef $w;
-			# Re-read the printer database next time
-			%printer::main::thedb = ();
-			assure_default_printer_is_set($printer, $in);
-		    } else {
-			$printer->{SPOOLER} = $oldspooler;
-		    }
-		} elsif ($daemonless_cups) {
-		    printer::main::write_client_conf($daemonless_cups,
-						     $remote_cups_server);
-		    $printer->{remote_cups_server} = $remote_cups_server;
-		} else {
-		    undef $printer->{remote_cups_server};
-		}
-		# Write cupsd.conf
-		printer::main::write_cups_config($printer);
-		my $w = 
-		    $in->wait_message(N("Printerdrake"),
-				      N("Restarting CUPS..."));
-		printer::main::write_cupsd_conf(
-		    @{$printer->{cupsconfig}{cupsd_conf}});
-		#- restart cups after updating configuration.
-		printer::main::SIGHUP_daemon($printer->{SPOOLER});
-		undef $w;
-	    }
-	} else {
-	    # Cancel clicked
-	    $maindone = 1;
-	}
-    }
-    printer::main::clean_cups_config($printer);
-    return $retvalue;
-}
-
-sub config_auto_admin {
-    my ($printer, $in) = @_;
-
-    local $::isWizard = 0;
-    local $::isEmbedded = 0;
-
-    # Read current configuration
-    printer::main::get_auto_admin($printer);
-
-    # Configuration dialog
-    my $waitforgui =
-	N("Allow pop-up windows, printer setup and package installation may be canceled");
-    my $nogui =
-	N("No pop-up windows, printer setup and package installation cannot be canceled");
-    my $autoqueuesetupmode =
-	($printer->{autoqueuesetupgui} && -x "$::prefix/usr/X11R6/bin/X") ? 
-	$waitforgui : $nogui;
-    if ($in->ask_from_
-	({ 
-	    title => N("Printer auto administration"),
-	    messages => N("Here you can configure printer administration tasks which should be done automatically."),
-	     },
-	     [
-	      { val => N("Do automatic configuration of new printers") },
-	      { text => N("when a USB printer is connected and turned on"), 
-		type => 'bool',
-		val => \$printer->{autoqueuesetuponnewprinter} },
-	      { text => N("when Printerdrake is started"), 
-		type => 'bool',
-		val => \$printer->{autoqueuesetuponstart} },
-	      if_(-x "$::prefix/usr/X11R6/bin/X", 
-		  { val => N("Mode for automatic printer setup:") }),
-	      { val => \$autoqueuesetupmode,
-		list => [ if_(-x "$::prefix/usr/X11R6/bin/X", $waitforgui), 
-			  $nogui ], 
-		not_edit => 1, sort => 0,
-		type => 'list' },
-	      { val => N("Re-enable disabled printers") },
-	      { text => N("when a USB printer is connected and turned on"), 
-		type => 'bool',
-		val => \$printer->{enablequeuesonnewprinter} },
-	      { text => N("when the printing system is started"), 
-		type => 'bool',
-		val => \$printer->{enablequeuesonspoolerstart} },
-	      ]
-	     )
-	    ) {
-	# Auto queue setup mode
-	$printer->{autoqueuesetupgui} =
-	    ($autoqueuesetupmode eq $waitforgui ? 1 : 0);
-	# Save new settings
-	printer::main::set_auto_admin($printer);
-	return 1;
-    } else {
-	# Reset original settings
-	printer::main::get_auto_admin($printer);
-	return 0;
-    }
-}
-
-sub config_backend_error_handling {
-    my ($printer, $in) = @_;
-
-    local $::isEmbedded = 0;
-
-    # Get currentconfiguration
-    my $dontdisable = $printer->{currentqueue}{dd};
-    my $infiniteretries = ($printer->{currentqueue}{att} == 0);
-    my $retries = ($printer->{currentqueue}{att} != 0 ?
-		   $printer->{currentqueue}{att} : 1);
-    my $delay = $printer->{currentqueue}{delay};
-    my $queue = $printer->{currentqueue}{queue};
-
-    # Configuration dialog
-    if ($in->ask_from_
-	({ 
-	    title =>
-		N("Communication error handling for the printer \"%s\"",
-		  $queue),
-	    messages => N("Here you can configure how errors during the communication between your computer and the printer \"%s\" should be handled (for example if the printer is not turned on).", $queue),
-	    callbacks => {
-		complete => sub {
-		    unless (($retries =~ /^[0-9]+$/) && ($retries > 0)) {
-			$in->ask_warn(N("Error"), N("The number of retries should be an integer number of at least 1!"));
-			return 1, 0;
-		    }
-		    unless ($delay =~ /^[0-9]+$/) {
-			$in->ask_warn(N("Error"), N("The delay between retries should be a positive integer number!"));
-			return 1, 1;
-		    }
-		    return 0;
-		},
-		changed => sub {
-		    return 0;
-		}
-	    }
-	     },
-	     [
-	      { text => N("Do not disable the printer"), 
-		type => 'bool',
-		val => \$dontdisable },
-	      { text => N("Retry infinitely often"), 
-		type => 'bool',
-		val => \$infiniteretries },
-	      { val => N("Number of retries") }, 
-	      { val => \$retries, 
-		disabled => sub {
-		    $infiniteretries;
-		} },
-	      { val => N("Delay between retries (in sec)") }, 
-	      { val => \$delay, 
-		disabled => sub {
-		    ($retries eq 1) && !$infiniteretries;
-		} },
-	      ]
-	     )
-	    ) {
-	# Apply new settings
-	$dontdisable = "0" if $dontdisable eq "";
-	$retries = "0" if $retries eq "";
-	$delay = "0" if $delay eq "";
-	$printer->{currentqueue}{dd} = $dontdisable;
-	$printer->{currentqueue}{att} =
-	    ($infiniteretries ? "0" : $retries);
-	$printer->{currentqueue}{delay} = $delay;
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-sub choose_printer_type {
-    my ($printer, $in, $upNetwork) = @_;
-    my $havelocalnetworks = check_network($printer, $in, $upNetwork, 1) &&
-	                    printer::detect::getIPsInLocalNetworks() != ();
-    $printer->{str_type} = $printer_type_inv{$printer->{TYPE}};
-    my $autodetect = 0;
-    $autodetect = 1 if $printer->{AUTODETECT};
-    my $timeout = 4000;
-    $timeout = $printer->{TIMEOUT} if defined($printer->{TIMEOUT});
-    my @printertypes = printer::main::printer_type($printer);
-    $in->ask_from_(
-		   { title => N("Select Printer Connection"),
-		     messages => N("How is the printer connected?") .
-			 if_($printer->{SPOOLER} eq "cups",
-			     N("
-Printers on remote CUPS servers do not need to be configured here; these printers will be automatically detected.")) .
-                          if_(!$havelocalnetworks,
-			      N("\nWARNING: No local network connection active, remote printers can neither be detected nor tested!")),
-		     },
-		   [
-		    { val => \$printer->{str_type},
-		      list => \@printertypes, 
-		      not_edit => 1, sort => 0,
-		      type => 'list' },
-		    { text => N("Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"),
-		      type => 'bool', val => \$autodetect },
-		    { val => N("Modify timeout for network printer auto-detection") ,
-		      type => 'button',
-		      clicked_may_quit => sub {
-			  local $::isWizard = 0;
-			  $in->ask_from_
-			      ({ title => N("Select Printer Connection"),
-				 messages => N("Enter the timeout for network printer auto-detection (in msec) here. ") .
-				     "\n\n" .
-				     N("The longer you choose the timeout, the more reliable the detections of network printers will be, but the scan can take longer then, especially if there are many machines with local firewalls in the network. "),
-				 callbacks => {
-				     complete => sub {
-					 if ($timeout !~ /^[0-9]+$/) {
-					     $in->ask_warn(N("Error"), N("The timeout must be a positive integer number!"));
-					     return 1, 0;
-					 }
-					 return 0;
-				     }
-				 } },
-			       [ { val => \$timeout } ]);
-			  0; 
-		      } },
-		    ],
-		   ) or return 0;
-    $printer->{TIMEOUT} = $timeout;
-    $printer->{AUTODETECT} = $autodetect ? 1 : undef;
-    $printer->{TYPE} = $printer_type{$printer->{str_type}};
-    1;
-}
-
-sub setup_printer_connection {
-    my ($printer, $in, $upNetwork) = @_;
-    # Choose the appropriate connection config dialog
-    my $done = 1;
-    for ($printer->{TYPE}) {
-	/LOCAL/    and setup_local_autoscan($printer, $in, $upNetwork) and last;
-	/LPD/      and setup_lpd(      $printer, $in, $upNetwork) and last;
-	/SOCKET/   and setup_socket(   $printer, $in, $upNetwork) and last;
-	/SMB/      and setup_smb(      $printer, $in, $upNetwork) and last;
-	/NCP/      and setup_ncp(      $printer, $in, $upNetwork) and last;
-	/URI/      and setup_uri(      $printer, $in, $upNetwork) and last;
-	/POSTPIPE/ and setup_postpipe( $printer, $in) and last;
-	$done = 0; last;
-    }
-    return $done;
-}
-
-sub first_time_dialog {
-    my ($printer, $in, $upNetwork) = @_;
-    local $::isEmbedded = 0;
-    return 1 if printer::default::get_spooler() || $::isInstall;
-
-    my $w = $in->wait_message(N("Printerdrake"), N("Checking your system..."));
-
-    # Auto-detect local printers
-    my @autodetected = printer::detect::local_detect();
-    $printer->{AUTODETECTEDLOCALPRINTERSFIRSTTIME} = \@autodetected if @autodetected;
-    my $msg = do {
-	if (@autodetected) {
-	    my @printerlist = 
-	      map {
-		  my $entry = $_->{val}{DESCRIPTION};
-		  $entry = "$_->{val}{MANUFACTURER} $_->{val}{MODEL}"
-		      if (length($entry) < 5) or ($entry !~ /\S+\s+\S+/);
-		  if_($entry, "  -  $entry\n");
-	      } @autodetected;
-	    my $unknown_printers = @autodetected - @printerlist;
-	    if (@printerlist) {
-		my $unknown_msg = 
-		  $unknown_printers == 1 ? 
-		    "\n" . N("and one unknown printer") :
-		  $unknown_printers > 1 ?
-		    "\n" . N("and %d unknown printers", $unknown_printers) :
-		    '';
-		my $main_msg = 
-		  @printerlist > 1 ?
-		    N_("The following printers\n\n%s%s\nare directly connected to your system") :
-		  $unknown_printers ?
-		    N_("The following printer\n\n%s%s\nare directly connected to your system") :
-		    N_("The following printer\n\n%s%s\nis directly connected to your system");
-		sprintf($main_msg, join('', @printerlist), $unknown_msg);
-	    } else {
-		$unknown_printers == 1 ?
-		  N("\nThere is one unknown printer directly connected to your system") :
-		  N("\nThere are %d unknown printers directly connected to your system", $unknown_printers);
-	    }
-	} else {
-	    N("There are no printers found which are directly connected to your machine");
-	}
-    };
-    $msg .= N(" (Make sure that all your printers are connected and turned on).\n");
-
-    # Do we have a local network?
-
-    # If networking is configured, start it, but do not ask the user to
-    # configure networking.
-    my $havelocalnetworks = 
-	 check_network($printer, $in, $upNetwork, 1) && 
-           printer::detect::getIPsInLocalNetworks() != ();
-
-    # Finish building the dialog text
-    my $question = ($havelocalnetworks ?
-		    (@autodetected ?
-		     N("Do you want to enable printing on the printers mentioned above or on printers in the local network?\n") :
-		     N("Do you want to enable printing on printers in the local network?\n")) :
-		    (@autodetected ?
-		     N("Do you want to enable printing on the printers mentioned above?\n") :
-		     N("Are you sure that you want to set up printing on this machine?\n")));
-    my $warning = N("NOTE: Depending on the printer model and the printing system up to %d MB of additional software will be installed.", 80);
-    my $dialogtext = "$msg\n$question\n$warning";
-
-    # Close wait message
-    undef $w;
-
-    while (1) {
-	# Show dialog
-	my $donotsetupagain = 0;
-	my $choice;
-	if ($::autoqueue) {
-	    $choice = $in->ask_from_
-		({ 
-		    title => N("Printerdrake"),
-		    messages => $dialogtext,
-		    cancel => N("Quit"),
-		    ok => N("Yes") },
-		 [ { text => N("Do not setup printer automatically now, and never do it again"),
-		     type => 'bool',
-		     val => \$donotsetupagain } ] );
-	    
-	    # Turn off auto queue setup if the user wishes it
-	    turnoffautosetup($printer, $in) if $donotsetupagain;
-
-	    # Now, where the first-time dialog was displayed, all
-	    # subsequent wait messages should be displayed, also if we
-	    # are in GUI auto queue setup mode
-	    undef $::autoqueue;
-
-	    return 0 if !$choice;
-	} else {
-	    my $do_it = N("Yes");
-	    my $quit = N("Quit");
-	    my @choices = ($do_it, $quit);
-	    $choice = $in->ask_from_list(N("Printerdrake"), $dialogtext, 
-					\@choices, $quit);
-	    return 0 if $choice ne $do_it;
-	}
-
-	if ($havelocalnetworks && !@autodetected) {
-	    return set_cups_daemon_mode($printer, $in);
-	} else {
-	    $printer->{SPOOLER} = "cups";
-	    return 1;
-	}
-    }
-}
-
-sub configure_new_printers {
-    my ($printer, $in, $_upNetwork) = @_;
-
-    # This procedure auto-detects local printers and checks whether
-    # there is already a queue for them. If there is no queue for an
-    # auto-detected printer, a queue gets set up non-interactively.
-
-    # Stop here if auto queue setup is not selected 
-    return 1 if !($printer->{autoqueuesetuponstart} || $::autoqueue);
-    
-    # Wait message
-    my $w = $::noX || $::autoqueue || 
-	$in->wait_message(N("Printerdrake"),
-			  N("Searching for new printers..."));
-
-    # Auto-detect local printers
-    my @autodetected = printer::detect::local_detect();
-    $printer->{AUTODETECTEDPRINTERSNONINTERACTIVE} = \@autodetected if @autodetected;
-
-    # No printer found? So no need of new queues.
-    return 1 if !@autodetected;
-
-    # Black-list all auto-detected printers for which there is already
-    # a queue
-    my @blacklist;
-    foreach my $queue (keys %{$printer->{configured}}) {
-	# Does the URI of this installed queue match one of the autodetected
-	# printers?
-	my $uri = $printer->{configured}{$queue}{queuedata}{connect};
-	my $p = printer::main::autodetectionentry_for_uri(
-	    $uri, @autodetected);
-	if (defined($p)) {
-	    # Blacklist the port
-	    push(@blacklist, $p->{port});
-	}
-    }
-
-    my %printerselectedlist;
-    if (!$::noX) {
-	my @widgets;
-	foreach my $p (@autodetected) {
-	    if (!member($p->{port}, @blacklist)) {
-		my $entry = $p->{val}{DESCRIPTION};
-		$entry = "$p->{val}{MANUFACTURER} $p->{val}{MODEL}"
-		    if (length($entry) < 5) or ($entry !~ /\S+\s+\S+/);
-		$entry = N("Unknown model") if $entry !~ /\S/;
-		$entry = N("%s on %s", $entry, $p->{port});
-		$printerselectedlist{$p->{port}} = 1;
-		push (@widgets,
-		      { text => $entry, 
-			type => 'bool',
-			val => \$printerselectedlist{$p->{port}} });
-	    }
-	}
-	# Do not show empty dialog
-	return 1 if $#widgets < 0;
-	my $morethanone = ($#widgets > 0);
-	# Add entry to turn off auto queue setup
-	my $donotsetupagain = 0;
-	push (@widgets, { val => "__________" });
-	push (@widgets, { text =>
-			      N("Do not setup printer automatically again"),
-			  type => 'bool',
-			  val => \$donotsetupagain });
-	undef $w;
-	if ($in->ask_from_
-	    ({ 
-		title => ($morethanone ?
-			  N("New printers found") :
-			  N("New printer found")),
-		messages => ($morethanone ?
-			     N("The following new printers were found and Printerdrake can automatically set them up for you. If you do not want to have all of them set up, unselect the ones which should be skipped, or click \"Cancel\" to set up none of them.\n") :
-			     N("The following new printer was found and printerdrake can automatically set it up for you. If you do not want to have it set up, unselect it, or click \"Cancel\".\n")) .
-			     N("Note that for certain printer models additional packages need to be installed. So keep your installation media handy.\n"),
-	    },
-	     \@widgets )) {
-	    # Turn off auto queue setup if the user wishes it
-	    turnoffautosetup($printer, $in) if $donotsetupagain;
-	} else {
-	    return 1;
-	}
-    }
-
-    # Now install queues for all auto-detected printers which have no queue
-    # yet
-    $printer->{noninteractive} = 1; # Suppress all interactive steps
-    foreach my $p (@autodetected) {
-	if (!member($p->{port}, @blacklist) &&
-	    ($::noX || $printerselectedlist{$p->{port}})) {
-	    # Initialize some variables for queue setup
-	    $printer->{NEW} = 1;
-	    $printer->{TYPE} = "LOCAL";
-	    $printer->{currentqueue} = { queue    => "",
-					 foomatic => 0,
-					 desc     => "",
-					 loc      => "",
-					 make     => "",
-					 model    => "",
-					 printer  => "",
-					 driver   => "",
-					 connect  => "",
-					 dd       => 1,
-					 att      => 0,
-					 delay    => 30,
-					 spooler  => $printer->{SPOOLER},
-				       };
-	    undef $w;
-	    $w = $::noX || 
-		$in->wait_message(N("Printerdrake"),
-				  N("Configuring printer on %s...",
-				    $p->{port}));
-	    # Do configuration of multi-function devices and look up
-	    # model name in the printer database
-	    setup_common($printer, $in, $p->{val}{DESCRIPTION}, $p->{port},
-			 1, @autodetected) or next;
-	    # Do the steps of queue setup
-	    get_db_entry($printer, $in);
-	    # Let the user choose the model manually if it could not be
-	    # auto-detected.
-	    if (!$printer->{DBENTRY}) {
-		# Skip this printer if we install print queues in a
-		# background without X access.
-		if ($::noX) {
-		    # Delete some variables
-		    foreach (qw(OLD_QUEUE QUEUE TYPE str_type DBENTRY ARGS OLD_CHOICE currentqueue NEW)) {
-			$printer->{$_} = "";
-		    }
-		    next;
-		}
-		# Set the OLD_CHOICE to a non-existing value
-		$printer->{OLD_CHOICE} = "XXX";
-		# Set model selection cursor onto the "Raw Printer" entry.
-		$printer->{DBENTRY} = N("Raw printer (No driver)");
-		# Info about what was detected
-		my $info = $p->{val}{DESCRIPTION} ?
-            #-PO: this string is "device_description on port_number" formated (eg: "HP printer on 631"):
-            N("(%s on %s)", $p->{val}{DESCRIPTION}, $p->{port}) :
-              #-PO: a port number between round brackets:
-              N("(%s)", $p->{port});
-		# Remove wait message
-		undef $w;
-		# Choose the printer/driver from the list
-		$printer->{DBENTRY} = 
-		    $in->ask_from_treelist(N("Printer model selection"),
-					   N("Which printer model do you have?") .
-					   N("
-
-Printerdrake could not determine which model your printer %s is. Please choose the correct model from the list.", $info) . " " .
-					   N("If your printer is not listed, choose a compatible (see printer manual) or a similar one."), '|',
-					   [ keys %printer::main::thedb ], $printer->{DBENTRY}) or next;
-		# Restore wait message
-		$w = $::noX ||
-		    $in->wait_message(N("Printerdrake"),
-				      N("Configuring printer on %s...",
-					$p->{port}));
-	    }
-	    get_printer_info($printer, $in) or next;
-	    setup_options($printer, $in) or next;
-	    my $_queue = generate_queuename($printer);
-	    # Change wait message
-	    undef $w;
-	    $w = $::noX || 
-		$in->wait_message(N("Printerdrake"),
-				  N("Configuring printer \"%s\"...",
-				    $printer->{currentqueue}{queue}));
-	    # Create the queue
-	    configure_queue($printer, $in) or next;
-	    # If there is no default printer set, let this one get the
-	    # default
-	    if (!$printer->{DEFAULT}) {
-		$printer->{DEFAULT} = $printer->{QUEUE};
-		printer::default::set_printer($printer);
-	    }
-	}
-	# Delete some variables
-	foreach (qw(OLD_QUEUE QUEUE TYPE str_type DBENTRY ARGS OLD_CHOICE)) {
-	    $printer->{$_} = "";
-	}
-	$printer->{currentqueue} = {};
-	$printer->{complete} = 0;
-    }
-    undef $printer->{noninteractive};
-}
-
-sub turnoffautosetup {
-    # Turn off auto queue setup if the user wishes it
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-    # Read current configuration
-    printer::main::get_auto_admin($printer);
-    # Turn off automatic print queue setup
-    $printer->{autoqueuesetuponnewprinter} = 0;
-    $printer->{autoqueuesetuponstart} = 0;
-    # Save new settings
-    printer::main::set_auto_admin($printer);
-    # Tell the user what evil thing he has done and
-    # how he can fix it.
-    $in->ask_warn(N("Printerdrake"), 
-		  N("Now you have turned off automatic printer setup.\n\n") . 
-		  N("You can turn it back on again by choosing \"%s\" -> \"%s\" in Printerdrake's main menu. ", N("Options"), N("Configure Auto Administration")) .
-		  N("There you can also choose in which situation automatic printer setup is done (On Printerdrake startup, on printing system startup, when connecting a new USB printer)."));
-}
-
-sub generate_queuename {
-    my ($printer) = @_;
-    my $queue;
-    if ($printer->{currentqueue}{model}) {
-	if ($printer->{currentqueue}{model} eq N("Unknown model")) {
-	    $queue = "P";
-	} else {
-	    $queue = $printer->{currentqueue}{make} . '|' .
-		$printer->{currentqueue}{model};
-	}
-    } else {
-	$queue = $printer->{DBENTRY};
-    }
-    $queue =~ s/\|/ /g;
-    $printer->{currentqueue}{desc} = $queue;
-    $queue =~ s/series//gi;
-    $queue =~ s/[\s\(\)\-,]//g;
-    my $make = $printer->{currentqueue}{make};
-    my $model = $printer->{currentqueue}{model};
-    $queue =~ s/$make$make/$make/gi;
-    # Remove weird characters
-    $queue =~ s/[^A-Za-z0-9_]//g; 
-    $make =~ s/[^A-Za-z0-9_]//g; 
-    $model =~ s/[^A-Za-z0-9_]//g; 
-    # Do not use a queue name longer than 12 characters, as otherwise
-    # Windows clients will not be able to access the printer
-    my $ml = 12;
-    if (length($queue) > $ml) {
-	my %parts;
-	$parts{make} = $make;
-	$parts{model} = $model;
-	# Go through the two components, begin with model name, then
-	# make and then driver
-	foreach my $part (qw(model make)) {
-	    $parts{$part} =~ s/[^a-zA-Z0-9_]/ /g; 
-
-	    # Split the component into words, cutting always at the
-	    # right edge of the word. Cut also at a capital in the
-	    # middle of the word (ex: "S" in "PostScript").
-	    my @words =
-		split(/(?<=[a-zA-Z])(?![a-zA-Z])|(?<=[a-z])(?=[A-Z])/,
-		      $parts{$part});
-	    # Go through all words
-	    foreach (@words) {
-		# Do not abbreviate words of less than 3 letters
-		next if !/[a-zA-Z]{3,}$/;
-	        while (1) {
-		    # Remove the last letter
-		    chop;
-		    # Build the shortened component ...
-		    $parts{$part} = join('', @words);
-		    # ... and the queue name
-		    $queue = "$parts{make} $parts{model}";
-		    $queue =~ s/\s+//g;
-		    # Stop if the queue name has 12 characters or
-		    # less, if there is only one letter left, or if
-		    # the manufacturer name is reduced to three
-		    # characters.
-		    last if ((length($queue) <= $ml) ||
-			     (!/[a-zA-Z]{2,}$/) ||
-			     (($part eq 'make') && 
-			      (length($parts{make}) <= 3)));
-		}
-		$parts{$part} = join('', @words);
-		$queue = "$parts{make} $parts{model}";
-		$queue =~ s/\s+//g;
-		last if (length($queue) <= $ml);
-	    }
-	    last if (length($queue) <= $ml);
-	}
-	while ((length($queue) > $ml) &&
-	       (length($parts{model}) > 3)) {
-	    # Queue name too long? Remove last words from model name.
-	    last if !($parts{model} =~
-		s/[^a-zA-Z0-9]+[a-zA-Z0-9]*$//);
-	    $queue = "$parts{make} $parts{model}";
-	    $queue =~ s/\s+//g;
-	}
-	if (length($queue) > $ml) {
-	    # If nothing else helps ...
-	    $queue = substr($queue, 0, $ml);
-	}
-    }
-
-    # Append a number if the queue name already exists
-    if ($printer->{configured}{$queue}) {
-	my $origname = $queue;
-	my $i = 1;
-	while (1) {
-	    my $ol = length($origname);
-	    my $nl = length($i);
-	    my $us = ($origname =~ m/\d$/ ? 1 : 0);
-	    if ($ol + $nl + $us <= $ml) {
-		$queue = $origname . ($us ? '_' : '') . $i;
-	    } else {
-		$queue = substr($queue, 0, $ml - $nl);
-		$queue =~ s/\d$/_/;
-		$queue .= $i;
-	    }
-	    last if (!$printer->{configured}{$queue});
-	    $i++;
-	}
-    }
-
-    $printer->{currentqueue}{queue} = $queue;
-    $printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
-    return $queue;
-}
-
-sub wizard_welcome {
-    my ($printer, $in, $upNetwork) = @_;
-    local $::isEmbedded = 0;
-    my $ret;
-    my $autodetectlocal = 0;
-    my $autodetectnetwork = 0;
-    my $autodetectsmb = 0;
-    my $configlpd = 0;
-    # If networking is configured, start it, but do not ask the user to
-    # configure networking.
-    my $havelocalnetworks;
-    if ($printer->{expert}) {
-	$havelocalnetworks = 0;
-	undef $printer->{AUTODETECTNETWORK};
-	undef $printer->{AUTODETECTSMB};
-    } else {
-	$havelocalnetworks = check_network($printer, $in, $upNetwork, 1) &&
-			      printer::detect::getIPsInLocalNetworks() != ();
-	if (!$havelocalnetworks) {
-	    undef $printer->{AUTODETECTNETWORK};
-	    undef $printer->{AUTODETECTSMB};
-	}
-	$autodetectlocal = 1 if $printer->{AUTODETECTLOCAL};
-	$autodetectnetwork = 1 if $printer->{AUTODETECTNETWORK};
-	$autodetectsmb = 1 if $printer->{AUTODETECTSMB};
-	$configlpd = 1 if $printer->{CONFIGLPD};
-    }
-    my $oldautodetectlocal = $autodetectlocal;
-    my $oldautodetectnetwork = $autodetectnetwork;
-    my $oldautodetectsmb = $autodetectsmb;
-    my $oldconfiglpd = $configlpd;
-    if ($in) {
-	eval {
-	    if ($printer->{expert}) {
-		if ($::isWizard) {
-		    $ret = $in->ask_okcancel(
-			 N("Add a new printer"),
-			 N("
-Welcome to the Printer Setup Wizard
-
-This wizard allows you to install local or remote printers to be used from this machine and also from other machines in the network.
-
-It asks you for all necessary information to set up the printer and gives you access to all available printer drivers, driver options, and printer connection types."));
-		} else {
-		    $ret = 1;
-		}
-	    } else {
-		$ret = $in->ask_from_(
-		     { title => N("Add a new printer"),
-		       messages => ($printer->{SPOOLER} ne "pdq" ? 
-				   ($havelocalnetworks ? N("
-Welcome to the Printer Setup Wizard
-
-This wizard will help you to install your printer(s) connected to this computer, connected directly to the network or to a remote Windows machine.
-
-Please plug in and turn on all printers connected to this machine so that it/they can be auto-detected. Also your network printer(s) and your Windows machines must be connected and turned on.
-
-Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you do not need it.
-
- Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N("
-Welcome to the Printer Setup Wizard
-
-This wizard will help you to install your printer(s) connected to this computer.
-
-Please plug in and turn on all printers connected to this machine so that it/they can be auto-detected.
-
- Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.")) : 
-				   ($havelocalnetworks ? N("
-Welcome to the Printer Setup Wizard
-
-This wizard will help you to install your printer(s) connected to this computer or connected directly to the network.
-
-If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) must be connected and turned on.
-
-Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you do not need it.
-
- Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N("
-Welcome to the Printer Setup Wizard
-
-This wizard will help you to install your printer(s) connected to this computer.
-
-If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected.
-
- Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."))),
-                       callbacks => {
-			   changed => sub {
-			       if ($oldautodetectlocal ne
-				   $autodetectlocal) {
-				   if ($autodetectlocal) {
-				       $configlpd = 0;
-				       $oldconfiglpd = 0;
-				   }
-				   $oldautodetectlocal = $autodetectlocal;
-			       }
-			       if ($oldautodetectnetwork ne
-				   $autodetectnetwork) {
-				   if ($autodetectnetwork) {
-				       $configlpd = 0;
-				       $oldconfiglpd = 0;
-				   }
-				   $oldautodetectnetwork =
-				       $autodetectnetwork;
-			       }
-			       if ($oldautodetectsmb ne
-				   $autodetectsmb) {
-				   if ($autodetectsmb) {
-				       $configlpd = 0;
-				       $oldconfiglpd = 0;
-				   }
-				   $oldautodetectsmb = $autodetectsmb;
-			       }
-			       if ($oldconfiglpd ne $configlpd) {
-				   if ($configlpd) {
-				       $autodetectlocal = 0;
-				       $autodetectnetwork = 0;
-				       $autodetectsmb = 0;
-				       $oldautodetectlocal = 0;
-				       $oldautodetectnetwork = 0;
-				       $oldautodetectsmb = 0;
-				   }
-				   $oldconfiglpd = $configlpd;
-			       }
-			       return 0;
-			   }
-		       }
-                      },
-		     [
-		      { text => N("Auto-detect printers connected to this machine"), type => 'bool',
-			val => \$autodetectlocal },
-		           if_($havelocalnetworks,
-		      { text => N("Auto-detect printers connected directly to the local network"), type => 'bool',
-			val => \$autodetectnetwork },
-			   if_($printer->{SPOOLER} ne "pdq",
-		      { text => N("Auto-detect printers connected to machines running Microsoft Windows"), type => 'bool',
-			val => \$autodetectsmb },
-		      { text => N("Printer on remote lpd server")
-			    . " (" . N("No auto-detection") . ")",
-		        type => 'bool',
-			val => \$configlpd })),
-		      ]);
-		$printer->{AUTODETECTLOCAL} = $autodetectlocal ? 1 : undef;
-		$printer->{AUTODETECTNETWORK} = $autodetectnetwork ? 1 : undef;
-		$printer->{AUTODETECTSMB} = $autodetectsmb && $printer->{SPOOLER} ne "pdq" ? 1 : undef;
-		$printer->{CONFIGLPD} = $configlpd ? 1 : undef;
-		$printer->{TIMEOUT} = 4000;
-	    }
-	};
-	return $@ =~ /wizcancel/ ? 0 : $ret;
-    }
-}
-
-sub wizard_congratulations {
-    my ($in) = @_;
-    local $::isEmbedded = 0;
-    if ($in) {
-	$in->ask_okcancel(N("Add a new printer"),
-			  N("
-Congratulations, your printer is now installed and configured!
-
-You can print using the \"Print\" command of your application (usually in the \"File\" menu).
-
-If you want to add, remove, or rename a printer, or if you want to change the default option settings (paper input tray, printout quality, ...), select \"Printer\" in the \"Hardware\" section of the %s Control Center.", $shortdistroname));
-    }
-}
-
-sub setup_local_autoscan {
-    my ($printer, $in, $upNetwork) = @_;
-    local $::isEmbedded = 0;
-    my $queue = $printer->{OLD_QUEUE};
-    my $expert_or_modify = $printer->{expert} || !$printer->{NEW};
-    my $do_auto_detect = 
-	($expert_or_modify &&
-	  $printer->{AUTODETECT} ||
-	 (!$expert_or_modify &&
-	  ($printer->{AUTODETECTLOCAL} ||
-	   $printer->{AUTODETECTNETWORK} ||
-	   $printer->{AUTODETECTSMB})));
-
-    # If the user requested auto-detection of remote printers, check
-    # whether the network functionality is configured and running
-    if ($printer->{AUTODETECTNETWORK} || $printer->{AUTODETECTSMB}) {
-	return 0 unless check_network($printer, $in, $upNetwork, 0);
-    }
-
-    my @autodetected;
-    my $menuentries = {};
-#    $in->set_help('setupLocal') if $::isInstall;
-    if ($do_auto_detect) {
-	if (!$::testing &&
-	    !$expert_or_modify && $printer->{AUTODETECTSMB} && !files_exist('/usr/bin/smbclient')) {
-	    $in->do_pkgs->install('samba-client') or do {
-		$in->ask_warn(N("Warning"),
-			      N("Could not install the %s packages!",
-				"Samba client") . " " .
-			      N("Skipping Windows/SMB server auto-detection"));
-		$printer->{AUTODETECTSMB} = 0;
-		return 0 if !$printer->{AUTODETECTLOCAL} &&
-			     !$printer->{AUTODETECTNETWORK};
-	    };
-	}
-	my $_w = $in->wait_message(N("Printer auto-detection"), N("Detecting devices..."));
-	@autodetected = (
-	    $expert_or_modify || $printer->{AUTODETECTLOCAL} ? printer::detect::local_detect() : (),
-	    !$expert_or_modify ? printer::detect::whatNetPrinter($printer->{AUTODETECTNETWORK}, $printer->{AUTODETECTSMB}, $printer->{TIMEOUT}) : (),
-        );
-	$printer->{AUTODETECTEDPRINTERSADDPRINTERSTANDARD} = \@autodetected if @autodetected;
-	# We have more than one printer, so we must ask the user for a queue
-	# name in the fully automatic printer configuration.
-	$printer->{MORETHANONE} = $#autodetected > 0;
-	my @str;
-	foreach my $p (@autodetected) {
-	    if (($p->{val}{DESCRIPTION}) || ($p->{val}{MODEL})) {
-		my $menustr = (defined($p->{val}{DESCRIPTION}) &&
-			       (length($p->{val}{DESCRIPTION}) > 5) ?
-			       $p->{val}{DESCRIPTION} :
-			       (($p->{val}{MANUFACTURER} ? 
-				 ($p->{val}{MANUFACTURER} . " ") : ()) .
-				$p->{val}{MODEL}));
-		if ($p->{port} =~ m!^/dev/lp(\d+)$!) {
-                    my $port = $1;
-		    $menustr .= N(" on parallel port #%s", $port);
-		} elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) {
-                    my $printer = $1;
-		    $menustr .= N(", USB printer #%s", $printer);
-		} elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
-                    my ($printer, $port) = ($1, $2);
-		    $menustr .= N(", network printer \"%s\", port %s", $printer, $port);
-		} elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
-                    my ($server, $printer) = ($1, $2);
-		    $menustr .= N(", printer \"%s\" on SMB/Windows server \"%s\"", $printer, $server);
-		}
-		$menustr .= " ($p->{port})" if $printer->{expert};
-		$menuentries->{$menustr} = $p->{port};
-		push @str, N("Detected %s", $menustr);
-	    } else {
-		my $menustr;
-		if ($p->{port} =~ m!^/dev/lp(\d+)$!) {
-                    my $port = $1;
-		    $menustr = N("Printer on parallel port #%s", $port);
-		} elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) {
-                    my $printer = $1;
-		    $menustr = N("USB printer #%s", $printer);
-		} elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
-                    my ($printer, $port);
-		    $menustr .= N("Network printer \"%s\", port %s", $printer, $port);
-		} elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
-                    my ($server, $printer) = ($1, $2);
-		    $menustr .= N("Printer \"%s\" on SMB/Windows server \"%s\"", $printer, $server);
-		}
-		$menustr .= " ($p->{port})" if $printer->{expert};
-		$menuentries->{$menustr} = $p->{port};
-	    }
-	}
-	my @port;
-	if ($printer->{expert}) {
-	    @port = printer::detect::whatPrinterPort();
-	  LOOP: foreach my $q (@port) {
-		if (@str) {
-		    foreach my $p (@autodetected) {
-			last LOOP if $p->{port} eq $q;
-		    }
-		}
-		my $menustr;
-		if ($q =~ m!^/dev/lp(\d+)$!) {
-                    my $port = $1;
-		    $menustr = N("Printer on parallel port #%s", $port);
-		} elsif ($q =~ m!^/dev/usb/lp(\d+)$!) {
-                    my $printer;
-		    $menustr = N("USB printer #%s", $printer);
-		}
-		$menustr .= " ($q)" if $printer->{expert};
-		$menuentries->{$menustr} = $q;
-	    }
-	}
-    } else {
-	# Always ask for queue name in recommended mode when no auto-
-	# detection was done
-	$printer->{MORETHANONE} = $#autodetected > 0;
-	my $m;
-	for ($m = 0; $m <= 2; $m++) {
-	    my $menustr = N("Printer on parallel port #%s", $m);
-	    $menustr .= " (/dev/lp$m)" if $printer->{expert};
-	    $menuentries->{$menustr} = "/dev/lp$m";
-	    $menustr = N("USB printer #%s", $m);
-	    $menustr .= " (/dev/usb/lp$m)" if $printer->{expert};
-	    $menuentries->{$menustr} = "/dev/usb/lp$m";
-	}
-    }
-    my @menuentrieslist = sort { 
-	my @prefixes = ("/dev/lp", "/dev/usb/lp", "/dev/", "socket:", 
-			"smb:");
-	my $first = $menuentries->{$a};
-	my $second = $menuentries->{$b};
-	for (my $i = 0; $i <= $#prefixes; $i++) {
-	    my $firstinlist = $first =~ m!^$prefixes[$i]!;
-	    my $secondinlist = $second =~ m!^$prefixes[$i]!;
-	    if ($firstinlist && !$secondinlist) { return -1 }
-	    if ($secondinlist && !$firstinlist) { return 1 }
-	}
-	return $first cmp $second;
-    } keys(%$menuentries);
-    my $menuchoice = "";
-    my $oldmenuchoice = "";
-    my $device;
-    if ($printer->{configured}{$queue}) {
-	my $p = printer::main::autodetectionentry_for_uri(
-	    $printer->{currentqueue}{connect}, @autodetected);
-	if (defined($p)) {
-	    $device = $p->{port};
-	    $menuchoice = { reverse %$menuentries }->{$device};
-	}
-    }
-    if ($menuchoice eq "" && @menuentrieslist > -1) {
-	$menuchoice = $menuentrieslist[0];
-	$oldmenuchoice = $menuchoice;
-	$device = $menuentries->{$menuchoice} if $device eq "";
-    }
-    if ($in) {
-#	$printer->{expert} or $in->set_help('configurePrinterDev') if $::isInstall;
-	if (@menuentrieslist < 1) { # No menu entry
-	    # auto-detection has failed, we must do all manually
-	    $do_auto_detect = 0;
-	    $printer->{MANUAL} = 1;
-	    if ($printer->{expert}) {
-		$device = $in->ask_from_entry(
-		     N("Local Printer"),
-		     N("No local printer found! To manually install a printer enter a device name/file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."),
-		     { 
-			 complete => sub {
-			     if ($menuchoice eq "") {
-				 $in->ask_warn(N("Error"), N("You must enter a device or file name!"));
-				 return 1, 0;
-			     }
-			     return 0;
-			 }
-		     });
-		return 0 if $device eq "";
-	    } else {
-		local $::isWizard = 0;
-		$in->ask_warn(N("Printer auto-detection"),
-			      N("No printer found!"));
-		return 0;
-	    }
-	} else {
-	    my $manualconf = 0;
-	    $manualconf = 1 if $printer->{MANUAL} || !$do_auto_detect;
-	    if (!$in->ask_from_(
-		 { title => ($expert_or_modify ?
-			     N("Local Printers") :
-			     N("Available printers")),
-		   messages => (($do_auto_detect ?
-				 ($printer->{expert} ?
-				  (@menuentrieslist == 1 ?
-				   (N("The following printer was auto-detected. ") .
-				    ($printer->{NEW} ?
-				     N("If it is not the one you want to configure, enter a device name/file name in the input line") :
-				     N("Alternatively, you can specify a device name/file name in the input line"))) :
-				   (N("Here is a list of all auto-detected printers. ") .
-				    ($printer->{NEW} ?
-				     N("Please choose the printer you want to set up or enter a device name/file name in the input line") :
-				     N("Please choose the printer to which the print jobs should go or enter a device name/file name in the input line")))) :
-				  (@menuentrieslist == 1 ?
-				   (N("The following printer was auto-detected. ") .
-				    ($printer->{NEW} ?
-				     N("The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\".") : 
-				     N("Currently, no alternative possibility is available"))) :
-				   (N("Here is a list of all auto-detected printers. ") .
-				    ($printer->{NEW} ?
-				     N("Please choose the printer you want to set up. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\".") :
-				     N("Please choose the printer to which the print jobs should go."))))) :
-				 ($printer->{expert} ?
-				  N("Please choose the port that your printer is connected to or enter a device name/file name in the input line") :
-				  N("Please choose the port that your printer is connected to."))) .
-				if_($printer->{expert},
-				    N(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."))), 
-				  callbacks => {
-				      complete => sub {
-					  unless ($menuchoice ne "") {
-					      $in->ask_warn(N("Error"), N("You must choose/enter a printer/device!"));
-					      return 1, 0;
-					  }
-					  return 0;
-				      },
-				      changed => sub {
-					  if ($oldmenuchoice ne $menuchoice) {
-					      $device = $menuentries->{$menuchoice};
-					      $oldmenuchoice = $menuchoice;
-					  }
-					  return 0;
-				      }
-				  } },
-		 [
-		  if_($printer->{expert}, { val => \$device }),
-		  { val => \$menuchoice, list => \@menuentrieslist, 
-		    not_edit => !$printer->{expert}, format => \&translate,
-		    allow_empty_list => 1, type => 'list' },
-		  if_(!$printer->{expert} && $do_auto_detect && $printer->{NEW}, 
-		   { text => N("Manual configuration"), type => 'bool',
-		     val => \$manualconf }),
-		  ]
-		 )) {
-		return 0;
-	    }
-	    if ($device ne $menuentries->{$menuchoice}) {
-		$menuchoice = "";
-		$do_auto_detect = 0;
-	    }
-	    $printer->{MANUAL} = $manualconf ? 1 : undef;
-	}
-    }
-
-    #- LPD and LPRng need netcat ('nc') to access to socket printers
-    if (($printer->{SPOOLER} eq 'lpd' || $printer->{SPOOLER} eq 'lprng') &&
-        !$::testing && $device =~ /^socket:/ && !files_exist('/usr/bin/nc')) {
-        $in->do_pkgs->install('nc') or do {
-            $in->ask_warn(N("Error"),
-		N("Could not install the %s packages!",
-		  "nc") . " " .
-		N("Aborting"));
-	    return 0;
-        };
-    }
-
-    # Do configuration of multi-function devices and look up model name
-    # in the printer database
-    setup_common($printer, $in, $menuchoice, $device, $do_auto_detect,
-		  @autodetected);
-
-    1;
-}
-
-sub setup_lpd {
-    my ($printer, $in, $upNetwork) = @_;
-
-    local $::isEmbedded = 0;
-    # Check whether the network functionality is configured and
-    # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
-
-#    $in->set_help('setupLPD') if $::isInstall;
-    my ($uri, $remotehost, $remotequeue);
-    my $queue = $printer->{OLD_QUEUE};
-    if ($printer->{configured}{$queue} &&
-	$printer->{currentqueue}{connect} =~ m/^lpd:/) {
-	$uri = $printer->{currentqueue}{connect};
-	if ($uri =~ m!^\s*lpd://([^/]+)/([^/]+)/?\s*$!) {
-         $remotehost = $1;
-         $remotequeue = $2;
-     }
-    } else {
-	$remotehost = "";
-	$remotequeue = "lp";
-    }
-
-    return if !$in->ask_from(N("Remote lpd Printer Options"),
-N("To use a remote lpd printer, you need to supply the hostname of the printer server and the printer name on that server."), [
-{ label => N("Remote host name"), val => \$remotehost },
-{ label => N("Remote printer name"), val => \$remotequeue } ],
-complete => sub {
-    if ($remotehost eq "") {
-	$in->ask_warn(N("Error"), N("Remote host name missing!"));
-	return 1, 0;
-    }
-    if ($remotequeue eq "") {
-	$in->ask_warn(N("Error"), N("Remote printer name missing!"));
-	return 1, 1;
-    }
-    return 0;
-}
-			      );
-    #- make the DeviceURI from user input.
-    $printer->{currentqueue}{connect} = "lpd://$remotehost/$remotequeue";
-
-    #- LPD does not support filtered queues to a remote LPD server by itself
-    #- It needs an additional program as "rlpr"
-    if ($printer->{SPOOLER} eq 'lpd' && !$::testing &&
-        !files_exist('/usr/bin/rlpr')) {
-        $in->do_pkgs->install('rlpr') or do {
-            $in->ask_warn(N("Error"),
-		N("Could not install the %s packages!",
-		  "rlpr") . " " .
-		N("Aborting"));
-	    return 0;
-        };
-    }
-
-    # Auto-detect printer model (works if host is an ethernet-connected
-    # printer)
-    my $modelinfo = printer::detect::getSNMPModel($remotehost);
-    my $auto_hplip;
-    if (defined($modelinfo) &&
-	$modelinfo->{MANUFACTURER} ne "" &&
-	$modelinfo->{MODEL} ne "") {
-	local $::isWizard = 0;
-        $in->ask_warn(N("Information"), N("Detected model: %s %s",
-                            $modelinfo->{MANUFACTURER}, $modelinfo->{MODEL}));
-        $auto_hplip = 1;
-    } else {
-	$auto_hplip = 0;
-    }
-
-    # Do configuration of multi-function devices and look up model name
-    # in the printer database
-    setup_common($printer, $in,
-		  "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
-		  $printer->{currentqueue}{connect}, $auto_hplip,
-                  ({port => $printer->{currentqueue}{connect},
-                    val => $modelinfo }));
-
-    1;
-}
-
-sub setup_smb {
-    my ($printer, $in, $upNetwork) = @_;
-
-    local $::isEmbedded = 0;
-    # Check whether the network functionality is configured and
-    # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
-
-#    $in->set_help('setupSMB') if $::isInstall;
-    my ($uri, $smbuser, $smbpassword, $workgroup, $smbserver, $smbserverip, $smbshare);
-    my $queue = $printer->{OLD_QUEUE};
-    if ($printer->{configured}{$queue} &&
-	$printer->{currentqueue}{connect} =~ m/^smb:/) {
-	$uri = $printer->{currentqueue}{connect};
-	my $parameters = $uri =~ m!^\s*smb://(.*)$! && $1;
-	# Get the user's login and password from the URI
-	if ($parameters =~ m!([^@]*)@([^@]+)!) {
-	    my $login = $1;
-	    $parameters = $2;
-	    if ($login =~ m!([^:]*):([^:]*)!) {
-		$smbuser = $1;
-		$smbpassword = $2;
-	    } else {
-		$smbuser = $login;
-		$smbpassword = "";
-	    }
-	} else {
-	    $smbuser = "";
-	    $smbpassword = "";
-	}
-	# Get the workgroup, server, and share name
-	if ($parameters =~ m!([^/]*)/([^/]+)/([^/]+)$!) {
-	    $workgroup = $1;
-	    $smbserver = $2;
-	    $smbshare = $3;
-	} elsif ($parameters =~ m!([^/]+)/([^/]+)$!) {
-	    $workgroup = "";
-	    $smbserver = $1;
-	    $smbshare = $2;
-	} else {
-	    die qq(The "smb://" URI must at least contain the server name and the share name!\n);
-	}
-	if (is_ip($smbserver)) {
-	    $smbserverip = $smbserver;
-	    $smbserver = "";
-	}
-    }
-
-    my $autodetect = 0;
-    my @autodetected;
-    my $menuentries;
-    my @menuentrieslist;
-    my $menuchoice = "";
-    my $oldmenuchoice = "";
-    if ($printer->{AUTODETECT}) {
-	$autodetect = 1;
-	if (!$::testing && !files_exist('/usr/bin/smbclient')) {
-	    $in->do_pkgs->install('samba-client') or do {
-		$in->ask_warn(N("Error"),
-			      N("Could not install the %s packages!",
-				"Samba client") . " " .
-			      N("Aborting"));
-		return 0;
-	    };
-	}
-	my $_w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
-	@autodetected = printer::detect::net_smb_detect($printer->{TIMEOUT});
-	$printer->{AUTODETECTEDPRINTERSADDPRINTEREXPERTSMB} = \@autodetected if @autodetected;
-	my ($server, $share);
-	foreach my $p (@autodetected) {
-	    my $menustr;
-	    if ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
-             $server = $1;
-             $share = $2;
-         }
-	    if ($p->{val}{DESCRIPTION}) {
-		$menustr = $p->{val}{DESCRIPTION};
-		$menustr .= N(", printer \"%s\" on server \"%s\"",
-			      $share, $server);
-	    } else {
-		$menustr = N("Printer \"%s\" on server \"%s\"",
-			     $share, $server);
-	    }
-	    $menuentries->{$menustr} = $p->{port};
-	    if ($server eq $smbserver &&
-		$share eq $smbshare) {
-		$menuchoice = $menustr;
-	    }
-	}
-	@menuentrieslist = sort {
-	    $menuentries->{$a} cmp $menuentries->{$b};
-	} keys(%$menuentries);
-	if ($printer->{configured}{$queue} &&
-	    $printer->{currentqueue}{connect} =~ m/^smb:/ &&
-	    $menuchoice eq "") {
-	    my $menustr;
-	    if ($printer->{currentqueue}{make}) {
-		$menustr = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}";
-		$menustr .= N(", printer \"%s\" on server \"%s\"",
-			      $smbshare, $smbserver);
-	    } else {
-		$menustr = N("Printer \"%s\" on server \"%s\"",
-			     $smbshare, $smbserver);
-	    }
-	    $menuentries->{$menustr} = "smb://$smbserver/$smbshare";
-	    unshift(@menuentrieslist, $menustr);
-	    $menuchoice = $menustr;
-	}
-	if (@menuentrieslist < 1) {
-	    $autodetect = 0;
-	} elsif ($menuchoice eq "") {
-	    $menuchoice = $menuentrieslist[0];
-	    if ($menuentries->{$menuentrieslist[0]} =~
-		m!^smb://([^/:]+)/([^/:]+)$!) {
-             $smbserver = $1;
-             $smbshare = $2;
-         }
-	}
-	$oldmenuchoice = $menuchoice;
-    }
-
-    return 0 if !$in->ask_from(
-	 N("SMB (Windows 9x/NT) Printer Options"),
-	 N("To print to a SMB printer, you need to provide the SMB host name (Note! It may be different from its TCP/IP hostname!) and possibly the IP address of the print server, as well as the share name for the printer you wish to access and any applicable user name, password, and workgroup information.") .
-	 ($autodetect ? N(" If the desired printer was auto-detected, simply choose it from the list and then add user name, password, and/or workgroup if needed.") : ""),
-	 [ 
-	  { label => N("SMB server host"), val => \$smbserver },
-	  { label => N("SMB server IP"), val => \$smbserverip },
-	  { label => N("Share name"), val => \$smbshare },
-	  { label => N("User name"), val => \$smbuser },
-	  { label => N("Password"), val => \$smbpassword, hidden => 1 },
-	  { label => N("Workgroup"), val => \$workgroup },
-	  if_($autodetect,
-	   { label => N("Auto-detected"),
-	     val => \$menuchoice, list => \@menuentrieslist, 
-	     not_edit => 1, format => \&translate, sort => 0,
-	     allow_empty_list => 1, type => 'combo' }) ],
-	 complete => sub {
-	     if (!is_ip($smbserverip) && $smbserverip ne "") {
-		 $in->ask_warn(N("Error"), N("IP address should be in format 1.2.3.4"));
-		 return 1, 1;
-	     }
-	     if ($smbserver eq "" && $smbserverip eq "") {
-		 $in->ask_warn(N("Error"), N("Either the server name or the server's IP must be given!"));
-		 return 1, 0;
-	     }
-	     if ($smbshare eq "") {
-		 $in->ask_warn(N("Error"), N("Samba share name missing!"));
-		 return 1, 2;
-	     }
-	     if ($smbpassword ne "") {
-		 local $::isWizard = 0;
-		 my $yes = $in->ask_yesorno(
-		      N("SECURITY WARNING!"),
-		      N("You are about to set up printing to a Windows account with password. Due to a fault in the architecture of the Samba client software the password is put in clear text into the command line of the Samba client used to transmit the print job to the Windows server. So it is possible for every user on this machine to display the password on the screen by issuing commands as \"ps auxwww\".
-
-We recommend to make use of one of the following alternatives (in all cases you have to make sure that only machines from your local network have access to your Windows server, for example by means of a firewall):
-
-Use a password-less account on your Windows server, as the \"GUEST\" account or a special account dedicated for printing. Do not remove the password protection from a personal account or the administrator account.
-
-Set up your Windows server to make the printer available under the LPD protocol. Then set up printing from this machine with the \"%s\" connection type in Printerdrake.
-
-", N("Printer on remote lpd server")) .
-		      ($printer->{expert} ? 
-		       N("Set up your Windows server to make the printer available under the IPP protocol and set up printing from this machine with the \"%s\" connection type in Printerdrake.
-
-", N("Enter a printer device URI")) : "") .
-N("Connect your printer to a Linux server and let your Windows machine(s) connect to it as a client.
-
-Do you really want to continue setting up this printer as you are doing now?"), 0);
-		 return 0 if $yes;
-		 return 1, 2;
-	     }
-	     return 0;
-	 },
-	 changed => sub {
-	     return 0 if !$autodetect;
-	     if ($oldmenuchoice ne $menuchoice) {
-		 if ($menuentries->{$menuchoice} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
-               $smbserver = $1;
-               $smbshare = $2;
-           }
-		 $oldmenuchoice = $menuchoice;
-	     }
-	     return 0;
-	 }
-	 );
-    #- make the DeviceURI from, try to probe for available variable to
-    #- build a suitable URI.
-    $printer->{currentqueue}{connect} =
-    join '', ("smb://", ($smbuser && ($smbuser . 
-    ($smbpassword && ":$smbpassword") . '@')), ($workgroup && "$workgroup/"),
-    ($smbserver || $smbserverip), "/$smbshare");
-
-    if (!$::testing && !files_exist('/usr/bin/smbclient')) {
-	$in->do_pkgs->install('samba-client') or do {
-            $in->ask_warn(N("Error"),
-		N("Could not install the %s packages!",
-		  "Samba client") . " " .
-		N("Aborting"));
-	    return 0;
-        };
-    }
-    $printer->{SPOOLER} eq 'cups' and printer::main::restart_queue($printer);
-    1;
-}
-
-sub setup_ncp {
-    my ($printer, $in, $upNetwork) = @_;
-
-    local $::isEmbedded = 0;
-    # Check whether the network functionality is configured and
-    # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
-
-#    $in->set_help('setupNCP') if $::isInstall;
-    my ($uri, $ncpuser, $ncppassword, $ncpserver, $ncpqueue);
-    my $queue = $printer->{OLD_QUEUE};
-    if ($printer->{configured}{$queue} &&
-	$printer->{currentqueue}{connect} =~ m/^ncp:/) {
-	$uri = $printer->{currentqueue}{connect};
-	my $parameters = $uri =~ m!^\s*ncp://(.*)$!;
-	# Get the user's login and password from the URI
-	if ($parameters =~ m!([^@]*)@([^@]+)!) {
-	    my $login = $1;
-	    $parameters = $2;
-	    if ($login =~ m!([^:]*):([^:]*)!) {
-		$ncpuser = $1;
-		$ncppassword = $2;
-	    } else {
-		$ncpuser = $login;
-		$ncppassword = "";
-	    }
-	} else {
-	    $ncpuser = "";
-	    $ncppassword = "";
-	}
-	# Get the workgroup, server, and share name
-	if ($parameters =~ m!([^/]+)/([^/]+)$!) {
-	    $ncpserver = $1;
-	    $ncpqueue = $2;
-	} else {
-	    die qq(The "ncp://" URI must at least contain the server name and the share name!\n);
-	}
-    }
-
-    return 0 if !$in->ask_from(N("NetWare Printer Options"),
-N("To print on a NetWare printer, you need to provide the NetWare print server name (Note! it may be different from its TCP/IP hostname!) as well as the print queue name for the printer you wish to access and any applicable user name and password."), [
-{ label => N("Printer Server"), val => \$ncpserver },
-{ label => N("Print Queue Name"), val => \$ncpqueue },
-{ label => N("User name"), val => \$ncpuser },
-{ label => N("Password"), val => \$ncppassword, hidden => 1 } ],
-complete => sub {
-    unless ($ncpserver ne "") {
-	$in->ask_warn(N("Error"), N("NCP server name missing!"));
-	return 1, 0;
-    }
-    unless ($ncpqueue ne "") {
-	$in->ask_warn(N("Error"), N("NCP queue name missing!"));
-	return 1, 1;
-    }
-    return 0;
-}
-					);
-    # Generate the Foomatic URI
-    $printer->{currentqueue}{connect} =
-    join '', ("ncp://", ($ncpuser && ($ncpuser . 
-    ($ncppassword && ":$ncppassword") . '@')),
-    "$ncpserver/$ncpqueue");
-
-    if (!$::testing && !files_exist('/usr/bin/nprint')) {
-	$in->do_pkgs->install('ncpfs') or do {
-            $in->ask_warn(N("Error"),
-		N("Could not install the %s packages!",
-		  "ncpfs") . " " .
-		N("Aborting"));
-	    return 0;
-        };
-    } 
-    1;
-}
-
-sub setup_socket {
-    my ($printer, $in, $upNetwork) = @_;
-
-    local $::isEmbedded = 0;
-    # Check whether the network functionality is configured and
-    # running
-    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 }
-
-#    $in->set_help('setupSocket') if $::isInstall;
-
-    my ($uri, $remotehost, $remoteport);
-    my $queue = $printer->{OLD_QUEUE};
-    if ($printer->{configured}{$queue} &&
-	$printer->{currentqueue}{connect} =~ 
-	m!^(socket:|ptal://?hpjd:|hp:/net/)!) {
-	$uri = $printer->{currentqueue}{connect};
-	if ($uri =~ m!^hp:!) {
-	    if ($uri =~ m!^hp:/net/[^\?]+\?ip=(\d+\.\d+\.\d+\.\d+)!) {
-		($remotehost, $remoteport) = ($1, 9100);
-	    }
-	} elsif ($uri =~ m!^ptal:!) {
-	    if ($uri =~ m!^ptal://?hpjd:([^/:]+):([0-9]+)/?\s*$!) {
-		my $ptalport = $2 - 9100;
-		($remotehost, $remoteport) = ($1, $ptalport);
-	    } elsif ($uri =~ m!^ptal://?hpjd:([^/:]+)\s*$!) {
-		($remotehost, $remoteport) = ($1, 9100);
-	    }
-	} else {
-	    ($remotehost, $remoteport) =
-		$uri =~ m!^\s*socket://([^/:]+):([0-9]+)/?\s*$!;
-	}
-    } else {
-	$remotehost = "";
-	$remoteport = "9100";
-    }
-
-    my $autodetect = 0;
-    my @autodetected;
-    my $menuentries;
-    my @menuentrieslist;
-    my $menuchoice = "";
-    my $oldmenuchoice = "";
-    my $detectedprinterchosen = 0;
-    if ($printer->{AUTODETECT}) {
-	$autodetect = 1;
-	my $_w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
-	@autodetected = printer::detect::net_detect($printer->{TIMEOUT});
-	$printer->{AUTODETECTEDPRINTERSEXPERTSOCKET} = \@autodetected if @autodetected;
-	my ($host, $port);
-	foreach my $p (@autodetected) {
-	    my $menustr;
-	    if ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
-		$host = $1;
-		$port = $2;
-	    }
-	    if ($p->{val}{DESCRIPTION}) {
-		$menustr = $p->{val}{DESCRIPTION};
-		$menustr .= N(", host \"%s\", port %s",
-			      $host, $port);
-	    } else {
-		$menustr = N("Host \"%s\", port %s", $host, $port);
-	    }
-	    $menuentries->{$menustr} = $p->{port};
-	    if ($host eq $remotehost &&
-		$host eq $remotehost) {
-		$menuchoice = $menustr;
-		$detectedprinterchosen = 1;
-	    }
-	}
-	@menuentrieslist = sort { 
-	    $menuentries->{$a} cmp $menuentries->{$b};
-	} keys(%$menuentries);
-	if ($printer->{configured}{$queue} &&
-	    $printer->{currentqueue}{connect} =~ m!^(socket:|ptal://?hpjd:|hp:/net/)! &&
-	    $menuchoice eq "") {
-	    my $menustr;
-	    if ($printer->{currentqueue}{make}) {
-		$menustr = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}";
-		$menustr .= N(", host \"%s\", port %s",
-			      $remotehost, $remoteport);
-	    } else {
-		$menustr = N("Host \"%s\", port %s",
-			      $remotehost, $remoteport);
-	    }
-	    $menuentries->{$menustr} = "socket://$remotehost:$remoteport";
-	    unshift(@menuentrieslist, $menustr);
-	    $menuchoice = $menustr;
-	}
-	if (@menuentrieslist < 1) {
-	    $autodetect = 0;
-	} elsif ($menuchoice eq "") {
-	    $menuchoice = $menuentrieslist[0];
-	    if ($menuentries->{$menuentrieslist[0]} =~ m!^socket://([^:]+):(\d+)$!) {
-             $remotehost = $1;
-             $remoteport = $2;
-	     $detectedprinterchosen = 1;
-         }
-	}
-	$oldmenuchoice = $menuchoice;
-    }
-
-    return 0 if !$in->ask_from_(
-	 {
-	     title => N("TCP/Socket Printer Options"),
-	     messages => ($autodetect ?
-			  N("Choose one of the auto-detected printers from the list or enter the hostname or IP and the optional port number (default is 9100) in the input fields.") :
-			  N("To print to a TCP or socket printer, you need to provide the host name or IP of the printer and optionally the port number (default is 9100). On HP JetDirect servers the port number is usually 9100, on other servers it can vary. See the manual of your hardware.")),
-		 callbacks => {
-		 complete => sub {
-		     unless ($remotehost ne "") {
-			 $in->ask_warn(N("Error"), N("Printer host name or IP missing!"));
-			 return 1, 0;
-		     }
-		     unless ($remoteport =~ /^[0-9]+$/) {
-			 $in->ask_warn(N("Error"), N("The port number should be an integer!"));
-			 return 1, 1;
-		     }
-		     return 0;
-		 },
-		 changed => sub {
-		     return 0 if !$autodetect;
-		     if ($oldmenuchoice ne $menuchoice) {
-			 if ($menuentries->{$menuchoice} =~
-			     m!^socket://([^:]+):(\d+)$!) {
-			     $remotehost = $1;
-			     $remoteport = $2;
-			     $detectedprinterchosen = 1;
-			 } else {
-			     $detectedprinterchosen = 0;
-			 }
-			 $oldmenuchoice = $menuchoice;
-		     } else {
-			 $detectedprinterchosen = 0;
-		     }
-		     return 0;
-		 }
-	     }
-	 },
-	 [
-	  { label => ($autodetect ? "" : N("Printer host name or IP")),
-	    val => \$remotehost },
-	  { label => ($autodetect ? "" : N("Port")), val => \$remoteport },
-	  if_($autodetect,
-	   { val => \$menuchoice, list => \@menuentrieslist, 
-	     not_edit => 0, format => \&translate, sort => 0,
-	     allow_empty_list => 1, type => 'list' })
-	  ]
-	 );
-    
-    #- make the Foomatic URI
-    $printer->{currentqueue}{connect} = 
-	join '', ("socket://$remotehost", $remoteport ? ":$remoteport" : ());
-
-    #- LPD and LPRng need netcat ('nc') to access to socket printers
-    if (($printer->{SPOOLER} eq 'lpd' || $printer->{SPOOLER} eq 'lprng') && 
-        !$::testing && !files_exist('/usr/bin/nc')) {
-        $in->do_pkgs->install('nc') or do {
-            $in->ask_warn(N("Error"),
-		N("Could not install the %s packages!",
-		  "nc") . " " .
-		N("Aborting"));
-	    return 0;
-	};
-    }
-
-    # Auto-detect printer model
-    my $modelinfo;
-    if ($printer->{AUTODETECT}) {
-	$modelinfo = printer::detect::getSNMPModel($remotehost);
-    }
-    my $auto_hplip;
-    if (defined($modelinfo) &&
-	$modelinfo->{MANUFACTURER} ne "" &&
-	$modelinfo->{MODEL} ne "") {
-	if (!$detectedprinterchosen) {
-	    local $::isWizard = 0;
-	    $in->ask_warn(N("Information"), N("Detected model: %s %s",
-					      $modelinfo->{MANUFACTURER},
-					      $modelinfo->{MODEL}));
-	}
-        $auto_hplip = 1;
-    } else {
-	$auto_hplip = 0;
-    }
-
-    # Do configuration of multi-function devices and look up model name
-    # in the printer database
-    setup_common($printer, $in,
-		  "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
-		  $printer->{currentqueue}{connect}, $auto_hplip,
-                  ({port => $printer->{currentqueue}{connect},
-                    val => $modelinfo }));
-    1;
-}
-
-sub setup_uri {
-    my ($printer, $in, $upNetwork) = @_;
-
-    local $::isEmbedded = 0;
-#    $in->set_help('setupURI') if $::isInstall;
-    if ($printer->{AUTODETECT} && $printer->{SPOOLER} eq 'cups') {
-	my $_w = $in->wait_message(N("Printerdrake"), 
-				   N("Refreshing Device URI list..."));
-	printer::services::restart("cups");
-    }
-    return if !$in->ask_from(N("Printer Device URI"),
-N("You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Note that not all URI types are supported by all the spoolers."), [
-{ label => N("Printer Device URI"),
-val => \$printer->{currentqueue}{connect},
-list => [ if_($printer->{currentqueue}{connect},
-	      $printer->{currentqueue}{connect}),
-	  ($printer->{SPOOLER} eq 'cups' ?
-	   printer::cups::lpinfo_v() :
-	   ("parallel:/",
-	    "usb:/",
-	    "serial:/",
-	    "http://",
-	    "ipp://",
-	    "lpd://",
-	    "smb://",
-	    "ncp://",
-	    "socket://",
-	    "hp:/usb/",
-	    "hp:/par/",
-	    "hp:/net/",
-	    "file:/",
-	    'postpipe:""')),
-	  ], not_edit => 0, sort => 0 }, ],
-complete => sub {
-    unless ($printer->{currentqueue}{connect} =~ /[^:]+:.+/) {
-	$in->ask_warn(N("Error"), N("A valid URI must be entered!"));
-	return 1, 0;
-    }
-    return 0;
-}
-    );
-
-    # Non-local printer, check network and abort if no network available
-    if ($printer->{currentqueue}{connect} !~ m!^(file:|parallel:|usb:|serial:|mtink:|ptal://?mlc|hp:/(usb|par))! &&
-        !check_network($printer, $in, $upNetwork, 0)) { 
-        return 0;
-    # If the chosen protocol needs additional software, install it.
-    } elsif ($printer->{currentqueue}{connect} =~ /^lpd:/ &&
-        $printer->{SPOOLER} eq 'lpd' &&
-        !$::testing && !files_exist('/usr/bin/rlpr')) {
-	# LPD does not support filtered queues to a remote LPD server by itself
-	# It needs an additional program as "rlpr"
-        $in->do_pkgs->install('rlpr') or do {
-            $in->ask_warn(N("Error"),
-		N("Could not install the %s packages!",
-		  "rlpr") . " " .
-		N("Aborting"));
-		return 0;
-            };
-    } elsif ($printer->{currentqueue}{connect} =~ /^smb:/ &&
-        !$::testing && !files_exist('/usr/bin/smbclient')) {
-	$in->do_pkgs->install('samba-client') or do {
-            $in->ask_warn(N("Error"),
-		N("Could not install the %s packages!",
-		  "Samba client") . " " .
-		N("Aborting"));
-		return 0;
-            };
-    } elsif ($printer->{currentqueue}{connect} =~ /^ncp:/ &&
-	!$::testing && !files_exist('/usr/bin/nprint')) {
-	$in->do_pkgs->install('ncpfs') or do {
-            $in->ask_warn(N("Error"),
-		N("Could not install the %s packages!",
-		  "ncpfs") . " " .
-		N("Aborting"));
-		return 0;
-            };
-    } elsif ($printer->{currentqueue}{connect} =~ /^socket:/ &&
-	#- LPD and LPRng need netcat ('nc') to access to socket printers
-	($printer->{SPOOLER} eq 'lpd' || $printer->{SPOOLER} eq 'lprng') &&
-        !$::testing && !files_exist('/usr/bin/nc')) {
-        $in->do_pkgs->install('nc') or do {
-            $in->ask_warn(N("Error"),
-		N("Could not install the %s packages!",
-		  "nc") . " " .
-		N("Aborting"));
-		return 0;
-            };
-    }
-
-    if ($printer->{currentqueue}{connect} =~ m!^socket://([^:/]+)! ||
-        $printer->{currentqueue}{connect} =~ m!^lpd://([^:/]+)! ||
-        $printer->{currentqueue}{connect} =~ m!^http://([^:/]+)! ||
-        $printer->{currentqueue}{connect} =~ m!^ipp://([^:/]+)!) {
-	
-	# Auto-detect printer model (works if host is an ethernet-connected
-	# printer)
-	my $remotehost = $1;
-	my $modelinfo = printer::detect::getSNMPModel($remotehost);
-        my $auto_hplip;
-        if (defined($modelinfo) &&
-            $modelinfo->{MANUFACTURER} ne "" &&
-	    $modelinfo->{MODEL} ne "") {
-	    local $::isWizard = 0;
-            $in->ask_warn(N("Information"), N("Detected model: %s %s",
-                                $modelinfo->{MANUFACTURER},
-				$modelinfo->{MODEL}));
-            $auto_hplip = 1;
-        } else {
-	    $auto_hplip = 0;
-        }
-
-        # Do configuration of multi-function devices and look up model name
-        # in the printer database
-        setup_common($printer, $in,
-		      "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
-		      $printer->{currentqueue}{connect}, $auto_hplip,
-                      ({port => $printer->{currentqueue}{connect},
-                        val => $modelinfo }));
-    }
-
-    1;
-}
-
-sub setup_postpipe {
-    my ($printer, $in) = @_;
-
-    local $::isEmbedded = 0;
-#    $in->set_help('setupPostpipe') if $::isInstall;
-    my $uri;
-    my $commandline;
-    my $queue = $printer->{OLD_QUEUE};
-    if ($printer->{configured}{$queue} &&
-	$printer->{currentqueue}{connect} =~ m/^postpipe:/) {
-	$uri = $printer->{currentqueue}{connect};
-	$commandline = $1 if $uri =~ m!^\s*postpipe:"(.*)"$!;
-    } else {
-	$commandline = "";
-    }
-
-    return if !$in->ask_from(N("Pipe into command"),
-N("Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer."), [
-{ label => N("Command line"),
-val => \$commandline }, ],
-complete => sub {
-    unless ($commandline ne "") {
-	$in->ask_warn(N("Error"), N("A command line must be entered!"));
-	return 1, 0;
-    }
-    return 0;
-}
-);
-
-    #- make the Foomatic URI
-    $printer->{currentqueue}{connect} = "postpipe:$commandline";
-    
-    1;
-}
-
-sub hplip_bus_warning {
-
-    my ($printer, $in, $device, $hplipentry) = @_;
-
-    # Determine connection type
-    my $bus;
-    if ($device =~ /usb/) {
-	$bus = "usb";
-    } elsif ($device =~ m!/dev/(lp|par.*|printer.*)\d+!) {
-	$bus = "par";
-    } elsif ($device =~ m!^socket://!) {
-	$bus = "net";
-    } else {
-	return 0;
-    }
-
-    # HPLIP supports the connection through which the device is currently
-    # accessed
-    return 1 if $hplipentry->{bus}{$bus};
-
-    # Ask user what to do
-    if ($::noX) {
-	return 0;
-    } else {
-	local $::isWizard = 0;
-	my $modelstr = $hplipentry->{model};
-	$modelstr =~ s/_/ /g;
-	my $choice = $in->ask_from_list
-	    (N("Add a new printer"),
-          #-PO: here, the second %s will be replaced by eiher "to a parallel port",
-          #-PO: "to the USB" or "via the the network:
-	     N("Your printer %s is currently connected %s.",
-	       $modelstr,
-	       ($bus eq "par" ? N("to a parallel port") :
-		($bus eq "usb" ? N("to the USB") :
-		 N("via the network")))) . " " .
-	     N("This type of connection is currently not fully supported by HPLIP.") .
-	     " " .
-	     N("You get full HPLIP support for your device if you connect it ") .
-	     join(", ",
-		  (if_($hplipentry->{bus}{par}, N("to a parallel port")),
-		   if_($hplipentry->{bus}{usb}, N("to the USB")),
-		   if_($hplipentry->{bus}{net}, N("via the network")))) .
-	     ".\n\n" .
-	     N("You can now set up your device with HPLIP anyway (works in many cases), ") .
-	     N("set it up without HPLIP (print-only), ") . N("or") . " " .
-	     N("cancel the setup (for example to reconnect your device).") .
-	     "\n\n" .
-	     N("You can always revise your choice by clicking your printer's entry in the main window, ") .
-	     N("clicking the \"%s\" button, ", N("Edit")) .
-	     N("and choosing \"%s\".", N("Printer connection type")) .
-	     "\n\n" .
-	     N("What do you want to do?"),
-	     [N("Set up with HPLIP"), 
-	      N("Set up without HPLIP"), 
-	      #N("Cancel setup")
-	      ], N("Set up without HPLIP"));
-	if ($choice eq N("Set up with HPLIP")) {
-	    return 1;
-	} elsif ($choice eq N("Set up without HPLIP")) {
-	    return 2;
-	} else {
-	    return 0;
-	}
-    }
-}
-
-sub setup_common {
-
-    my ($printer, $in, $makemodel, $device, $do_auto_detect, @autodetected) = @_;
-
-    local $::isEmbedded = 0;
-    #- Check whether the printer is an HP printer or multi-function device and 
-    #- configure HPLIP if it is one
-
-    my $hplipdevice = "";
-    my $isHPLIP = 0;
-    my $searchunknown = N("Unknown model");
-    my $w;
-    if ($device =~ m!^/dev/! || $device =~ m!^socket://!) {
-	# Ask user whether he has a multi-function device when he did not
-	# do auto-detection or when auto-detection failed
-	if (!$do_auto_detect ||
-	    $makemodel =~ /$searchunknown/i ||
-	    $makemodel =~ /^\s*$/) {
-	    local $::isWizard = 0;
-	    if (!$printer->{noninteractive}) {
-		if ($printer->{SPOOLER} eq 'cups') {
-		    $isHPLIP = $in->ask_yesorno
-			(N("Add a new printer"),
-			 N("On many HP printers there are special functions available, maintenance (ink level checking, nozzle cleaning. head alignment, ...) on all not too old inkjets, scanning on multi-function devices, and memory card access on printers with card readers. ") .
-			 "\n\n" .
-			 N("To access these extra functions on HP printers they must be set up with HPLIP (HP Linux Imaging and Printing). ") .
-			 "\n\n" .
-			 N("Do you want to use HPLIP (choose \"No\" for non-HP printers)? "), 0);
-		}
-	    }
-	}
-	my $hplipentry;
-	my $hplipaborted = 0;
-	if (($printer->{SPOOLER} eq 'cups') &&
-	    (($hplipentry =
-	      printer::main::hplip_device_entry($device, @autodetected)) ||
-	     $isHPLIP)) {
-	    # Device is supported by HPLIP
-	    if ($hplipentry) {
-		my $buswarning = 
-		    hplip_bus_warning($printer, $in, $device, $hplipentry);
-		return 0 if !$buswarning;
-		$hplipaborted = 1 if $buswarning == 2;
-	    }
-	    # Install HPLIP packages
-	    my $hplipinstallfailed = 0;
-	    if (!$::testing &&
-		!$hplipaborted &&
-		!files_exist(qw(/usr/sbin/hpiod))) {
-		if ($::noX) {
-		    $hplipinstallfailed = 1;
-		} else {
-		    $w = $in->wait_message(N("Printerdrake"),
-					   N("Installing %s package...", N("HPLIP")))
-			if !$printer->{noninteractive};
-		    $in->do_pkgs->install('hplip')
-			or do {
-			    $in->ask_warn(N("Warning"),
-					  N("Could not install the %s packages!",
-					    N("HPLIP")) . " " .
-					  N("Only printing will be possible on the %s.",
-					    $makemodel));
-			    $hplipinstallfailed = 1;
-			};
-		}
-	    }
-	    # Remove old HPOJ configuration for this device
-	    if (-f "$::prefix/usr/sbin/ptal-mlcd") { # HPOJ installed?
-		if (my $configfile =
-		    printer::main::remove_hpoj_config($device, @autodetected)) {
-		    if (!$printer->{noninteractive} && !$::noX) {
-			undef $w;
-			local $::isWizard = 0;
-			$in->ask_warn
-			    (N("Error"),
-			     N("Could not remove your old HPOJ configuration file %s for your %s! ",
-			       $configfile, $makemodel) .
-			     N("Please remove the file manually and restart HPOJ."));
-		    }
-		}
-	    }
-
-	    if (!$hplipinstallfailed && !$hplipaborted) {
-		# Start HPLIP and get device URI
-		undef $w;
-		$w = $in->wait_message
-		    (N("Printerdrake"),
-		     N("Checking device and configuring %s...", N("HPLIP")))
-		    if !$printer->{noninteractive};
-
-		if ($isHPLIP && ($device !~ m!^socket://!)) {
-		    # Determine connection type
-		    my $bus;
-		    if ($device =~ /usb/) {
-			$bus = "usb";
-		    } elsif ($device =~ m!/dev/(lp|par.*|printer.*)\d+!) {
-			$bus = "par";
-		    } elsif ($device =~ m!^socket://!) {
-			$bus = "net";
-		    } else {
-			$bus = "@@@";
-		    }
-		    my @uris = printer::main::start_hplip_manual();
-		    my (@menu, %menuhash);
-		    foreach my $item (@uris) {
-			if ($item =~ m!^hp:/($bus)/(\S*?)(\?\S*|)$!) {
-			    my $modelname = $2;
-			    $modelname =~ s/_/ /g;
-			    $modelname = "HP " . $modelname 
-				if $modelname !~ m!^HP\s!i;
-			    push(@menu, $modelname);
-			    $menuhash{$modelname} = $item;
-			}
-		    }
-		    undef $w;
-		    local $::isWizard = 0;
-		    if ($#menu >= 0) {
-			my $choice = $in->ask_from_list
-			    (N("Add a new printer"),
-			     N("Which printer do you want to set up with HPLIP?"),
-			     \@menu, $menu[0]);
-			$hplipdevice = $menuhash{$choice};
-			$hplipentry = 
-			    printer::main::hplip_device_entry_from_uri
-			    ($hplipdevice);
-			if ($hplipentry) {
-			    my $buswarning = 
-				hplip_bus_warning($printer, $in,
-						  $device, $hplipentry);
-			    return 0 if !$buswarning;
-			    if ($buswarning == 2) {
-				$hplipaborted = 1;
-				$hplipdevice = "";
-			    } else {
-				$makemodel = $choice;
-			    }
-			} else {
-			    $in->ask_warn(N("Printerdrake"),
-					  N("HPLIP was not able to communicate with the chosen printer!") . " " .
-					  N("Setting up the printer without HPLIP..."));
-			    $hplipaborted = 1;
-			    $hplipdevice = "";
-			}
-		    } else {
-			$in->ask_warn(N("Printerdrake"),
-				      N("HPLIP did not find any local printers (Parallel, USB) which it supports!") . " " .
-					  N("Setting up the printer without HPLIP..."));
-			$hplipaborted = 1;
-			$hplipdevice = "";
-		    }
-		} else {
-		    $hplipdevice = printer::main::start_hplip
-			($device, $hplipentry, @autodetected);
-		    if (!$hplipentry) {
-			$hplipentry = 
-			    printer::main::hplip_device_entry_from_uri
-			    ($hplipdevice);
-		    }
-		    if (($makemodel !~ /\S/) ||
-			($makemodel =~ /$searchunknown/i)) {
-			$makemodel = $hplipentry->{model};
-			$makemodel =~ s/_/ /g;
-			$makemodel = "HP " . $makemodel 
-			    if $makemodel !~ m!^HP\s!i;
-		    }
-		}
-	    }
-
-	    if ($hplipdevice) {
-		# Configure scanning with SANE on HP's MF devices
-		if ($hplipentry->{scan}) {
-		    # Install SANE
-		    if (!$::testing &&
-			(!files_exist("/usr/bin/scanimage",
-				      #"/usr/bin/xscanimage",
-				      "/etc/sane.d/dll.conf",
-				      "/usr/$lib/sane/libsane-hpaio.so.1") ||
-			 (!files_exist(qw(/usr/bin/xsane)) &&
-			  !files_exist(qw(/usr/bin/kooka)) &&
-			  ($::isInstall ||
-			   !$in->do_pkgs->is_installed('scanner-gui'))))) {
-			undef $w;
-			$w = $in->wait_message(
-			     N("Printerdrake"),
-			     N("Installing SANE packages..."))
-			    if !$printer->{noninteractive};
-			$::noX
-			    or $in->do_pkgs->install('sane-backends',
-						     #'sane-frontends',
-						     ($::isInstall ?
-						      'xsane' : 
-						      'scanner-gui'), 
-						     "${lib}sane-hpaio1")
-			    or do {
-				$in->ask_warn(N("Warning"),
-					      N("Could not install the %s packages!",
-						"SANE") . " " .
-					      N("Scanning on the %s will not be possible.",
-						$makemodel));
-			    };
-		    }
-		    # Configure the HPLIP SANE backend
-		    printer::main::config_sane('hpaio');
-		}
-		if (!$printer->{noninteractive} && !$::noX) {
-		    my $text = "";
-		    # Inform user about how to use HPLIP extra functions
-		    $text = hplip_help($makemodel, $hplipdevice);
-		    if ($text) {
-			undef $w;
-			local $::isWizard = 0;
-			$in->ask_warn
-			    (N("Using and Maintaining your %s",
-			       $makemodel),
-			     $text);
-		    }
-		}
-		# Take the DeviceURI from $hplipdevice.
-		$printer->{currentqueue}{connect} = $hplipdevice;
-	    }
-	}
-	if (!$hplipdevice) {
-	    # make the DeviceURI from $device.
-	    $printer->{currentqueue}{connect} = $device;
-	    $w = $in->wait_message(
-		 N("Printerdrake"),
-		 N("Configuring device..."))
-		if !$printer->{noninteractive} && !defined($w);
-	}
-    } else {
-	# make the DeviceURI from $device.
-	$printer->{currentqueue}{connect} = $device;
-    }
-
-    if ($printer->{currentqueue}{connect} !~ /:/) {
-	if ($printer->{currentqueue}{connect} =~ /usb/) {
-	    $printer->{currentqueue}{connect} =
-		"usb:" . $printer->{currentqueue}{connect};
-	} elsif ($printer->{currentqueue}{connect} =~ /(serial|tty)/) {
-	    $printer->{currentqueue}{connect} =
-		"serial:" . $printer->{currentqueue}{connect};
-	} elsif ($printer->{currentqueue}{connect} =~ 
-		 /(printers|parallel|parport|lp\d)/) {
-	    $printer->{currentqueue}{connect} =
-		"parallel:" . $printer->{currentqueue}{connect};
-	} else {
-	    $printer->{currentqueue}{connect} =
-		"file:" . $printer->{currentqueue}{connect};
-	}
-    }
-
-    #- if CUPS is the spooler, make sure that CUPS knows the device
-    if ($printer->{SPOOLER} eq "cups") {
-	my $hplipsocket = undef;
-	$hplipsocket = "hp:/" if $hplipdevice =~ m!/net/!i;
-	if ($hplipsocket || 
-	    ($device !~ /^lpd:/ &&
-	     $device !~ /^smb:/ &&
-	     $device !~ /^socket:/ &&
-	     $device !~ /^http:/ &&
-	     $device !~ /^ipp:/)) {
-	    my $_w = $in->wait_message(
-		N("Printerdrake"),
-		N("Making printer port available for CUPS..."))
-		if !$printer->{noninteractive};
-	    printer::main::assure_device_is_available_for_cups(
-		$hplipsocket || $hplipdevice || $device);
-	}
-    }
-
-    #- Read the printer driver database if necessary
-    if (keys %printer::main::thedb == 0) {
-	my $_w = $in->wait_message(
-	    N("Printerdrake"), N("Reading printer database..."))
-	    if !$printer->{noninteractive};
-        printer::main::read_printer_db($printer, $printer->{SPOOLER});
-    }
-
-    #- Search the database entry which matches the detected printer best
-    my $descr = "";
-    if ((!$do_auto_detect) &&
-	($makemodel =~ m!^(\S+)\s+(.*?)$!)) {
-	my $mk = $1;
-	my $md = $2;
-	@autodetected = ({ port => $device,
-			   val => { CLASS => 'PRINTER',
-				    MANUFACTURER => $mk,
-				    MODEL => $md,
-				    DESCRIPTION => $makemodel } });
-    }
-    foreach (@autodetected) {
-	$device eq $_->{port} or next;
-	my ($automake, $automodel, $autodescr, $autocmdset, $autosku) =
-	    ($_->{val}{MANUFACTURER}, $_->{val}{MODEL},
-	     $_->{val}{DESCRIPTION}, $_->{val}{'COMMAND SET'},
-	     $_->{val}{SKU});
-	# Clean some manufacturer's names
-	my $descrmake = printer::main::clean_manufacturer_name($automake);
-	if ($automake && $autosku) {
-	    $descr = "$descrmake|$autosku";
-	} elsif ($automake && $automodel) {
-	    $descr = "$descrmake|$automodel";
-	} elsif ($autodescr && (length($autodescr) > 5)) {
-	    $descr = $autodescr;
-	    $descr =~ s/ /|/;
-	} elsif ($automodel) {
-	    $descr = $automodel;
-	    if ($descr !~ /$searchunknown/i) {
-		$descr =~ s/ /|/;
-	    } else {
-		$descr = "|$searchunknown";
-	    }
-	} elsif ($automake) {
-	    $descr = "$descrmake|";
-	} elsif ($makemodel =~ /\S/) {
-	    $descr = $makemodel;
-	    $descr =~ s/ /|/;
-	} else {
-	    $printer->{DBENTRY} = "";
-	    last;
-	}
-	# Remove manufacturer's name from the beginning of the
-	# description (do not do this with manufacturer names which
-	# contain odd characters)
-	$descr =~ s/^$descrmake\|\s*$descrmake\s*/$descrmake|/i
-	    if $descrmake && 
-           $descrmake !~ m![\\/\(\)\[\]\|\.\$\@\%\*\?]!;
-	# Clean up the description from noise which makes the best match
-	# difficult
-	$descr =~ s/\s+[Ss]eries//i;
-	$descr =~ s/\s+\(?[Pp]rinter\)?$//i;
-	$printer->{DBENTRY} = "";
-	# Try to find an exact match, check both whether the detected
-	# make|model is in the make|model of the database entry and vice versa
-	# If there is more than one matching database entry, the longest match
-	# counts.
-	my $matchlength = -100;
-	foreach my $entry (keys %printer::main::thedb) {
-	    # Try to match the device ID string of the auto-detection
-	    if ($printer::main::thedb{$entry}{make} =~ /Generic/i) {
-		# Database entry for generic printer, check printer
-		# languages (command set)
-		my $_cmd = $printer::main::thedb{$entry}{devidcmd};
-		if ($printer::main::thedb{$entry}{model} =~ 
-		    m!PCL\s*5/5e!i) {
-		    # Generic PCL 5/5e Printer
-		    if ($autocmdset =~
-			/(^|[:,])PCL\s*\-*\s*(5|)([,;]|$)/i) {
-			if ($matchlength < -50) {
-			    $matchlength = -50;
-			    $printer->{DBENTRY} = $entry;
-			    next;
-			}
-		    }
-		} elsif ($printer::main::thedb{$entry}{model} =~ 
-		    m!PCL\s*(6|XL)!i) {
-		    # Generic PCL 6/XL Printer
-		    if ($autocmdset =~
-			/(^|[:,])PCL\s*\-*\s*(6|XL)([,;]|$)/i) {
-			if ($matchlength < -40) {
-			    $matchlength = -40;
-			    $printer->{DBENTRY} = $entry;
-			    next;
-			}
-		    }
-		} elsif ($printer::main::thedb{$entry}{model} =~ 
-		    m!(PostScript)!i) {
-		    # Generic PostScript Printer
-		    if ($autocmdset =~
-			/(^|[:,])(PS|POSTSCRIPT)[^:;,]*([,;]|$)/i) {
-			if ($matchlength < -10) {
-			    $matchlength = -10;
-			    $printer->{DBENTRY} = $entry;
-			    next;
-			}
-		    }
-		}
-	    } else {
-		# "Real" manufacturer, check manufacturer, model, and/or
-		# description
-		my $matched = 1;
-		my ($mfg, $mdl, $des);
-		if ($mfg = $printer::main::thedb{$entry}{devidmake}) {
-		    $mfg =~ s/Hewlett[-\s_]Packard/HP/i;
-		    if (uc($mfg) ne uc($automake)) {
-			$matched = 0;
-		    }
-		}
-		if ($mdl = $printer::main::thedb{$entry}{devidmodel}) {
-		    if ($mdl ne $automodel) {
-			$matched = 0;
-		    }
-		}
-		if ($des = $printer::main::thedb{$entry}{deviddesc}) {
-		    $des =~ s/Hewlett[-\s_]Packard/HP/;
-		    $des =~ s/HEWLETT[-\s_]PACKARD/HP/;    
-		    if ($des ne $autodescr) {
-			$matched = 0;
-		    }
-		}
-		if ($matched && ($des || $mfg && $mdl)) {
-		    # Full match to known auto-detection data
-		    $printer->{DBENTRY} = $entry;
-		    $matchlength = 1000;
-		    last;
-		}
-	    }
-	    # Do not search human-readable make and model names if we had an
-	    # exact match or a match to the auto-detection ID string 
-	    next if $matchlength >= 100;
-	    # Try to match the (human-readable) make and model of the
-	    # Foomatic database or of the PPD file
-	    my $dbmakemodel;
-	    if ($printer->{expert}) {
-		$dbmakemodel = $1 if $entry =~ m/^(.*)\|[^\|]*$/;
-	    } else {
-		$dbmakemodel = $entry;
-	    }
-	    # Do not try to match if the database entry does not provide
-	    # make and model
-	    next unless $dbmakemodel;
-	    # If make and model match exactly, we have found the correct
-	    # entry and we can stop searching human-readable makes and
-	    # models
-	    if (lc($dbmakemodel) eq lc($descr)) {
-		$printer->{DBENTRY} = $entry;
-		$matchlength = 100;
-		next;
-	    }
-	    # Matching a part of the human-readable makes and models
-	    # should only be done if the search term is not the name of
-	    # an old model, otherwise the newest, not yet listed models
-	    # match with the oldest model of the manufacturer (as the
-	    # Epson Stylus Photo 900 with the original Epson Stylus Photo)
-	    my @badsearchterms = 
-		("HP|DeskJet",
-		 "HP|LaserJet",
-		 "HP|DesignJet",
-		 "HP|OfficeJet",
-		 "HP|PhotoSmart",
-		 "EPSON|Stylus",
-		 "EPSON|Stylus Color",
-		 "EPSON|Stylus Photo",
-		 "EPSON|Stylus Pro",
-		 "XEROX|WorkCentre",
-		 "XEROX|DocuPrint");
-	    if (!member($descr, @badsearchterms)) {
-		my $searchterm = $descr;
-		my $lsearchterm = length($searchterm);
-		$searchterm =~ s!([\\/\(\)\[\]\|\.\$\@\%\*\?])!\\$1!g;
-		if ($lsearchterm > $matchlength &&
-		    $dbmakemodel =~ m!$searchterm!i) {
-		    $matchlength = $lsearchterm;
-		    $printer->{DBENTRY} = $entry;
-		}
-	    }
-	    if (!member($dbmakemodel, @badsearchterms)) {
-		my $searchterm = $dbmakemodel;
-		my $lsearchterm = length($searchterm);
-		$searchterm =~ s!([\\/\(\)\[\]\|\.\$\@\%\*\?])!\\$1!g;
-		if ($lsearchterm > $matchlength &&
-		    $descr =~ m!$searchterm!i) {
-		    $matchlength = $lsearchterm;
-		    $printer->{DBENTRY} = $entry;
-		}
-	    }
-	}
-	# No matching printer found, try a best match as last mean (not
-	# when generating queues non-interactively)
-	if (!$printer->{noninteractive}) {
-	    $printer->{DBENTRY} ||=
-		bestMatchSentence($descr, keys %printer::main::thedb);
-	    # If the manufacturer was not guessed correctly, discard the
-	    # guess.
-	    my $guessedmake = lc($1) if $printer->{DBENTRY} =~ /^([^\|]+)\|/;
-	    if ($guessedmake !~ /Generic/i &&
-		$descr !~ /$guessedmake/i &&
-		($guessedmake ne "hp" ||
-		 $descr !~ /Hewlett[\s-]+Packard/i))
-            { $printer->{DBENTRY} = "" }
-	}
-	last;
-    }
-
-    #- Pre-fill the "Description" field with the printer's model name
-    if (!$printer->{currentqueue}{desc} && $descr) {
-	$printer->{currentqueue}{desc} = $descr;
-	$printer->{currentqueue}{desc} =~ s/\|/ /g;
-    }
-
-    #- When we have chosen a printer here, the question whether the
-    #- automatically chosen model from the database is correct, should
-    #- have "This model is correct" as default answer
-    delete($printer->{MANUALMODEL});
-
-    1;
-}
-
-sub choose_printer_name {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-    # Name, description, location
-#    $in->set_help('setupPrinterName') if $::isInstall;
-    my $default = $printer->{currentqueue}{queue};
-    $in->ask_from_(
-	 { title => N("Enter Printer Name and Comments"),
-	   #cancel => !$printer->{configured}{$queue} ? '' : N("Remove queue"),
-	   callbacks => { complete => sub {
-	       unless ($printer->{currentqueue}{queue} =~ /^[A-Za-z0-9_]+$/) {
-		   $in->ask_warn(N("Error"), N("Name of printer should contain only letters, numbers and the underscore"));
-		   return 1, 0;
-	       }
-	       local $::isWizard = 0;
-	       if ($printer->{configured}{$printer->{currentqueue}{queue}}
-		   && $printer->{currentqueue}{queue} ne $default && 
-		   !$in->ask_yesorno(N("Warning"), N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?",
-						     $printer->{currentqueue}{queue}),
-				     0)) {
-		   return 1, 0; # Let the user correct the name
-	       }
-	       my $ml = 12;
-	       if ((length($printer->{currentqueue}{queue}) > $ml) && 
-		   !$in->ask_yesorno(N("Warning"), N("The printer name \"%s\" has more than 12 characters which can make the printer unaccessible from Windows clients. Do you really want to use this name?",
-						     $printer->{currentqueue}{queue}),
-				     0)) {
-		   return 1, 0; # Let the user correct the name
-	       }
-	       return 0;
-	   },
-		      },
-	   messages =>
-N("Every printer needs a name (for example \"printer\"). The Description and Location fields do not need to be filled in. They are comments for the users.") }, 
-	 [ { label => N("Name of printer"), val => \$printer->{currentqueue}{queue} },
-	   { label => N("Description"), val => \$printer->{currentqueue}{desc} },
-	   { label => N("Location"), val => \$printer->{currentqueue}{loc} },
-	 ]) or return 0;
-
-    $printer->{QUEUE} = $printer->{currentqueue}{queue};
-    1;
-}
-
-sub get_db_entry {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-    #- Read the printer driver database if necessary
-    if (keys %printer::main::thedb == 0) {
-	my $_w = $in->wait_message(N("Printerdrake"),
-				   N("Reading printer database..."))
-	    if $printer->{noninteractive};
-	printer::main::read_printer_db($printer, $printer->{SPOOLER});
-    }
-    my $_w = $in->wait_message(N("Printerdrake"),
-			       N("Preparing printer database..."))
-	if !$printer->{noninteractive};
-    my $queue = $printer->{OLD_QUEUE};
-    if ($printer->{configured}{$queue}) {
-	# The queue was already configured
-	if ($printer->{configured}{$queue}{queuedata}{foomatic}) {
-	    # The queue was configured with Foomatic
-	    my $driverstr;
-	    if ($printer->{configured}{$queue}{queuedata}{driver} eq "Postscript") {
-		$driverstr = "PostScript";
-	    } else {
-		$driverstr = "GhostScript + $printer->{configured}{$queue}{queuedata}{driver}";
-	    }
-	    my $make = uc($printer->{configured}{$queue}{queuedata}{make});
-	    my $model =	$printer->{configured}{$queue}{queuedata}{model};
-	    if ($printer->{expert}) {
-		$printer->{DBENTRY} = "$make|$model|$driverstr";
-		# database key contains the "(recommended)" for the
-		# recommended driver, so add it if necessary
-		unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
-		    $printer->{DBENTRY} .= " $precstr";
-		}
-	    } else {
-		$printer->{DBENTRY} = "$make|$model";
-	    }
-	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
-	}
-	if ($printer->{configured}{$queue}{queuedata}{ppd} ||
-	    ($printer->{DBENTRY} eq "") ||
-	    !exists($printer::main::thedb{$printer->{DBENTRY}})) {
-	    # Do we have a native CUPS driver, a PostScript PPD file,
-	    # or a pre-built Foomatic PPD file?
-	    $printer->{DBENTRY} =
-		printer::main::get_descr_from_ppd($printer) ||
-		$printer->{DBENTRY};
-	    unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
-		$printer->{DBENTRY} .= " $precstr";
-	    }
-	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
-	}
-	my ($make, $model);
-	if (($printer->{DBENTRY} eq "") ||
-	    !exists($printer::main::thedb{$printer->{DBENTRY}})) {
-	    # Point the list cursor at least to manufacturer and model of 
-	    # the printer
-	    $printer->{DBENTRY} = "";
-	    if ($printer->{configured}{$queue}{queuedata}{foomatic}) {
-		$make = uc($printer->{configured}{$queue}{queuedata}{make});
-		$model = $printer->{configured}{$queue}{queuedata}{model};
-	    } elsif ($printer->{configured}{$queue}{queuedata}{ppd}) {
-		my $makemodel =
-		    printer::main::get_descr_from_ppd($printer);
-		if ($makemodel =~ m!^([^\|]+)\|([^\|]+)(|\|.*)$!) {
-              $make = $1;
-              $model = $2;
-          }
-	    }
-	    foreach my $key (keys %printer::main::thedb) {
-		if ($printer->{expert} &&
-		    $key =~ /^$make\|$model\|.*$sprecstr.*$/ ||
-		    !$printer->{expert} && $key =~ /^$make\|$model$/) {
-		    $printer->{DBENTRY} = $key;
-		}
-	    }
-	}
-	if (($printer->{DBENTRY} eq "") ||
-	    !exists($printer::main::thedb{$printer->{DBENTRY}})) {
-	    # Exact match of make and model did not work, try to clean
-	    # up the model name
-	    $model =~ s/PS//;
-	    $model =~ s/PostScript//i;
-	    $model =~ s/Series//i;
-	    foreach my $key (keys %printer::main::thedb) {
-		if ($printer->{expert} && $key =~ /^$make\|$model\|.*$sprecstr.*$/ ||
-		    !$printer->{expert} && $key =~ /^$make\|$model$/) {
-		    $printer->{DBENTRY} = $key;
-		}
-	    }
-	}
-	if ((($printer->{DBENTRY} eq "") ||
-	     !exists($printer::main::thedb{$printer->{DBENTRY}})) &&
-	    $make ne "") {
-	    # Exact match with cleaned-up model did not work, try a best match
-	    my $matchstr = "$make|$model";
-	    $printer->{DBENTRY} = 
-		bestMatchSentence($matchstr, keys %printer::main::thedb);
-	    # If the manufacturer was not guessed correctly, discard the
-	    # guess.
-	    my $guessedmake = lc($1) if $printer->{DBENTRY} =~ /^([^\|]+)\|/;
-	    if ($matchstr !~ /$guessedmake/i &&
-		($guessedmake ne "hp" ||
-		 $matchstr !~ /Hewlett[\s-]+Packard/i))
-	    { $printer->{DBENTRY} = "" }
-	}
-	if (($printer->{DBENTRY} eq "") ||
-	    !exists($printer::main::thedb{$printer->{DBENTRY}})) {
-	    # Set the OLD_CHOICE to a non-existing value
-	    $printer->{OLD_CHOICE} = "XXX";
-	}
-    } else {
-	if ($printer->{expert} && $printer->{DBENTRY} !~ /$sprecstr/) {
-	    my ($make, $model) = $printer->{DBENTRY} =~ /^([^\|]+)\|([^\|]+)\|/;
-	    foreach my $key (keys %printer::main::thedb) {
-		if ($key =~ /^$make\|$model\|.*$sprecstr.*$/) {
-		    $printer->{DBENTRY} = $key;
-		}
-	    }
-	}
-	$printer->{OLD_CHOICE} = $printer->{DBENTRY};
-    }
-    1;
-}
-
-sub is_model_correct {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-#    $in->set_help('chooseModel') if $::isInstall;
-    my $dbentry = $printer->{DBENTRY};
-    if (!$dbentry) {
-	# If printerdrake could not determine the model, omit this dialog and
-	# let the user choose manually.
-	$printer->{MANUALMODEL} = 1;
-	return 1;
-    }
-    $dbentry =~ s/\|/ /g;
-    my $res = $in->ask_from_list_(
-	     N("Your printer model"),
-	     N("Printerdrake has compared the model name resulting from the printer auto-detection with the models listed in its printer database to find the best match. This choice can be wrong, especially when your printer is not listed at all in the database. So check whether the choice is correct and click \"The model is correct\" if so and if not, click \"Select model manually\" so that you can choose your printer model manually on the next screen.
-
-For your printer Printerdrake has found:
-
-%s", $dbentry),
-	     [N("The model is correct"),
-	      N("Select model manually")],
-	     ($printer->{MANUALMODEL} ? N("Select model manually") : 
-	      N("The model is correct")));
-    return 0 if !$res;
-    $printer->{MANUALMODEL} = $res eq N("Select model manually");
-    1;
-}
-
-sub choose_model {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-#    $in->set_help('chooseModel') if $::isInstall;
-    #- Read the printer driver database if necessary
-    if (keys %printer::main::thedb == 0) {
-	my $_w = $in->wait_message(N("Printerdrake"),
-				  N("Reading printer database..."));
-        printer::main::read_printer_db($printer, $printer->{SPOOLER});
-    }
-    unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
-	$printer->{DBENTRY} = N("Raw printer (No driver)");
-    }
-    # Choose the printer/driver from the list
-    my $choice = $printer->{DBENTRY};
-    my $loadppdchosen = 0;
-    while (1) {
-	if ($in->ask_from_({ 
-	    title => N("Printer model selection"),
-	    messages => N("Which printer model do you have?") .
-		N("
-
-Please check whether Printerdrake did the auto-detection of your printer model correctly. Find the correct model in the list when a wrong model or \"Raw printer\" is highlighted.") 
-		. " " .
-		N("If your printer is not listed, choose a compatible (see printer manual) or a similar one."),
-		#cancel => (""),
-		#ok => (""),
-	    }, [ 
-		 # List the printers/drivers
-		 { val => \$choice, format => \&translate,
-		   sort => 1, separator => "|", tree_expanded => 0,
-		   quit_if_double_click => 1, allow_empty_list => 1,
-		   list => [ keys %printer::main::thedb ] },
-		 # Button to install a manufacturer-supplied PPD file
-		 { clicked_may_quit =>
-		       sub { 
-			   $loadppdchosen = 1;
-			   1; 
-		       },
-		   val => N("Install a manufacturer-supplied PPD file") },
-		 ])) {
-	    $printer->{DBENTRY} = $choice if !$loadppdchosen;
-	} else {
-	    return 0;
-	}
-	last if !$loadppdchosen;
-	# Install a manufacturer-supplied PPD file
-	my $ppdentry;
-	if ($ppdentry = installppd($printer, $in)) {
-	    $choice = $ppdentry;
-	}
-	$loadppdchosen = 0;
-    }
-    return 1;
-}
-
-sub installppd {
-    my ($printer, $in) = @_;
-
-    local $::isEmbedded = 0;
-    # Install a manufacturer-supplied PPD file
-
-    # The dialogs to choose the PPD file should appear as extra
-    # windows and not embedded in the "Add printer" wizard.
-    local $::isWizard = 0;
-
-    my $ppdfile;
-    my ($mediachoice);
-    while (1) {
-	# Tell user about PPD file installation
-	$in->ask_from('Printerdrake',
-		      N("Every PostScript printer is delivered with a PPD file which describes the printer's options and features.") . " " .
-		      N("This file is usually somewhere on the CD with the Windows and Mac drivers delivered with the printer.") . " " .
-		      N("You can find the PPD files also on the manufacturer's web sites.") . " " .
-		      N("If you have Windows installed on your machine, you can find the PPD file on your Windows partition, too.") . "\n" .
-		      N("Installing the printer's PPD file and using it when setting up the printer makes all options of the printer available which are provided by the printer's hardware") . "\n" .
-		      N("Here you can choose the PPD file to be installed on your machine, it will then be used for the setup of your printer."),
-		      [
-		       { label => N("Install PPD file from"), 
-			 val => \$mediachoice,
-			 list => [N("CD-ROM"),
-				  N("Floppy Disk"), 
-				  N("Other place")], 
-			 not_edit => 1, sort => 0 },
-		       ],
-		      ) or return 0;
-	my $dir;
-	if ($mediachoice eq N("CD-ROM")) {
-	    $dir = "/mnt/cdrom";
-	} elsif ($mediachoice eq N("Floppy Disk")) {
-	    $dir = "/mnt/floppy";
-	} elsif ($mediachoice eq N("Other place")) {
-	    $dir = "/mnt";
-	} else {
-	    return 0;
-	}
-	# Let user select a PPD file from a floppy, hard disk, ...
-        $ppdfile = $in->ask_file(N("Select PPD file"), $dir);
-	last if !$ppdfile;
-	if (! -r $ppdfile) {
-	    $in->ask_warn(N("Error"),
-			  N("The PPD file %s does not exist or is unreadable!",
-			    $ppdfile));
-	    next;
-	}
-	if (! printer::main::checkppd($printer, $ppdfile)) {
-	    $in->ask_warn(N("Error"),
-			  N("The PPD file %s does not conform with the PPD specifications!",
-			    $ppdfile));
-	    next;
-	}
-	last;
-    }
-
-    return 0 if !$ppdfile;
-
-    # Install the PPD file in /usr/share/cups/ppd/printerdrake/
-    my $w = $in->wait_message(N("Printerdrake"),
-			       N("Installing PPD file..."));
-    my $ppdentry = printer::main::installppd($printer, $ppdfile);
-    undef $w;
-    return $ppdentry;
-}
-
-my %lexmarkinkjet_options = (
-                             'parallel:/dev/lp0' => " -o Port=ParPort1",
-                             'parallel:/dev/lp1' => " -o Port=ParPort2",
-                             'parallel:/dev/lp2' => " -o Port=ParPort3",
-                             'usb:/dev/usb/lp0' => " -o Port=USB1",
-                             'usb:/dev/usb/lp1' => " -o Port=USB2",
-                             'usb:/dev/usb/lp2' => " -o Port=USB3",
-                             'file:/dev/lp0' => " -o Port=ParPort1",
-                             'file:/dev/lp1' => " -o Port=ParPort2",
-                             'file:/dev/lp2' => " -o Port=ParPort3",
-                             'file:/dev/usb/lp0' => " -o Port=USB1",
-                             'file:/dev/usb/lp1' => " -o Port=USB2",
-                             'file:/dev/usb/lp2' => " -o Port=USB3",
-                             );
-
-my %drv_x125_options = (
-                             'usb:/dev/usb/lp0' => " -o Device=usb_lp1",
-                             'usb:/dev/usb/lp1' => " -o Device=usb_lp2",
-                             'usb:/dev/usb/lp2' => " -o Device=usb_lp3",
-                             'usb:/dev/usb/lp3' => " -o Device=usb_lp4",
-                             'file:/dev/usb/lp0' => " -o Device=usb_lp1",
-                             'file:/dev/usb/lp1' => " -o Device=usb_lp2",
-                             'file:/dev/usb/lp2' => " -o Device=usb_lp3",
-                             'file:/dev/usb/lp3' => " -o Device=usb_lp4",
-                             );
-
-sub get_printer_info {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-    my $queue = $printer->{OLD_QUEUE};
-    my $oldchoice = $printer->{OLD_CHOICE};
-    my $newdriver = 0;
-    if (!$printer->{configured}{$queue} ||    # New queue  or
-	($oldchoice && $printer->{DBENTRY} && # make/model/driver changed
-	 ($oldchoice ne $printer->{DBENTRY} ||
-	  $printer->{currentqueue}{driver} ne 
-	   $printer::main::thedb{$printer->{DBENTRY}}{driver}))) {
-	delete($printer->{currentqueue}{printer});
-	delete($printer->{currentqueue}{ppd});
-	$printer->{currentqueue}{foomatic} = 0;
-	# Read info from printer database
-	foreach (qw(printer ppd driver make model)) {
-	    #- copy some parameters, shorter that way...
-	    $printer->{currentqueue}{$_} = $printer::main::thedb{$printer->{DBENTRY}}{$_};
-	}
-	$newdriver = 1;
-    }
-    # Use the "printer" and not the "foomatic" field to identify a Foomatic
-    # queue because in a new queue "foomatic" is not set yet.
-    if ($printer->{currentqueue}{printer} || # We have a Foomatic queue
-	$printer->{currentqueue}{ppd}) { # We have a PPD queue
-	if ($printer->{currentqueue}{printer}) { # Foomatic queue?
-	    # In case of a new queue "foomatic" was not set yet
-	    $printer->{currentqueue}{foomatic} = 1;
-	    $printer->{currentqueue}{ppd} = undef;
-	} elsif ($printer->{currentqueue}{ppd}) { # PPD queue?
-	    # If we had a Foomatic queue before, unmark the flag and
-	    # initialize the "printer" and "driver" fields
-	    $printer->{currentqueue}{foomatic} = 0;
-	    $printer->{currentqueue}{printer} = undef;
-	    $printer->{currentqueue}{driver} = "PPD";
-	}
-	# Now get the options for this printer/driver combo
-	if ($printer->{configured}{$queue} && 
-	    ($printer->{configured}{$queue}{queuedata}{foomatic} ||
-	     $printer->{configured}{$queue}{queuedata}{ppd})) {
-	    if (!$newdriver) {
-		# The user did not change the printer/driver
-		$printer->{ARGS} = $printer->{configured}{$queue}{args};
-	    } elsif ($printer->{currentqueue}{foomatic}) {
-		# The queue was already configured with Foomatic ...
-		# ... and the user has chosen another printer/driver
-		$printer->{ARGS} = 
-		    printer::main::read_foomatic_options($printer);
-	    } elsif ($printer->{currentqueue}{ppd}) {
-		# ... and the user has chosen another printer/driver
-		$printer->{ARGS} = 
-		    printer::main::read_ppd_options($printer);
-	    }
-	} else {
-	    # The queue was not configured with Foomatic before
-	    # Set some special options
-	    $printer->{SPECIAL_OPTIONS} = '';
-	    # Default page size depending on the country/language
-	    # (US/Canada -> Letter, Others -> A4)
-	    my $pagesize;
-	    if ($printer->{PAPERSIZE}) {
-		$printer->{SPECIAL_OPTIONS} .= 
-		    " -o PageSize=$printer->{PAPERSIZE}";
-	    } elsif (($pagesize = $in->{locale}{country}) ||
-		     ($pagesize = $ENV{LC_PAPER}) ||
-		     ($pagesize = $in->{locale}{lang}) ||
-		     ($pagesize = $ENV{LANG}) ||
-		     ($pagesize = $ENV{LANGUAGE}) ||
-		     ($pagesize = $ENV{LC_ALL})) {
-		if ($pagesize =~ /US/ ||
-		    $pagesize =~ /CA/) {
-		    $pagesize = "Letter";
-		} else {
-		    $pagesize = "A4";
-		}
-		$printer->{SPECIAL_OPTIONS} .= 
-		    " -o PageSize=$pagesize";
-	    }
-	    # Do not embed the following messages in the add-printer
-	    # wizard.
-	    local $::isWizard = 0;
-	    # oki4drv driver -> OKI winprinter which needs the
-	    # oki4daemon to work
-	    if ($printer->{currentqueue}{driver} eq 'oki4drv') {
-		if ($printer->{currentqueue}{connect} !~ 
-		    m!^(parallel|file):/dev/lp0$!) {
-		    $::noX || 
-			$in->ask_warn(N("OKI winprinter configuration"),
-				      N("You are configuring an OKI laser winprinter. These printers\nuse a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver."));
-		}
-		$printer->{currentqueue}{connect} = 'file:/dev/null';
-		# Start the oki4daemon
-		services::start_service_on_boot('oki4daemon');
-		printer::services::start('oki4daemon');
-		# Set permissions
-		
-		my $h = {
-		    cups => sub { set_permissions('/dev/oki4drv', '660', 
-						  'lp', 'sys') },
-		    pdq  => sub { set_permissions('/dev/oki4drv', '666') }
-		};
-		my $s = $h->{$printer->{SPOOLER}} ||= 
-		    sub { set_permissions('/dev/oki4drv', '660',
-					  'lp', 'lp') };
-		&$s;
-	    } elsif ($printer->{currentqueue}{driver} eq 'lexmarkinkjet') {
-		# Set "Port" option
-		my $opt =
-		    $lexmarkinkjet_options{$printer->{currentqueue}{connect}};
-		if ($opt) {
-		    $printer->{SPECIAL_OPTIONS} .= $opt;
-		} else {
-		    $::noX || 
-			$in->ask_warn(N("Lexmark inkjet configuration"),
-				      N("The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to."));
-		    return 0;
-		}
-		# Set device permissions
-		if ($printer->{currentqueue}{connect} =~ 
-		    /^\s*(file|parallel|usb):(\S*)\s*$/) {
-		    if ($printer->{SPOOLER} eq 'cups') {
-			set_permissions($2, '660', 'lp', 'sys');
-		    } elsif ($printer->{SPOOLER} eq 'pdq') {
-			set_permissions($2, '666');
-		    } else {
-			set_permissions($2, '660', 'lp', 'lp');
-		    }
-		}
-		# This is needed to have the device not blocked by the
-		# spooler backend.
-		$printer->{currentqueue}{connect} = 'file:/dev/null';
-		#install packages
-		my $drivertype = $printer->{currentqueue}{model};
-		if ($drivertype eq 'Z22') { $drivertype = 'Z32' }
-		if ($drivertype eq 'Z23') { $drivertype = 'Z33' }
-		$drivertype = lc($drivertype);
-		if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
-		    eval { $::noX or $in->do_pkgs->install("lexmark-drivers-$drivertype") };
-		}
-		if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
-		    # Driver installation failed, probably we do not have
-		    # the commercial CDs
-		    $::noX || 
-			$in->ask_warn(N("Lexmark inkjet configuration"),
-				      N("To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program."));
-		}
-	    } elsif ($printer->{currentqueue}{driver} eq 'drv_x125') {
-		# Set "Device" option
-		my $opt =
-		    $drv_x125_options{$printer->{currentqueue}{connect}};
-		if ($opt) {
-		    $printer->{SPECIAL_OPTIONS} .= $opt;
-		} else {
-		    $::noX || 
-			$in->ask_warn(N("Lexmark X125 configuration"),
-				      N("The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes. Please connect your printer to a local USB port or configure it on the machine where it is connected to."));
-		    return 0;
-		}
-		# Set device permissions
-		if ($printer->{currentqueue}{connect} =~ 
-		    /^\s*(file|parallel|usb):(\S*)\s*$/) {
-              if ($printer->{SPOOLER} eq 'cups') {
-                  set_permissions($2, '660', 'lp', 'sys');
-              } elsif ($printer->{SPOOLER} eq 'pdq') {
-                  set_permissions($2, '666');
-              } else {
-                  set_permissions($2, '660', 'lp', 'lp');
-              }
-		}
-		# This is needed to have the device not blocked by the
-		# spooler backend.
-		$printer->{currentqueue}{connect} = 'file:/dev/null';
-	    } elsif ($printer->{currentqueue}{driver} eq 'ml85p') {
-		# Check whether printer is on first parallel port
-		if ($printer->{currentqueue}{connect} !~
-		    m!^\s*(parallel|file):/dev/(lp|printers/)0\s*$!) {
-		    $::noX || 
-			$in->ask_warn(N("Samsung ML/QL-85G configuration"),
-				      N("The driver for this printer only supports printers locally connected on the first parallel port, no printers on remote machines or print server boxes or on other parallel ports. Please connect your printer to the first parallel port or configure it on the machine where it is connected to."));
-		    return 0;
-		}
-		# Set driver executable permissions
-		if ($printer->{SPOOLER} eq 'cups') {
-		    set_permissions('/usr/bin/ml85p', 
-				    '4750', 'root', 'sys');
-		} elsif ($printer->{SPOOLER} eq 'pdq') {
-		    set_permissions('/usr/bin/ml85p', 
-				    '4755', 'root', 'sys');
-		} else {
-		    set_permissions('/usr/bin/ml85p', 
-				    '4750', 'root', 'lp');
-		}
-		# This is needed to have the device not blocked by the
-		# spooler backend.
-		$printer->{currentqueue}{connect} = 'file:/dev/null';
-	    } elsif (($printer->{currentqueue}{driver} =~
-		      m!^\s*lbp[46]60\s*$!) || 
-		     ($printer->{currentqueue}{ppd} && 
-		      ($printer->{currentqueue}{ppd} =~ 
-		       m!Canon-LBP-[46]60-lbp[46]60.ppd!))) {
-		# Check whether printer is on first parallel port
-		if ($printer->{currentqueue}{connect} !~
-		    m!^\s*(parallel|file):/dev/(lp|printers/)0\s*$!) {
-		    $::noX || 
-			$in->ask_warn(N("Canon LBP-460/660 configuration"),
-				      N("The driver for this printer only supports printers locally connected on the first parallel port, no printers on remote machines or print server boxes or on other parallel ports. Please connect your printer to the first parallel port or configure it on the machine where it is connected to."));
-		    return 0;
-		}
-		# Set driver executable permissions
-		if ($printer->{SPOOLER} eq 'cups') {
-		    set_permissions('/usr/bin/lbp660', 
-				    '4750', 'root', 'sys');
-		} elsif ($printer->{SPOOLER} eq 'pdq') {
-		    set_permissions('/usr/bin/lbp660', 
-				    '4755', 'root', 'sys');
-		} else {
-		    set_permissions('/usr/bin/lbp660', 
-				    '4750', 'root', 'lp');
-		}
-		# This is needed to have the device not blocked by the
-		# spooler backend.
-		$printer->{currentqueue}{connect} = 'file:/dev/null';
-	    } elsif (($printer->{currentqueue}{driver} =~
-		      m!^\s*capt\s*$!) || 
-		     ($printer->{currentqueue}{ppd} && 
-		      ($printer->{currentqueue}{ppd} =~ 
-		       m!Canon-LBP-\d*-capt.ppd!))) {
-		# Check whether printer is on USB
-		if ($printer->{currentqueue}{connect} !~
-		    m!^\s*(usb):!) {
-		    $::noX || 
-			$in->ask_warn(N("Canon LBP-810/1120 (CAPT) configuration"),
-				      N("The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes or on the parallel port. Please connect your printer to the USB or configure it on the machine where it is directly connected to."));
-		    return 0;
-		}
-		# This is needed to have the device not blocked by the
-		# spooler backend.
-		$printer->{currentqueue}{connect} = 'file:/dev/null';
-	    } elsif ($printer->{currentqueue}{printer} eq 'HP-LaserJet_1000') {
-		$in->ask_warn(N("Firmware-Upload for HP LaserJet 1000"),
-			      $hp1000fwtext);
-	    }
-	    if ($printer->{currentqueue}{foomatic}) { # Foomatic queue?
-		$printer->{ARGS} = 
-		    printer::main::read_foomatic_options($printer);
-	    }  elsif ($printer->{currentqueue}{ppd}) { # PPD queue?
-		$printer->{ARGS} =
-		    printer::main::read_ppd_options($printer);
-	    }
-	    delete($printer->{SPECIAL_OPTIONS});
-	}
-    }
-    1;
-}
-
-sub unhexify {
-    # Replace hex notation for unprintable characters in PPD files
-    # by the actual characters ex: "<0A>" --> chr(hex("0A"))
-    # Taken from Foomatic
-    my ($input) = @_;
-    my $output = "";
-    my $hexmode = 0;
-    my $firstdigit = "";
-    for (my $i = 0; $i < length($input); $i++) {
-	my $c = substr($input, $i, 1);
-	if ($hexmode) {
-	    if ($c eq ">") {
-		# End of hex string
-		$hexmode = 0;
-	    } elsif ($c =~ /^[0-9a-fA-F]$/) {
-		# Hexadecimal digit, two of them give a character
-		if ($firstdigit ne "") {
-		    $output .= chr(hex("$firstdigit$c"));
-		    $firstdigit = "";
-		} else {
-		    $firstdigit = $c;
-		}
-	    }
-	} else {
-	    if ($c eq "<") {
-		# Beginning of hex string
-		$hexmode = 1;
-	    } else {
-		# Normal character
-		$output .= $c;
-	    }
-	}
-    }
-    return $output;
-}
-
-sub setup_options {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-    my @simple_options = 
-	("PageSize",        # Media properties
-	 "MediaType",
-	 "Form",
-	 "InputSlot",       # Trays
-	 "Tray",
-	 "OutBin",
-	 "OutputBin",
-	 "FaceUp",
-	 "FaceDown",
-	 "Collate",
-	 "Manual",
-	 "ManualFeed",
-	 "Manualfeed",
-	 "ManualFeeder",
-	 "Feeder",
-	 "Duplex",          # Double-sided printing
-	 "Binding",
-	 "Tumble",
-	 "DoubleSided",
-	 "Resolution",      # Resolution/Quality
-	 "GSResolution",
-	 "HWResolution",
-	 "JCLResolution",
-	 "Quality",
-	 "PrintQuality",
-	 "PrintoutQuality",
-	 "QualityType",
-	 "ImageType",
-	 "stpImageType",
-	 "EconoMode",
-	 "JCLEconoMode",
-	 "FastRes",
-	 "JCLFastRes",
-	 "InkType",         # Colour/Gray/BW, 4-ink/6-ink
-	 "stpInkType",
-	 "Mode",
-	 "OutputMode",
-	 "OutputType",
-	 "ColorMode",
-	 "ColorModel",
-	 "PrintingMode",
-	 "Monochrome",
-	 "BlackOnly",
-	 "Grayscale",
-	 "GrayScale",
-	 "Colour",
-	 "Color",
-	 "Gamma",           # Lighter/Darker
-	 "GammaCorrection",
-	 "GammaGeneral",
-	 "MasterGamma",
-	 "StpGamma",
-	 "stpGamma",
-	 "EconoMode",       # Ink/Toner saving
-	 "Economode",
-	 "TonerSaving",
-	 "JCLEconomode",
-	 "HPNup",           # Other useful options
-	 "InstalledMemory", # Laser printer hardware config
-	 "Option1",
-	 "Option2",
-	 "Option3",
-	 "Option4",
-	 "Option5",
-	 "Option6",
-	 "Option7",
-	 "Option8",
-	 "Option9",
-	 "Option10",
-	 "Option11",
-	 "Option12",
-	 "Option13",
-	 "Option14",
-	 "Option15",
-	 "Option16",
-	 "Option17",
-	 "Option18",
-	 "Option19",
-	 "Option20",
-	 "Option21",
-	 "Option22",
-	 "Option23",
-	 "Option24",
-	 "Option25",
-	 "Option26",
-	 "Option27",
-	 "Option28",
-	 "Option29",
-	 "Option30"
-	 );
-#    $in->set_help('setupOptions') if $::isInstall;
-    if ($printer->{currentqueue}{printer} || # We have a Foomatic queue
-	$printer->{currentqueue}{ppd}) { # We have a CUPS+PPD queue
-	# Set up the widgets for the option dialog
-	my $helptext = N("Printer default settings
-
-You should make sure that the page size and the ink type/printing mode (if available) and also the hardware configuration of laser printers (memory, duplex unit, extra trays) are set correctly. Note that with a very high printout quality/resolution printing can get substantially slower.");
-	my @widgets;
-	my @userinputs;
-	my @choicelists;
-	my @shortchoicelists;
-	my $i;
-	my @oldgroup = ("", "");
-	for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
-	    # Do not show hidden options (member options of a forced
-	    # composite option)
-	    next if $printer->{ARGS}[$i]{hidden};
-	    my $optshortdefault = $printer->{ARGS}[$i]{default};
-	    # Should the option only show when the "Advanced" button was
-	    # clicked?
-	    my $advanced = ((defined($printer->{ARGS}[$i]{group}) &&
-			     $printer->{ARGS}[$i]{group} !~
-			      /^(|General|.*install.*)$/i) ||
-			    (!($printer->{ARGS}[$i]{group}) &&
-			     !member($printer->{ARGS}[$i]{name},
-				     @simple_options)) ? 1 : 0);
-	    # Group header
-	    if ($printer->{ARGS}[$i]{group} ne $oldgroup[$advanced]) {
-		my $_level = $#{$printer->{ARGS}[$i]{grouptrans}};
-		$oldgroup[$advanced] = $printer->{ARGS}[$i]{group};
-		if ($printer->{ARGS}[$i]{group}) {
-		    push(@widgets,
-			 { val => unhexify(join(" / ", 
-				     @{$printer->{ARGS}[$i]{grouptrans}})),
-			   advanced => $advanced });
-		}
-	    }
-	    if ($printer->{ARGS}[$i]{type} eq 'enum') {
-		# enumerated option
-		$choicelists[$i] = [];
-		$shortchoicelists[$i] = [];
-		foreach my $choice (@{$printer->{ARGS}[$i]{vals}}) {
-		    push(@{$choicelists[$i]}, unhexify($choice->{comment}));
-		    push(@{$shortchoicelists[$i]}, $choice->{value});
-		    if ($choice->{value} eq $optshortdefault) {
-			$userinputs[$i] = unhexify($choice->{comment});
-		    }
-		}
-		push(@widgets,
-		     { label => unhexify($printer->{ARGS}[$i]{comment}), 
-		       val => \$userinputs[$i], 
-		       not_edit => 1,
-		       list => \@{$choicelists[$i]},
-		       sort => 0,
-		       advanced => $advanced,
-		       help => $helptext })
-		    if $printer->{ARGS}[$i]{name} ne 'PageRegion';
-	    } elsif ($printer->{ARGS}[$i]{type} eq 'bool') {
-		# boolean option
-		$choicelists[$i] =
-		    [(unhexify($printer->{ARGS}[$i]{comment_true}) ||
-		      unhexify($printer->{ARGS}[$i]{name}) || "Yes"),
-		     (unhexify($printer->{ARGS}[$i]{comment_false}) ||
-		      unhexify($printer->{ARGS}[$i]{name_false}) || "No")];
-		$shortchoicelists[$i] = [];
-		my $numdefault = 
-		    ($optshortdefault =~ m!^\s*(true|on|yes|1)\s*$!i ? 
-		     "1" : "0");
-		$userinputs[$i] = $choicelists[$i][1-$numdefault];
-		push(@widgets,
-		     { label => unhexify($printer->{ARGS}[$i]{comment}),
-		       val => \$userinputs[$i],
-		       not_edit => 1,
-		       list => \@{$choicelists[$i]},
-		       sort => 0,
-		       advanced => $advanced,
-		       help => $helptext });
-	    } else {
-		# numerical option
-		$choicelists[$i] = [];
-		$shortchoicelists[$i] = [];
-		$userinputs[$i] = $optshortdefault;
-		push(@widgets,
-		     { label => unhexify($printer->{ARGS}[$i]{comment}) . 
-			   " ($printer->{ARGS}[$i]{min}... " .
-			       "$printer->{ARGS}[$i]{max})",
-			   #type => 'range',
-			   #min => $printer->{ARGS}[$i]{min},
-			   #max => $printer->{ARGS}[$i]{max},
-			   val => \$userinputs[$i],
-			   advanced => $advanced,
-			   help => $helptext });
-	    }
-	}
-	# Show the options dialog. The call-back function does a
-	# range check of the numerical options.
-	my $windowtitle = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}";
-	if ($printer->{expert}) {
-	    my $driver;
-	    if ($driver = $printer->{currentqueue}{driver}) {
-		if ($printer->{currentqueue}{foomatic}) {
-		    if ($driver eq 'Postscript') {
-			$driver = "PostScript";
-		    } else {
-			$driver = "GhostScript + $driver";
-		    }
-		} elsif ($printer->{currentqueue}{ppd}) {
-		    if ($printer->{DBENTRY}) {
-			$driver = $1 if $printer->{DBENTRY} =~ /^[^\|]*\|[^\|]*\|(.*)$/;
-		    } else {
-			$driver = printer::main::get_descr_from_ppd($printer);
-			if ($driver =~ /^[^\|]*\|[^\|]*$/) { # No driver info
-			    $driver = "PPD";
-			} else {
-			    $driver = $1 if $driver =~ /^[^\|]*\|[^\|]*\|(.*)$/;
-			}
-		    }
-		}
-	    } 
-	    if ($driver) {
-		$windowtitle .= ", $driver";
-	    }
-	}
-	# Do not show the options setup dialog when installing a new printer
-	# in recommended mode without "Manual configuration" turned on.
-	if ((!$printer->{NEW} || $printer->{expert} || $printer->{MANUAL}) &&
-	    !$printer->{noninteractive}) {
-	    return 0 if !$in->ask_from(
-		 $windowtitle,
-		 N("Printer default settings"),
-		 \@widgets,
-		 complete => sub {
-		     my $i;
-		     for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
-			 if ($printer->{ARGS}[$i]{type} eq 'int' || $printer->{ARGS}[$i]{type} eq 'float') {
-			     if ($printer->{ARGS}[$i]{type} eq 'int' && $userinputs[$i] !~ /^[\-\+]?[0-9]+$/) {
-				 $in->ask_warn(N("Error"), N("Option %s must be an integer number!", unhexify($printer->{ARGS}[$i]{comment})));
-				 return 1, $i;
-			     }
-			     if ($printer->{ARGS}[$i]{type} eq 'float' && $userinputs[$i] !~ /^[\-\+]?[0-9\.]+$/) {
-				 $in->ask_warn(N("Error"), N("Option %s must be a number!", unhexify($printer->{ARGS}[$i]{comment})));
-				 return 1, $i;
-			     }
-			     if ($userinputs[$i] < $printer->{ARGS}[$i]{min} || $userinputs[$i] > $printer->{ARGS}[$i]{max}) {
-				 $in->ask_warn(N("Error"), N("Option %s out of range!", unhexify($printer->{ARGS}[$i]{comment})));
-				 return 1, $i;
-			     }
-			 }
-		     }
-		     return 0;
-		 });
-	}
-	# Read out the user's choices and generate the appropriate command
-	# line arguments
-	@{$printer->{currentqueue}{options}} = ();
-	for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
-	    # We did not show hidden options, so we do not have user input 
-	    # to add to the option list
-	    next if $printer->{ARGS}[$i]{hidden};
-	    push(@{$printer->{currentqueue}{options}}, "-o");
-	    if ($printer->{ARGS}[$i]{type} eq 'enum') {
-		# enumerated option
-		my $j;
-		for ($j = 0; $j <= $#{$choicelists[$i]}; $j++) {
-		    if ($choicelists[$i][$j] eq $userinputs[$i]) {
-			$printer->{ARGS}[$i]{default} =
-			    $shortchoicelists[$i][$j];
-			push(@{$printer->{currentqueue}{options}},
-			     $printer->{ARGS}[$i]{name} . "=" .
-			     $shortchoicelists[$i][$j]);
-		    }
-		}
-	    } elsif ($printer->{ARGS}[$i]{type} eq 'bool') {
-		# boolean option
-		my $v = 
-		    ($choicelists[$i][0] eq $userinputs[$i] ? "1" : "0");
-		$printer->{ARGS}[$i]{default} = $v;
-		push(@{$printer->{currentqueue}{options}},
-		     $printer->{ARGS}[$i]{name} . "=" . $v);
-	    } else {
-		# numerical option
-		$printer->{ARGS}[$i]{default} = $userinputs[$i];
-		push(@{$printer->{currentqueue}{options}},
-		     $printer->{ARGS}[$i]{name} . "=" . $userinputs[$i]);
-	    }
-	}
-    }
-    1;
-}
-
-sub setasdefault {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-#    $in->set_help('setupAsDefault') if $::isInstall;
-    if ($printer->{DEFAULT} eq '' || # We have no default printer,
-	                             # so set the current one as default
-	$in->ask_yesorno(N("Printerdrake"), N("Do you want to set this printer (\"%s\")\nas the default printer?", $printer->{QUEUE}), 0)) { # Ask the user
-	$printer->{DEFAULT} = $printer->{QUEUE};
-        printer::default::set_printer($printer);
-    }
-}
-	
-sub print_testpages {
-    my ($printer, $in, $upNetwork) = @_;
-    local $::isEmbedded = 0;
-#    $in->set_help('printTestPages') if $::isInstall;
-    # print test pages
-    my $res2 = 0;
-    my %options = (alta4 => 0, altletter => 0, ascii => 0, photo => 0, standard => 1);
-    my %old_options = (alta4 => 0, altletter => 0, ascii => 0, photo => 0, standard => 1);
-    my $oldres2 = 0;
-    my $res1 = $in->ask_from_(
-	 { title => N("Test pages"),
-	   messages => N("Please select the test pages you want to print.
-Note: the photo test page can take a rather long time to get printed and on laser printers with too low memory it can even not come out. In most cases it is enough to print the standard test page."),
-	   cancel => (!$printer->{NEW} ?
-		       N("Cancel") : ($::isWizard ? N("Previous") : 
-				      N("No test pages"))),
-	   ok => ($::isWizard ? N("Next") : N("Print")),
-	   callbacks => {
-	       changed => sub {
-		   if ($oldres2 ne $res2) {
-		       if ($res2) {
-				 foreach my $opt (keys %options) {
-					$options{$opt} = 0;
-					$old_options{$opt} = 0;
-				 }
-		       }
-		       $oldres2 = $res2;
-		   }
-		   foreach my $opt (keys %options) {
-			  if ($old_options{$opt} ne $options{$opt}) {
-				 if ($options{$opt}) {
-					$res2 = 0;
-					$oldres2 = 0;
-				 }
-				 $old_options{$opt} = $options{$opt};
-			  }
-		   }
-		   return 0;
-	       }
-	   } },
-	 [
-	  { text => N("Standard test page"), type => 'bool',
-	    val => \$options{standard} },
-	  if_($printer->{expert},
-	   { text => N("Alternative test page (Letter)"), type => 'bool', 
-	     val => \$options{altletter} }),
-	  if_($printer->{expert},
-	   { text => N("Alternative test page (A4)"), type => 'bool', 
-	     val => \$options{alta4} }), 
-	  { text => N("Photo test page"), type => 'bool', val => \$options{photo} },
-	  #{ text => N("Plain text test page"), type => 'bool',
-	  #  val => \$options{ascii} }
-	  #if_($::isWizard,
-	  # ({ val => "__________" },
-	  #  { text => N("Do not print any test page"), type => 'bool', 
-	  #    val => \$res2 }))
-	  ]);
-    $res2 = 1 if !($options{standard} || $options{altletter} || $options{alta4} || $options{photo} || $options{ascii});
-    if ($res1 && !$res2) {
-	my @lpq_output;
-	{
-	    my $_w = $in->wait_message(N("Printerdrake"),
-				      N("Printing test page(s)..."));
-	    
-	    $upNetwork and do { &$upNetwork(); undef $upNetwork; sleep(1) };
-	    my $stdtestpage = "/usr/share/printer-testpages/testprint.ps";
-	    my $altlttestpage = "/usr/share/printer-testpages/testpage.ps";
-	    my $alta4testpage = "/usr/share/printer-testpages/testpage-a4.ps";
-	    my $phototestpage = "/usr/share/printer-testpages/photo-testpage.jpg";
-	    my $asciitestpage = "/usr/share/printer-testpages/testpage.asc";
-	    my @testpages;
-	    # Install the filter to convert the photo test page to PS
-	    if ($printer->{SPOOLER} ne "cups" && $options{photo} && !$::testing &&
-		!files_exist('/usr/bin/convert')) {
-		$in->do_pkgs->install('ImageMagick')
-		    or do {
-			# Do not embed this message in the add-printer
-			# wizard.
-			local $::isWizard = 0;
-			$in->ask_warn(N("Warning"),
-				      N("Could not install the %s package!",
-					"ImageMagick") . " " .
-				      N("Skipping photo test page."));
-			$options{photo} = 0;
-		    };
-	    }
-	    # set up list of pages to print
-	    $options{standard} and push @testpages, $stdtestpage;
-	    $options{altletter} and push @testpages, $altlttestpage;
-	    $options{alta4} and push @testpages, $alta4testpage;
-	    $options{photo} and push @testpages, $phototestpage;
-	    $options{ascii} and push @testpages, $asciitestpage;
-	    # Nothing to print
-	    return 1 if $#testpages < 0;
-	    # print the stuff
-	    @lpq_output = printer::main::print_pages($printer, @testpages);
-	}
-	my $dialogtext;
-	if (@lpq_output) {
-	    $dialogtext = N("Test page(s) have been sent to the printer.
-It may take some time before the printer starts.
-Printing status:\n%s\n\n", @lpq_output);
-	} else {
-	    $dialogtext = N("Test page(s) have been sent to the printer.
-It may take some time before the printer starts.\n");
-	}
-	if ($printer->{NEW} == 0) {
-	    # Do not embed the following messages in the add-printer
-	    # wizard.
-	    local $::isWizard = 0;
-	    $in->ask_warn(N("Printerdrake"),$dialogtext);
-	    return 1;
-	} else {
-	    $in->ask_yesorno(N("Printerdrake"), $dialogtext . N("Did it work properly?"), 1) 
-		and return 1;
-	}
-    } else {
-	return($::isWizard ? $res1 : 1);
-    }
-    return 2;
-}
-
-sub printer_help {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-    my $spooler = $printer->{SPOOLER};
-    $spooler = "cups" if $spooler eq "rcups";
-    my $queue = $printer->{QUEUE};
-    my $default = $printer->{DEFAULT};
-    my $raw = 0;
-    my $cupsremote = 0;
-    my $hplip = "";
-    my $scanning = "";
-    my $photocard = "";
-    my $hp11000fw = "";
-    if ($printer->{configured}{$queue}) {
-	if ($printer->{configured}{$queue}{queuedata}{model} eq N("Unknown model") ||
-	    $printer->{configured}{$queue}{queuedata}{model} eq N("Raw printer")) {
-	    $raw = 1;
-	}
-	# Information about extra functions of HP printers enabled by HPLIP
-	$hplip = hplip_help(
-	     $printer->{configured}{$queue}{queuedata}{make} . " " .
-	     $printer->{configured}{$queue}{queuedata}{model}, 
-	     $printer->{configured}{$queue}{queuedata}{connect});
-	if ($hplip) {
-	    $hplip = "\n\n$hplip\n\n";
-	}
-	if ($printer->{configured}{$queue}{queuedata}{printer} eq
-	    'HP-LaserJet_1000') {
-	    $hp11000fw = "\n\n$hp1000fwtext\n";
-	}
-    } else {
-	$cupsremote = 1;
-    }
-
-    my $dialogtext;
-    if ($spooler eq "cups") {
-	$dialogtext =
-N("To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily.
-", ($queue ne $default ? "lpr -P $queue" : "lpr")) .
-N("These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application.
-") .
-(!$raw ?
-N("
-The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) .
-(!$cupsremote ?
- N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s
-
-", $hplip, $hp11000fw) . printer::main::help_output($printer, 'cups') : 
- $hplip . $hp11000fw .
- N("Here is a list of the available printing options for the current printer:
-
-") . printer::main::help_output($printer, 'cups')) : $hplip . $hp11000fw);
-    } elsif ($spooler eq "lprng") {
-	$dialogtext =
-N("To print a file from the command line (terminal window) use the command \"%s <file>\".
-", ($queue ne $default ? "lpr -P $queue" : "lpr")) . 
-N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
-") .
-(!$raw ?
-N("
-The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -Z option=setting -Z switch" : "lpr -Z option=setting -Z switch")) .
-N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $hplip . $hp11000fw : $hplip . $hp11000fw);
-    } elsif ($spooler eq "lpd") {
-	$dialogtext =
-N("To print a file from the command line (terminal window) use the command \"%s <file>\".
-", ($queue ne $default ? "lpr -P $queue" : "lpr")) .
-N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
-") .
-(!$raw ?
-N("
-The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) .
-N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $hplip . $hp11000fw : $hplip . $hp11000fw);
-    } elsif ($spooler eq "pdq") {
-	$dialogtext =
-N("To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\".
-", ($queue ne $default ? "pdq -P $queue" : "pdq"), ($queue ne $default ? "lpr -P $queue" : "lpr")) .
-N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
-") .
-N("You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs.
-If you are using KDE as desktop environment you have a \"panic button\", an icon on the desktop, labeled with \"STOP Printer!\", which stops all print jobs immediately when you click it. This is for example useful for paper jams.
-") .
-(!$raw ?
-N("
-The \"%s\" and \"%s\" commands also allow to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\".
-", "pdq", "lpr", ($queue ne $default ? "pdq -P $queue -aoption=setting -oswitch" : "pdq -aoption=setting -oswitch")) .
-N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s
-
-", $hplip, $hp11000fw) . printer::main::help_output($printer, 'pdq') :
- $hplip . $hp11000fw);
-    }
-    my $windowtitle = ($hplip ?
-			 N("Using/Maintaining the printer \"%s\"", $queue) :
-			 N("Printing on the printer \"%s\"", $queue));
-    if (!$raw && !$cupsremote) {
-        my $choice;
-        while ($choice ne N("Close")) {
-	    $choice = $in->ask_from_list_(
-	         $windowtitle, $dialogtext,
-		 [ N("Print option list"), N("Close") ],
-		 N("Close"));
-	    if ($choice ne N("Close")) {
-		my $_w = $in->wait_message(N("Printerdrake"),
-					  N("Printing option list..."));
-	        printer::main::print_optionlist($printer);
-	    }
-	}
-    } else {
-	$in->ask_warn($windowtitle, $dialogtext);
-    }
-}
-
-sub hplip_help {
-    my ($makemodel, $deviceuri, $hplipentry) = @_;
-    return "" if (!$hplipentry && $deviceuri !~ m!^hp:/!);
-    if (!$hplipentry) {
-	$hplipentry =
-	    printer::main::hplip_device_entry_from_uri($deviceuri);
-	return "" if !$hplipentry;
-    }
-
-    my $text = N("Your %s is set up with HP's HPLIP driver software. This way many special features of your printer are supported.\n\n", $makemodel);
-    
-    if ($hplipentry->{scan}) {
-	$text .= N("The scanner in your printer can be used with the usual SANE software, for example Kooka or XSane (Both in the Multimedia/Graphics menu). ");
-	$text .= N("Run Scannerdrake (Hardware/Scanner in Mandriva Linux Control Center) to share your scanner on the network.\n\n");
-    }
-
-    if (($hplipentry->{card} == 2) && ($deviceuri =~ m!/usb/!i)) {
-	$text .= N("The memory card readers in your printer can be accessed like a usual USB mass storage device. ");
-	$text .= N("After inserting a card a hard disk icon to access the card should appear on your desktop.\n\n");
-    } elsif ($hplipentry->{card} > 0) {
-	$text .= N("The memory card readers in your printer can be accessed using HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) clicking the \"Access Photo Cards...\" button on the \"Functions\" tab. ");
-	$text .= N("Note that this is very slow, reading the pictures from the camera or a USB card reader is usually faster.\n\n");
-    }
-
-    $text .= N("HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a lot of status monitoring and maintenance functions for your %s:\n\n", $makemodel);
-    $text .= N(" - Ink level/status info\n") if $hplipentry->{status};
-    $text .= N(" - Ink nozzle cleaning\n") if $hplipentry->{clean};
-    $text .= N(" - Print head alignment\n") if $hplipentry->{align};
-    $text .= N(" - Color calibration\n") if $hplipentry->{colorcal};
-
-    $text .= "\n";
-
-    return $text;
-}
-
-sub copy_queues_from {
-    my ($printer, $in, $oldspooler) = @_;
-
-    local $::isEmbedded = 0;
-#    $in->set_help('copyQueues') if $::isInstall;
-    my $newspooler = $printer->{SPOOLER};
-    my @oldqueues;
-    my @queueentries;
-    my @queuesselected;
-    my $newspoolerstr;
-    my $oldspoolerstr;
-    my $noninteractive = 0;
-    {
-	my $_w = $in->wait_message(N("Printerdrake"),
-				  N("Reading printer data..."));
-	@oldqueues = printer::main::get_copiable_queues($oldspooler, $newspooler);
-	@oldqueues = sort(@oldqueues);
-	$newspoolerstr = $printer::data::spoolers{$newspooler}{short_name};
-	$oldspoolerstr = $printer::data::spoolers{$oldspooler}{short_name};
-	foreach (@oldqueues) {
-	    push @queuesselected, 1;
-	    push @queueentries, { text => $_, type => 'bool', 
-				   val => \$queuesselected[-1] };
-	}
-	# LPRng and LPD use the same config files, therefore one sees the 
-	# queues of LPD when one uses LPRng and vice versa, but these queues
-	# do not work. So automatically transfer all queues when switching
-	# between LPD and LPRng.
-	if ($oldspooler =~ /^lp/ && $newspooler =~ /^lp/) {
-	    $noninteractive = 1;
-	}
-    }
-    if ($noninteractive ||
-	$in->ask_from_(
-	 { title => N("Transfer printer configuration"),
-	   messages => N("You can copy the printer configuration which you have done for the spooler %s to %s, your current spooler. All the configuration data (printer name, description, location, connection type, and default option settings) is overtaken, but jobs will not be transferred.
-Not all queues can be transferred due to the following reasons:
-", $oldspoolerstr, $newspoolerstr) .
-($newspooler eq "cups" ? N("CUPS does not support printers on Novell servers or printers sending the data into a free-formed command.
-") :
- ($newspooler eq "pdq" ? N("PDQ only supports local printers, remote LPD printers, and Socket/TCP printers.
-") :
-  N("LPD and LPRng do not support IPP printers.
-"))) .
-N("In addition, queues not created with this program or \"foomatic-configure\" cannot be transferred.") .
-if_($oldspooler eq "cups", N("
-Also printers configured with the PPD files provided by their manufacturers or with native CUPS drivers cannot be transferred.")) . N("
-Mark the printers which you want to transfer and click 
-\"Transfer\"."),
-	   cancel => N("Do not transfer printers"),
-           ok => N("Transfer")
-	 },
-         \@queueentries
-      )) {
-	my $queuecopied = 0;
-	foreach (@oldqueues) {
-	    if (shift(@queuesselected)) {
-                my $oldqueue = $_;
-                my $newqueue = $_;
-                if (!$printer->{configured}{$newqueue} || $noninteractive ||
-		    $in->ask_from_(
-	              { title => N("Transfer printer configuration"),
-	                messages => N("A printer named \"%s\" already exists under %s. 
-Click \"Transfer\" to overwrite it.
-You can also type a new name or skip this printer.", 
-				      $newqueue, $newspoolerstr),
-                        ok => N("Transfer"),
-                        cancel => N("Skip"),
-		        callbacks => { complete => sub {
-	                    unless ($newqueue =~ /^\w+$/) {
-				$in->ask_warn(N("Error"), N("Name of printer should contain only letters, numbers and the underscore"));
-				return 1, 0;
-			    }
-			    if ($printer->{configured}{$newqueue}
-				&& $newqueue ne $oldqueue && 
-				!$in->ask_yesorno(N("Warning"), N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?",
-							 $newqueue),
-						   0)) {
-				return 1, 0; # Let the user correct the name
-			    }
-			    return 0;
-			} }
-		    },
-		      [{label => N("New printer name"),val => \$newqueue }])) {
-		    {
-			my $_w = $in->wait_message(N("Printerdrake"), 
-			   N("Transferring %s...", $oldqueue));
-		        printer::main::copy_foomatic_queue($printer, $oldqueue,
-						   $oldspooler, $newqueue) and
-							 $queuecopied = 1;
-		    }
-		    if ($oldqueue eq $printer->{DEFAULT}) {
-			# Make the former default printer the new default
-			# printer if the user does not reject
-			if ($noninteractive ||
-			    $in->ask_yesorno(
-			      N("Transfer printer configuration"),
-			      N("You have transferred your former default printer (\"%s\"), Should it be also the default printer under the new printing system %s?", $oldqueue, $newspoolerstr), 1)) {
-			    $printer->{DEFAULT} = $newqueue;
-			    printer::default::set_printer($printer);
-			}
-		    }
-		}
-            }
-	}
-        if ($queuecopied) {
-	    my $_w = $in->wait_message(N("Printerdrake"),
-                                      N("Refreshing printer data..."));
-	    printer::main::read_configured_queues($printer);
-        }
-    }
-}
-
-sub start_network {
-    my ($in, $upNetwork) = @_;
-    local $::isEmbedded = 0;
-    my $_w = $in->wait_message(N("Printerdrake"), 
-			      N("Starting network..."));
-    if ($::isInstall) {
-	my $ret;
-	if ($upNetwork) {
-            $ret = &$upNetwork();
-            undef $upNetwork;
-            sleep(1);
-        }
-        return $ret;
-    } else { return printer::services::start("network") }
-}
-
-sub network_configured() {
-    # Do configured networks (/etc/sysconfig/network-scripts/ifcfg*) exist?
-    my @netscripts = all("$::prefix/etc/sysconfig/network-scripts");
-    my $netconfigured = 0;
-    (/ifcfg-/ and !/(ifcfg-lo|:|rpmsave|rpmorig|rpmnew)/ and
-      !/(~|\.bak)$/ and $netconfigured = 1) foreach @netscripts;
-    return $netconfigured;
-}
-
-sub check_network {
-
-    # This routine is called whenever the user tries to configure a remote
-    # printer. It checks the state of the network functionality to assure
-    # that the network is up and running so that the remote printer is
-    # reachable.
-
-    my ($printer, $in, $upNetwork, $b_dontconfigure) = @_;
-
-    local $::isEmbedded = 0;
-    # Any additional dialogs caused by this subroutine should appear as
-    # extra windows and not embedded in the "Add printer" wizard.
-    local $::isWizard = 0;
-
-#    $in->set_help('checkNetwork') if $::isInstall;
-
-    # First check: Do configured networks
-    # (/etc/sysconfig/network-scripts/ifcfg*) exist?
-
-    if (!$b_dontconfigure && !network_configured()) {
-	my $go_on = 0;
-	while (!$go_on) {
-	    my $choice = N("Configure the network now");
-	    if ($in->ask_from(N("Network functionality not configured"),
-			      N("You are going to configure a remote printer. This needs working network access, but your network is not configured yet. If you go on without network configuration, you will not be able to use the printer which you are configuring now. How do you want to proceed?"),
-			      [ { val => \$choice, type => 'list',
-				  list => [ N("Configure the network now"),
-					    N("Go on without configuring the network") ] } ])) {
-		if ($choice eq N("Configure the network now")) {
-		    if ($::isInstall) {
-			my $o = $in;
-			require network::netconnect;
-			network::netconnect::real_main($o->{net}, $o, $o->{modules_conf});
-		    } else {
-			system("/usr/sbin/drakconnect");
-		    }
-		    $go_on = network_configured();
-		} else {
-		    return 1;
-		}
-	    } else {
-		return 0;
-	    }
-	}
-    }
-
-    # Do not try to start the network if it is not configured
-    if (!network_configured()) { return 0 }
-
-    # Second check: Is the network running?
-
-    if (printer::detect::network_running()) { return 1 }
-
-    # The network is configured now, start it.
-    if (!start_network($in, $upNetwork) && 
-	(!$b_dontconfigure || $::isInstall)) {
-	$in->ask_warn(N("Warning"), 
-($::isInstall ?
-N("The network configuration done during the installation cannot be started now. Please check whether the network is accessible after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\"", $shortdistroname, $shortdistroname) :
-N("The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again.")));
-	return 0;
-    }
-
-    # Give a SIGHUP to the daemon and in case of CUPS do also the
-    # automatic configuration of broadcasting/access permissions
-    # The daemon is not really restarted but only SIGHUPped to not
-    # interrupt print jobs.
-
-    my $_w = $in->wait_message(N("Printerdrake"), 
-                               N("Restarting printing system..."));
-
-    return printer::main::SIGHUP_daemon($printer->{SPOOLER});
-
-}
-
-sub security_check {
-    # Check the security mode and when in "high" or "paranoid" mode ask the
-    # user whether he really wants to configure printing.
-    my ($spooler, $security, $o_in) = @_;
-
-    local $::isEmbedded = 0;
-    # Any additional dialogs caused by this subroutine should appear as
-    # extra windows and not embedded in the "Add printer" wizard.
-    local $::isWizard = 0;
-
-#    $in->set_help('securityCheck') if $::isInstall;
-
-    # Exit silently if the spooler is PDQ
-    if ($spooler eq "pdq") { return 1 }
-
-    # Exit silently in medium or lower security levels
-    if (!$security || $security < 4) { return 1 }
-    
-    # Exit silently if the current spooler is already activated for the current
-    # security level
-    if (printer::main::spooler_in_security_level($spooler, $security)) { return 1 }
-
-    # Tell user in which security mode he is and ask him whether he really
-    # wants to activate the spooler in the given security mode. Stop the
-    # operation of installing the spooler if he disagrees.
-    my $securitystr = ($security == 4 ? N("high") : N("paranoid"));
-    if ($o_in &&
-	$o_in->ask_yesorno(N("Installing a printing system in the %s security level", $securitystr),
-			 N("You are about to install the printing system %s on a system running in the %s security level.
-
-This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessible by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level.
-
-Do you really want to configure printing on this machine?",
-			   $printer::data::spoolers{$spooler}{short_name},
-			   $securitystr))) {
-        printer::main::add_spooler_to_security_level($spooler, $security);
-	my $service;
-	if ($spooler eq "lpr" || $spooler eq "lprng") {
-	    $service = "lpd";
-	} else {
-	    $service = $spooler;
-	}
-        services::start_service_on_boot($service); #TV
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-sub start_spooler_on_boot {
-    # Checks whether the spooler will be started at boot time and if not,
-    # ask the user whether he wants to start the spooler at boot time.
-    my ($printer, $o_in, $b_service, $b_silentspooleronboot) = @_;
-    # PDQ has no daemon, so nothing needs to be started :
-    return unless $b_service;
-
-    local $::isEmbedded = 0;
-    # Any additional dialogs caused by this subroutine should appear as
-    # extra windows and not embedded in the "Add printer" wizard.
-    local $::isWizard = 0;
-
-#    $in->set_help('startSpoolerOnBoot') if $::isInstall;
-    if (!services::starts_on_boot($b_service)) {
-	if ($b_silentspooleronboot ||
-	    $o_in && $o_in->ask_yesorno(N("Starting the printing system at boot time"),
-			     N("The printing system (%s) will not be started automatically when the machine is booted.
-
-It is possible that the automatic starting was turned off by changing to a higher security level, because the printing system is a potential point for attacks.
-
-Do you want to have the automatic starting of the printing system turned on again?",
-		       $printer::data::spoolers{$printer->{SPOOLER}}{short_name}))) {
-	    services::start_service_on_boot($b_service);
-	}
-    }
-    1;
-}
-
-sub install_spooler {
-    # installs the default spooler and start its daemon
-    my ($printer, $security, $do_pkgs, $o_in, $o_upNetwork, $b_silentspooleronboot) = @_;
-    local $::isEmbedded = 0;
-    return 1 if $::testing;
-    my $spooler = $printer->{SPOOLER};
-    # If the user refuses to install the spooler in high or paranoid
-    # security level, exit.
-    return 0 unless security_check($spooler, $security, $o_in);
-    # should not happen
-    return 0 if $spooler !~ /^(rcups|cups|lpd|lprng|pqd)$/;
-    my $w = $::noX || $::autoqueue || ($o_in && $o_in->wait_message(N("Printerdrake"), N("Checking installed software...")));
-
-    # "lpr" conflicts with "LPRng", remove either "LPRng" or remove "lpr"
-    my $packages = $spoolers{$spooler}{packages2rm};
-    if ($packages && files_exist($packages->[1])) {
-	undef $w;
-        $w = $o_in && $o_in->wait_message(N("Printerdrake"), N("Removing %s..."), $spoolers{$packages->[0]}{short_name});
-        $do_pkgs->remove_nodeps($packages->[0])
-	    or do {
-		$o_in && $o_in->ask_warn(N("Error"),
-			      N("Could not remove the %s printing system!",
-				$spoolers{$packages->[0]}{short_name}));
-		return 0;
-	    };
-    }
-
-    # Install all packages needed to run printerdrake and the chosen spooler
-    $packages = $spoolers{$spooler}{packages2add};
-    push @{$packages->[0]}, @{$commonpackages->[0]};
-    push @{$packages->[0]}, @{$localqueuepackages->[0]} if
-	$spoolers{$spooler}{local_queues};
-    push @{$packages->[1]}, @{$commonpackages->[1]};
-    push @{$packages->[1]}, @{$localqueuepackages->[1]} if
-	$spoolers{$spooler}{local_queues};
-    if (files_exist("/usr/bin/gimp") || files_exist("/usr/bin/gimp-2.2")) {
-	push @{$packages->[0]}, @{$gimpprintingpackages->[0]};
-	push @{$packages->[1]}, @{$gimpprintingpackages->[1]};
-    }
-    if (files_exist("/usr/bin/gnome-panel")) {
-	push @{$packages->[0]}, @{$gnomecupspackages->[0]};
-	push @{$packages->[1]}, @{$gnomecupspackages->[1]};
-    }
-    if (@{$packages->[0]} && !files_exist(@{$packages->[1]})) {
-	undef $w;
-        $w = $o_in && $o_in->wait_message(N("Printerdrake"), N("Installing %s..."), $spoolers{$spooler}{short_name});
-        $do_pkgs->install(@{$packages->[0]})
-	    or do {
-		$o_in && $o_in->ask_warn(N("Error"),
-			      N("Could not install the %s printing system!",
-				$spoolers{$spooler}{short_name}));
-		return 0;
-	    };
-    }
-
-    undef $w;
-    
-    # Start the network (especially during installation), so the
-    # user can set up queues to remote printers.
-
-    $o_upNetwork and do {
-        &$o_upNetwork(); 
-        undef $o_upNetwork; 
-        sleep(1);
-    };
-
-    # Start daemon
-    if ($spooler eq "cups") {
-        # Start daemon
-        # Avoid unnecessary restarting of CUPS, this blocks the
-        # startup of printerdrake for several seconds.
-        printer::services::start_not_running_service("cups");
-	# Remove a remote CUPS server setting from the client.conf
-	# file, otherwise the local CUPS daemon gets overridden.
-	my ($daemonless_cups, $remote_cups_server) =
-	    printer::main::read_client_conf();
-	if ($daemonless_cups) {
-	    printer::main::write_client_conf(0, $remote_cups_server);
-	}
-    } elsif ($spooler eq "rcups") {
-	# Stop CUPS daemon, we want to run daemon-less
-	services::stop("cups") if services::is_service_running("cups");
-	# Do not start CUPS daemon during boot
-	services::do_not_start_service_on_boot("cups");
-    } elsif ($spoolers{$spooler}{service}) {
-        printer::services::restart($spoolers{$spooler}{service});
-    }
-    
-    # Set the choosen spooler tools as defaults for "lpr", "lpq",
-    # "lprm", ...
-    foreach (@{$spoolers{$spooler}{alternatives}}) {
-        set_alternative($_->[0], $_->[1]);
-    }
-
-    # Remove/add PDQ panic buttons from the user's KDE Desktops
-    printer::main::pdq_panic_button($spooler eq 'pdq' ? "add" : "remove");
-
-    # Should it be started at boot time?
-    start_spooler_on_boot($printer, $o_in, $spoolers{$spooler}{boot_spooler},
-			  $b_silentspooleronboot);
-
-    # Give a SIGHUP to the devfsd daemon to correct the permissions
-    # for the /dev/... files according to the spooler
-    #printer::main::SIGHUP_daemon("devfs");
-    1;
-}
-
-sub assure_remote_server_is_set {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-    # Check if a remote CUPS server is specified
-    if (!$printer->{remote_cups_server}) {
-	my ($daemonless_cups, $remote_cups_server) =
-	    printer::main::read_client_conf();
-	if (!$daemonless_cups) {
-	    if (!$in->ask_from_
-		({ title => N("Remote CUPS server and no local CUPS daemon"),
-		   messages => N("In this mode there is no local printing system, all printing requests go directly to the server specified below. Note that it is not possible to define local print queues then and if the specified server is down it cannot be printed at all from this machine.") .
-		       "\n\n" . 
-		       N("Enter the host name or IP of your CUPS server and click OK if you want to use this mode, click \"Quit\" otherwise."),
-		   cancel => N("Quit"),
-		   callbacks => {
-		       complete => sub {
-			   if ($remote_cups_server =~ /^\s*$/) {
-			       
-			       $in->ask_warn(N("Error"), N("CUPS server name or IP address missing."));
-			       return 1, 1;
-			   }
-			   return 0;
-		       },
-		   },
-	       },
-		 # Show the widgets
-		 [ { label => N("Name or IP of remote server:"),
-		     val => \$remote_cups_server, 
-		 } ],
-		 )) {
-		# Cancel was clicked
-		exit 1;
-	    }
-	    printer::main::write_client_conf(1, $remote_cups_server);
-	    $printer->{remote_cups_server} = $remote_cups_server;
-	}
-    }
-    1;
-}
-
-sub assure_default_printer_is_set {
-    my ($printer, $in) = @_;
-    if (defined($printer->{SPOOLER}) && $printer->{SPOOLER} &&
-	(!defined($printer->{DEFAULT}) || !$printer->{DEFAULT})) {
-	my $_w = $::noX || $::autoqueue || 
-	    $in->wait_message(N("Printerdrake"),
-			      N("Setting Default Printer..."));
-	$printer->{DEFAULT} = printer::default::get_printer($printer);
-	if ($printer->{DEFAULT}) {
-	    # If a CUPS system has only remote printers and no default
-	    # printer defined, it defines the first printer whose
-	    # broadcast signal appeared after the start of the CUPS
-	    # daemon, so on every start another printer gets the default
-	    # printer. To avoid this, make sure that the default printer
-	    # is defined.
-	    printer::default::set_printer($printer);
-	} else { $printer->{DEFAULT} = '' }
-    }
-}
-
-sub set_cups_daemon_mode {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-    my ($modechoice, $daemonless_cups, $remote_cups_server);
-
-    if ($in->ask_from_
-	({ title => N("Local CUPS printing system or remote CUPS server?"),
-	   messages => N("The CUPS printing system can be used in two ways: ") .
-	       "\n\n" .
-	       N("1. The CUPS printing system can run locally. ") .
-	       N("Then locally connected printers can be used and remote printers on other CUPS servers in the same network are automatically discovered. ") .
-	       N("Disadvantage of this approach is, that more resources on the local machine are needed: Additional software packages need to be installed, the CUPS daemon has to run in the background and needs some memory, and the IPP port (port 631) is opened. ") .
-	       "\n\n" .
-	       N("2. All printing requests are immediately sent to a remote CUPS server. ") .
-	       N("Here local resource occupation is reduced to a minimum. No CUPS daemon is started or port opened, no software infrastructure for setting up local print queues is installed, so less memory and disk space is used. ") .
-	       N("Disadvantage is that it is not possible to define local printers then and if the specified server is down it cannot be printed at all from this machine. ") .
-	       "\n\n" .
-	       N("How should CUPS be set up on your machine?"),
-	   callbacks => {
-	       complete => sub {
-		   if ($modechoice eq 
-		       N("Remote server, specify Name or IP here:") &&
-		       $remote_cups_server =~ /^\s*$/) {
-		       
-		       $in->ask_warn(N("Error"), N("CUPS server name or IP address missing."));
-		       return 1, 1;
-		   }
-		   return 0;
-	       },
-	   },
-       },
-	 # Show the widgets
-	 [ { val => \$modechoice, format => \&translate,
-	     type => 'list',
-	     sort => 0,
-	     list => [ N("Local CUPS printing system"),
-		       N("Remote server, specify Name or IP here:") ] },
-	   { val => \$remote_cups_server, 
-	     disabled => sub {
-		 $modechoice ne 
-		     N("Remote server, specify Name or IP here:");
-	     } },
-	   ],
-	 )) {
-	# OK was clicked, update the data
-	$daemonless_cups = 
-	    ($modechoice eq N("Remote server, specify Name or IP here:"));
-	if ($daemonless_cups) {
-	    $printer->{SPOOLER} = "rcups";
-	    $printer->{remote_cups_server} = $remote_cups_server;
-	} else {
-	    $printer->{SPOOLER} = "cups";
-	    undef $printer->{remote_cups_server};
-	}
-	printer::main::write_client_conf($daemonless_cups,
-					 $remote_cups_server);
-	return 1;
-    } else {
-	# Cancel was clicked
-	return 0;
-    }
-}
-
-
-sub setup_default_spooler {
-    my ($printer, $security, $in, $upNetwork) = @_;
-    local $::isEmbedded = 0;
-    my $oldspooler = $printer->{SPOOLER};
-    $printer->{SPOOLER} ||= 'cups';
-    my @spoolerlist = printer::main::spooler();
-    if ($#spoolerlist == 1) {
-	set_cups_daemon_mode($printer, $in) || return;
-    } else {
-	my $str_spooler = 
-	    $in->ask_from_listf_raw({ title => N("Select Printer Spooler"),
-				      messages => N("Which printing system (spooler) do you want to use?"),
-				      interactive_help_id => 'setupDefaultSpooler',
-				  },
-				    sub { translate($_[0]) },
-				    \@spoolerlist,
-				    $spoolers{$printer->{SPOOLER}}{long_name},
-				    ) or return;
-	$printer->{SPOOLER} = $spooler_inv{$str_spooler};
-    }
-    # Install the spooler if not done yet
-    if (!install_spooler($printer, $security, $in->do_pkgs, $in, $upNetwork)) {
-	$printer->{SPOOLER} = $oldspooler;
-	return;
-    }
-    assure_remote_server_is_set($printer, $in)
-	if ($printer->{SPOOLER} eq "rcups");
-    if ($printer->{SPOOLER} ne $oldspooler) {
-	# Get the queues of this spooler
-	{
-	    my $_w = $in->wait_message(N("Printerdrake"),
-				      N("Reading printer data..."));
-	    printer::main::read_configured_queues($printer);
-	}
-	# Copy queues from former spooler
-	copy_queues_from($printer, $in, $oldspooler)
-	    if ($oldspooler && ($oldspooler ne "rcups"));
-	# Re-read the printer database (CUPS has additional drivers, PDQ
-	# has no raw queue)
-	%printer::main::thedb = ();
-	assure_default_printer_is_set($printer, $in);
-    }
-    # Save spooler choice
-    printer::default::set_spooler($printer);
-    return $printer->{SPOOLER};
-}
-
-sub configure_queue {
-    my ($printer, $in) = @_;
-    local $::isEmbedded = 0;
-    my $_w = $in->wait_message(N("Printerdrake"),
-			       N("Configuring printer \"%s\"...",
-				 $printer->{currentqueue}{queue}))
-	if !$printer->{noninteractive};
-    $printer->{complete} = 1;
-    my $retval = printer::main::configure_queue($printer);
-    $printer->{complete} = 0;
-    if (!$retval && !$printer->{noninteractive}) {
-	local $::isWizard = 0;
-	$in->ask_warn(N("Printerdrake"),
-		      N("Failed to configure printer \"%s\"!",
-			$printer->{currentqueue}{queue}));
-    }
-    return $retval;
-}
-
-sub install_foomatic {
-    my ($in) = @_;
-    local $::isEmbedded = 0;
-    if (!$::testing &&
-	!files_exist(qw(/usr/bin/foomatic-configure 
-			/usr/bin/foomatic-rip
-			/usr/share/foomatic/db/source/driver/ljet4.xml
-			/usr/share/foomatic/db/source/driver/hpijs.xml))) {
-	my $_w = $in->wait_message(N("Printerdrake"),
-				   N("Installing Foomatic..."));
-	$in->do_pkgs->install('foomatic-db-engine',
-			      'foomatic-filters',
-			      'foomatic-db', 'foomatic-db-hpijs') 
-	    or do {
-		$in->ask_warn(N("Error"),
-			      N("Could not install %s packages, %s cannot be started!",
-				"Foomatic", "printerdrake"));
-		exit 1;
-	    };
-    }
-}
-
-sub wizard_close {
-    my ($in, $mode) = @_;
-    local $::isEmbedded = 0;
-    # Leave wizard mode with congratulations screen if $mode = 1
-    $::Wizard_no_previous = 1;
-    $::Wizard_no_cancel = 1;
-    $::Wizard_finished = 1;
-    wizard_congratulations($in) if $mode == 1;
-    undef $::isWizard;
-    $::WizardWindow->destroy if defined $::WizardWindow;
-    undef $::WizardWindow;
-}
-
-#- Program entry point for configuration of the printing system.
-sub main {
-    my ($printer, $security, $in, $install_step, $upNetwork) = @_;
-    # $install_step is only made use of during the installation. It is
-    # 0 when this function is called during the preparation of the "Summary"
-    # screen and 1 when the user clicks on "Configure" on the "Summary" 
-    # screen
-
-    # Initialization of Printerdrake and queue auto-installation:
-    # During installation we do this step only once, when we prepare
-    # the "Summary" screen in case of detected local printers or when
-    # the "Configure" button in the "Printer" entry of the "Summary"
-    # screen is clicked. If the button is clicked after an automatic
-    # installation of local printers or if it is clicked for the
-    # second time, these steps are not repeated.
-
-    # Set the spooler to CUPS if we arrive here during the preparation
-    # of the "Summary" screen of the installation, as we have local
-    # printers then (if we do not have local printers, this function
-    # is not called during the preparation of the "Summary" screen).
-    if (!$::isInstall || !$::printerdrake_initialized) {
-	$printer->{SPOOLER} ||= 'cups'
-	    if ($::isInstall && $install_step == 0 && !$printer->{expert});
-	init($printer, $security, $in, $upNetwork) or return;
-    }
-
-    # Main loop: During installation we only enter it when the user has
-    # clicked on the "Configure" button in the "Summary" step. We do not
-    # call it during the preparation of the "Summary" screen.
-    if (!$::isInstall || $install_step == 1) {
-	# Ask for a spooler when none is defined yet
-	$printer->{SPOOLER} ||= 
-	    setup_default_spooler($printer, $security, $in, $upNetwork) || return;
-    
-	# Save the default spooler
-	printer::default::set_spooler($printer);
-
-	mainwindow_interactive($printer, $security, $in, $upNetwork);
-    }
-    # In the installation we call the clean-up manually when we leave 
-    # the "Summary" step
-    if (!$::isInstall) {
-	final_cleanup($printer);
-    }
-}
-
-sub init {
-    my ($printer, $security, $in, $upNetwork) = @_;
-
-    # Initialization of Printerdrake and queue auto-installation
-
-    # This subroutine is called on every start of printerdrake
-    # directly, from mcc, during installation, or for automatic print
-    # queue setup in the background, triggered when
-    # hotplug/udev/dynamic (script /etc/dynamic/script/lp.script)
-    # discovers a new printer being connected and turned on.
-
-    # In the latter case (background queue installation) only this
-    # subroutine is called as only the automatic, non-interactive
-    # print queue creation is needed. This must be totally
-    # non-interactive and cannot open any window on the X desktop,
-    # also packages cannot be installed, as the background process
-    # cannot ask the user to insert CDs. To reach this state of
-    # absolute silence, there is the global variable $::noX. If it is
-    # set, all interactivity or wait message is suppressed. If
-    # interactivity is required, the operation requiring interactivity
-    # will be skipped.
-
-    # Save the user mode, so that the same one is used on the next start
-    # of Printerdrake
-    printer::main::set_usermode($printer->{expert});
-
-    # Get the settings for printer auto administration
-    printer::main::get_auto_admin($printer);
-
-    # only experts should be asked for the spooler also for background
-    # installation of print it should not be asked for the spooler,
-    # as this feature is only supported for CUPS.
-    $printer->{SPOOLER} ||= 'cups'
-	if (!$printer->{expert} || $::noX || $::autoqueue) && !$::isInstall;
-
-    # If we have chosen a spooler, install it and mark it as default 
-    # spooler. Spooler installation is ommitted on background queue
-    # installation, because this only works when CUPS is already running
-    if ($printer->{SPOOLER}) {
-	return 0 unless ($::noX || 
-			 install_spooler($printer, $security, $in->do_pkgs, $in, $upNetwork));
-	assure_remote_server_is_set($printer, $in)
-	    if ($printer->{SPOOLER} eq "rcups") && !$::noX && !$::autoqueue;
-	printer::main::read_configured_queues($printer)
-	    if (($printer->{SPOOLER} ne "rcups") &&
-		(keys(%{$printer->{configured}}) == 0));
-	printer::default::set_spooler($printer);
-    
-	# Get the default printer (Done before non-interactive queue setup,
-	# so that former default is not lost)
-	assure_default_printer_is_set($printer, $in);
-	my $nodefault = !$printer->{DEFAULT};
-
-	# Non-interactive setup of newly detected printers (This is done
-	# only when not in expert mode, so we always have a spooler defined
-	# here)
-	configure_new_printers($printer, $in, $upNetwork)
-	    if $printer->{SPOOLER} ne "rcups";
-    
-	# Make sure that default printer is registered
-	if ($nodefault && $printer->{DEFAULT}) {
-	    printer::default::set_printer($printer);
-	}
-    }
-
-    # Turn on local printer autodetection by default
-    $printer->{AUTODETECT} = 1;
-    $printer->{AUTODETECTLOCAL} = 1;
-    $printer->{AUTODETECTNETWORK} = 0;
-    $printer->{AUTODETECTSMB} = 0;
-    $printer->{CONFIGLPD} = 0;
-    
-    # Mark this part as done, it should not be done a second time.
-    if ($::isInstall) {
-	$::printerdrake_initialized = 1;
-    }
-
-    return 1;
-}
-
-sub mainwindow_interactive {
-
-    my ($printer, $security, $in, $upNetwork) = @_;
-
-    # Control variables for the main loop
-    my ($menuchoice, $cursorpos) = ('', '::');
-
-    while (1) {
-	my ($queue, $newcursorpos) = ('', 0);
-	# If networking is configured, start it, but do not ask the
-	# user to configure networking. We want to know whether we
-	# have a local network to suppress some buttons when there is
-	# no network
-	my $havelocalnetworks =
-	    check_network($printer, $in, $upNetwork, 1) && 
-	    printer::detect::getIPsInLocalNetworks() != ();
-	my $havelocalnetworks_or_expert =
-	    $printer->{expert} || $havelocalnetworks;
-#	$in->set_help('mainMenu') if $::isInstall;
-	# Initialize the cursor position
-	if ($cursorpos eq "::" && 
-	    $printer->{DEFAULT} &&
-	    $printer->{DEFAULT} ne "") {
-	    if (defined($printer->{configured}{$printer->{DEFAULT}})) {
-		$cursorpos = 
-		    $printer->{configured}{$printer->{DEFAULT}}{queuedata}{menuentry} . N(" (Default)");
-	    } elsif (($printer->{SPOOLER} eq "cups") ||
-		     ($printer->{SPOOLER} eq "rcups")) {
-		$cursorpos = find { /!$printer->{DEFAULT}:[^!]*$/ } printer::cups::get_formatted_remote_queues($printer);
-	    }
-	}
-	# Generate the list of available printers
-	my @printerlist = 
-	    (sort(map { $printer->{configured}{$_}{queuedata}{menuentry} 
-			. ($_ eq $printer->{DEFAULT} ?
-			   N(" (Default)") : "") }
-		  keys(%{$printer->{configured}
-			 || {}})),
-	     (($printer->{SPOOLER} eq "cups") ||
-	      ($printer->{SPOOLER} eq "rcups") ?
-	      sort(printer::cups::get_formatted_remote_queues($printer)) :
-	      ()));
-	my $noprinters = $#printerlist < 0;
-	# Position the cursor where it was before (in case
-	# a button was pressed).
-	$menuchoice = $cursorpos;
-	# Show the main dialog
-	$in->ask_from_({ 
-	    title => N("Printerdrake"),
-	    messages => if_(!$noprinters, N("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it. ")) .
-		        if_(!$havelocalnetworks, N("\nWARNING: No local network connection active, remote printers can neither be detected nor tested!")),
-	    cancel => (""),
-	    ok => ("") },
-	    # List the queues
-	    [ if_(!$noprinters,
-		  { val => \$menuchoice, format => \&translate,
-		    sort => 0, separator => "!", tree_expanded => 1,
-		    quit_if_double_click => 1, allow_empty_list => 1,
-		    list => \@printerlist }),
-	      ($printer->{SPOOLER} ne "rcups" ?
-	       { clicked_may_quit =>
-		     sub { 
-			 # Save the cursor position
-			 $cursorpos = $menuchoice;
-			 $menuchoice = '@addprinter';
-			 1; 
-		     },
-		 val => N("Add a new printer") } : ()),
-	      ((($printer->{SPOOLER} eq "cups") ||
-		($printer->{SPOOLER} eq "rcups")) &&
-	       $havelocalnetworks ?
-	       { clicked_may_quit =>
-		     sub { 
-			 # Save the cursor position
-			 $cursorpos = $menuchoice;
-			 $menuchoice = '@refresh';
-			 1;
-		     },
-		 val => ($noprinters ?
-			 N("Display all available remote CUPS printers") :
-			 N("Refresh printer list (to display all available remote CUPS printers)")) } : ()),
-	      ((($printer->{SPOOLER} eq "cups") ||
-		($printer->{SPOOLER} eq "rcups")) &&
-	       $havelocalnetworks_or_expert ?
-	       { clicked_may_quit =>
-		      sub { 
-			  # Save the cursor position
-			  $cursorpos = $menuchoice;
-			  $menuchoice = '@cupsconfig';
-			  1;
-		      },
-		  val => N("CUPS configuration") } : ()),
-	      (($printer->{SPOOLER} eq "cups") ?
-	       { clicked_may_quit =>
-		      sub { 
-			  # Save the cursor position
-			  $cursorpos = $menuchoice;
-			  $menuchoice = '@autoadminconfig';
-			  1;
-		      },
-		  val => N("Configure Auto Administration") } : ()),
-	      ($printer->{expert} && 
-	       (files_exist(qw(/usr/bin/pdq)) ||
-		files_exist("/usr/$lib/filters/lpf", 
-			    "/usr/sbin/lpd")) ?
-	       { clicked_may_quit =>
-		     sub {
-			 # Save the cursor position
-			 $cursorpos = $menuchoice;
-			 $menuchoice = '@spooler';
-			 1;
-		     },
-		 val => N("Change the printing system") } :
-	       ()),
-	      { clicked_may_quit =>
-		    sub {
-			# Save the cursor position
-			$cursorpos = $menuchoice;
-			$menuchoice = '@usermode';
-			1;
-			},
-			    val => ($printer->{expert} ? N("Normal Mode") :
-				    N("Expert Mode")) },
-	      { clicked_may_quit =>
-		    sub { $menuchoice = '@quit'; 1 },
-		    val => ($::isEmbedded || $::isInstall ?
-			    N("Done") : N("Quit")) },
-	      ]);
-	# Toggle expert mode and standard mode
-	if ($menuchoice eq '@usermode') {
-	    $printer->{expert} = printer::main::set_usermode(!$printer->{expert});
-	    # Read printer database for the new user mode
-	    %printer::main::thedb = ();
-	    # Modify menu entries to switch the tree
-	    # structure between expert/normal mode.
-	    my $spooler =
-		$spoolers{$printer->{SPOOLER}}{short_name};
-	    if ($printer->{expert}) {
-		foreach (keys(%{$printer->{configured}})) { 
-		    $printer->{configured}{$_}{queuedata}{menuentry} =~ 
-			s/^/$spooler!/;
-		}
-		$cursorpos =~ s/^/$spooler!/;
-	    } else {
-		foreach (keys(%{$printer->{configured}})) { 
-		    $printer->{configured}{$_}{queuedata}{menuentry} =~ 
-			s/^$spooler!//;
-		}
-		$cursorpos =~ s/^$spooler!//;
-	    }
-	    next;
-	}
-	# Refresh printer list
-	next if $menuchoice eq '@refresh';
-	# Configure CUPS
-	if ($menuchoice eq '@cupsconfig') {
-	    config_cups($printer, $security, $in, $upNetwork);
-	    next;
-	}
-	# Configure auto administration
-	if ($menuchoice eq '@autoadminconfig') {
-	    config_auto_admin($printer, $in);
-	    next;
-	}
-	# Call function to switch to another spooler
-	if ($menuchoice eq '@spooler') {
-	    $printer->{SPOOLER} = setup_default_spooler($printer, $security, $in, $upNetwork) || $printer->{SPOOLER};
-	    next;
-	}
-	# Add a new print queue
-	if ($menuchoice eq '@addprinter') {
-	    $newcursorpos = add_printer($printer, $in, $upNetwork);
-	}
-	# Edit an existing print queue
-	if ($menuchoice =~ /!([^\s!:]+):[^!]*$/) {
-	    # Rip the queue name out of the chosen menu entry
-	    $queue = $1;
-	    # Save the cursor position
-	    $cursorpos = $menuchoice;
-	    # Edit the queue
-	    edit_printer($printer, $in, $upNetwork, $queue);
-	    $newcursorpos = 1;
-	}
-	#- Close printerdrake
-	$menuchoice eq '@quit' and last;
-
-	if ($newcursorpos) {
-	    # Set the cursor onto the current menu entry
-	    $queue = $printer->{QUEUE};
-	    if ($queue) {
-		# Make sure that the cursor is still at the same position
-		# in the main menu when one has modified something on the
-		# current printer
-		if (!$printer->{configured}{$printer->{QUEUE}}) {
-		    my $s1 = N(" (Default)");
-		    my $s2 = $s1;
-		    $s2 =~ s/\(/\\(/;
-		    $s2 =~ s/\)/\\)/;
-		    $cursorpos .= $s1
-			if $printer->{QUEUE} eq
-			$printer->{DEFAULT} && $cursorpos !~ /$s2/;
-		} else {
-		    $cursorpos =
-			$printer->{configured}{$queue}{queuedata}{menuentry} .
-			($queue eq $printer->{DEFAULT} ?
-			 N(" (Default)") : '');
-		}
-	    } else {
-		$cursorpos = "::";
-	    }
-	} else {
-	    delete($printer->{QUEUE});
-	}
-    }
-}
-
-sub add_printer {
-
-    my ($printer, $in, $upNetwork) = @_;
-
-    # The add-printer wizard of printerdrake, adds a queue for a local
-    # or remote printer interactively
-
-    # Tell subroutines that we add a new printer
-    $printer->{NEW} = 1;
-
-    # Printer queue name
-    my $queue = "";
-
-    #- Set default values for a new queue
-    $printer_type_inv{$printer->{TYPE}} or 
-	$printer->{TYPE} = printer::default::printer_type();
-    $printer->{currentqueue} = { queue    => "",
-				 foomatic => 0,
-				 desc     => "",
-				 loc      => "",
-				 make     => "",
-				 model    => "",
-				 printer  => "",
-				 driver   => "",
-				 connect  => "",
-				 dd       => 1,
-				 att      => 0,
-				 delay    => 30,
-				 spooler  => $printer->{SPOOLER},
-			     };
-    #- Do all the configuration steps for a new queue
-    if (!$::isInstall &&
-	$in->isa('interactive::gtk')) {
-	local $::isEmbedded = 0;
-	undef $::WizardTable;
-	undef $::WizardWindow;
-	# Enter wizard mode (only after installation)
-	$::Wizard_pix_up = "printerdrake.png";
-	$::Wizard_title = N("Add a new printer");
-	$::isWizard = 1;
-	# Wizard welcome screen
-      step_0:
-	$::Wizard_no_previous = 1;
-	undef $::Wizard_no_cancel; undef $::Wizard_finished;
-	wizard_welcome($printer, $in, $upNetwork) or do {
-	    wizard_close($in, 0);
-	    return 0;
-	};
-	undef $::Wizard_no_previous;
-	eval {
-	    #do {
-	    # eval to catch wizard cancel. The wizard stuff 
-	    # should be in a separate function with steps. see 
-	    # drakgw.
-	    $printer->{expert} or do {
-		if ($printer->{CONFIGLPD}) { 
-		    $printer->{TYPE} = "LPD";
-		} else {
-		    $printer->{TYPE} = "LOCAL";
-		}
-	    };
-	  step_1:
-	    !$printer->{expert} or choose_printer_type($printer, $in, $upNetwork) or
-		goto step_0;
-	  step_2:
-	    setup_printer_connection($printer, $in, $upNetwork) or 
-		do {
-		    goto step_1 if $printer->{expert};
-		    goto step_0;
-		};
-	    get_db_entry($printer, $in);
-	  step_3_9:
-	    if (!$printer->{expert} && !$printer->{MANUAL}) {
-		is_model_correct($printer, $in) or goto step_2;
-	    }
-	  step_4:
-	    # Remember DB entry for "Previous" button in wizard
-	    my $dbentry = $printer->{DBENTRY};
-	    if ($printer->{expert} || $printer->{MANUAL} ||
-		$printer->{MANUALMODEL}) { 
-		choose_model($printer, $in) or do {
-		    # Restore DB entry
-		    $printer->{DBENTRY} = $dbentry;
-		    goto step_3_9 if $printer->{MANUALMODEL} &&
-			$printer->{DBENTRY};
-		    goto step_2;
-		};
-	    }
-	    get_printer_info($printer, $in) or do {
-		goto step_4 if $printer->{expert} || $printer->{MANUAL} ||
-		    $printer->{MANUALMODEL};
-		goto step_3_9;
-	    };
-	    $queue = generate_queuename($printer);
-	  step_5:
-	    setup_options($printer, $in) or
-		goto step_4;
-	  step_6:
-	    if ($printer->{expert} || $printer->{MANUAL} ||
-		$printer->{MORETHANONE}) {
-		choose_printer_name($printer, $in) or do {
-		    goto step_5 if $printer->{expert} || $printer->{MANUAL};
-		    goto step_4 if $printer->{MANUALMODEL};
-		    goto step_3_9;
-		};
-	    }
-	    configure_queue($printer, $in) or die 'wizcancel';
-	    undef $printer->{MANUAL} if $printer->{MANUAL};
-	  step_7:
-	    $::Wizard_no_previous = 1;
-	    setasdefault($printer, $in);
-	    my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork);
-	    if ($testpages == 1) {
-		# User was content with test pages
-		# Leave wizard mode with congratulations screen
-		wizard_close($in, 1);
-	    } elsif ($testpages == 2) {
-		# User was not content with test pages
-		# Leave wizard mode without congratulations
-		# screen
-		wizard_close($in, 0);
-		$queue = $printer->{QUEUE};
-		edit_printer($printer, $in, $upNetwork, $queue);
-		return 1;
-	    } else {
-		# "Previous" button clicked in test page dialog
-		goto step_7;
-	    }
-	};
-	die if $@ && $@ !~ /^wizcancel/;
-	wizard_close($in, 0);
-    } else {
-	# Print queue setup without wizard (for installation)
-	$printer->{expert} or $printer->{TYPE} = "LOCAL";
-	wizard_welcome($printer, $in, $upNetwork) or return 0;
-	    $printer->{expert} or do {
-		if ($printer->{CONFIGLPD}) { 
-		    $printer->{TYPE} = "LPD";
-		} else {
-		    $printer->{TYPE} = "LOCAL";
-		}
-	    };
-	!$printer->{expert} or choose_printer_type($printer, $in, $upNetwork) or return 0;
-	setup_printer_connection($printer, $in, $upNetwork) or return 0;
-	get_db_entry($printer, $in);
-	if (!$printer->{expert} && !$printer->{MANUAL}) {
-	    is_model_correct($printer, $in) or return 0;
-	}
-	if ($printer->{expert} || $printer->{MANUAL} ||
-	    $printer->{MANUALMODEL}) { 
-	    choose_model($printer, $in) or return 0;
-	}
-	get_printer_info($printer, $in) or return 0;
-	$queue = generate_queuename($printer);
-	setup_options($printer, $in) or return 0;
-	if ($printer->{expert} || $printer->{MANUAL} ||
-	    $printer->{MORETHANONE}) {
-	    choose_printer_name($printer, $in) or return 0;
-	}
-	configure_queue($printer, $in) or return 0;
-	undef $printer->{MANUAL} if $printer->{MANUAL};
-	setasdefault($printer, $in);
-	my $testpages = print_testpages($printer, $in, $printer->{TYPE} !~ /LOCAL/ && $upNetwork);
-	if ($testpages == 2) {
-	    # User was not content with test pages
-	    $queue = $printer->{QUEUE};
-	    edit_printer($printer, $in, $upNetwork, $queue);
-	    return 1;
-	}
-    }
-
-    # Delete some variables
-    cleanup($printer);
-
-    return 1;
-}
-
-sub edit_printer {
-
-    my ($printer, $in, $upNetwork, $queue) = @_;
-
-    # The menu for doing modifications on an existing print queue
-
-    # Cursor position in queue modification window
-    my $modify = N("Printer options");
-
-    # Tell subroutines that we modify the printer
-    $printer->{NEW} = 0;
-
-    while (defined($printer->{QUEUE}) || 
-	   defined($queue)) {  # Do not continue when current queue
-	                       # is deleted
-	# Modify a queue, ask which part should be modified
-#	$in->set_help('modifyPrinterMenu') if $::isInstall;
-	# Get some info to display
-	my $infoline;
-	if ($printer->{configured}{$queue}) {
-	    # Here we must regenerate the menu entry, because the
-	    # parameters can be changed.
-	    printer::main::make_menuentry($printer,$queue);
-	    if ($printer->{configured}{$queue}{queuedata}{menuentry} =~
-		/!([^!]+)$/) {
-		$infoline = $1 .
-		    ($queue eq $printer->{DEFAULT} ? N(" (Default)") : '') .
-		    ($printer->{configured}{$queue}{queuedata}{desc} ?
-		     ", Descr.: $printer->{configured}{$queue}{queuedata}{desc}" : '') .
-		     ($printer->{configured}{$queue}{queuedata}{loc} ?
-		      ", Loc.: $printer->{configured}{$queue}{queuedata}{loc}" : '') .
-		      ($printer->{expert} ?
-		       ", Driver: $printer->{configured}{$queue}{queuedata}{driver}" : '');
-	    }
-	} else {
-	    # Extract the entry for a remote CUPS queue from the menu entry
-	    # for it.
-	    my $menuentry = find { /!$queue:[^!]*$/ } printer::cups::get_formatted_remote_queues($printer);
-	    $infoline = $1 if $menuentry =~ /!([^!]+)$/;
-	}
-	# Mark the printer queue which we edit
-	$printer->{QUEUE} = $queue;
-	if ($in->ask_from_(
-	    { title => N("Modify printer configuration"),
-	      messages => 
-		  N("Printer %s%s
-What do you want to modify on this printer?",
-		    $infoline,
-		    if_(($printer->{SPOOLER} =~ /cups/) &&
-			!printer::cups::queue_enabled($queue),
-			"\n" . N("This printer is disabled"))),
-		  cancel => N("Close"),
-		  ok => N("Do it!")
-	      },
-	    [ { val => \$modify, format => \&translate, 
-		type => 'list', separator => '|',
-		list => [ ($printer->{configured}{$queue} ?
-			   (N("Printer connection type"),
-			    N("Printer name, description, location"),
-			    ($printer->{expert} ?
-			     N("Printer manufacturer, model, driver") :
-			     N("Printer manufacturer, model")),
-			    if_($printer->{configured}{$queue}{args},
-				N("Printer options"))) : ()),
-			  if_($queue ne $printer->{DEFAULT},
-			      N("Set this printer as the default")),
-			  if_(($printer->{SPOOLER} ne "pdq") &&
-			      $printer->{configured}{$queue},
-			      if_(($printer->{SPOOLER} !~ /cups/) ||
-				  !printer::cups::queue_enabled($queue),
-				  N("Enable Printer")),
-			      if_(($printer->{SPOOLER} !~ /cups/) ||
-				  printer::cups::queue_enabled($queue),
-				  N("Disable Printer"))),
-			  if_(($printer->{SPOOLER} eq "cups") &&
-			      $printer->{configured}{$queue} &&
-			      ($printer->{configured}{$queue}{queuedata}{connect} !~ m!^hp:/!), 
-			      N("Printer communication error handling")),
-			  N("Print test pages"),
-			  N("Learn how to use this printer"),
-			  if_($printer->{configured}{$queue}, N("Remove printer")) ] } ])) {
-
-	    #- Copy the queue data and work on the copy
-	    $printer->{currentqueue} = {};
-	    if ($printer->{configured}{$queue}) {
-		printer::main::copy_printer_params($printer->{configured}{$queue}{queuedata}, $printer->{currentqueue});
-	    }
-	    #- keep in mind old name of queue (in case of changing)
-	    $printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
-	    #- Reset some variables
-	    $printer->{OLD_CHOICE} = undef;
-	    $printer->{DBENTRY} = undef;
-	    #- Which printer type did we have before (check 
-	    #- beginning of URI)
-	    if ($printer->{configured}{$queue}) {
-		if (($printer->{currentqueue}{connect} =~ 
-		     m!^ptal://?hpjd!) ||
-		    ($printer->{currentqueue}{connect} =~ 
-		     m!^hp:/net!)) {
-		    $printer->{TYPE} = "SOCKET";
-		} else {
-		    foreach my $type (qw(file parallel serial usb ptal hp
-					 mtink lpd socket smb ncp
-					 postpipe)) {
-			if ($printer->{currentqueue}{connect} =~
-			    /^$type:/) {
-			    $printer->{TYPE} = 
-				($type =~ 
-				 /(file|parallel|serial|usb|ptal|hp|mtink)/ ? 
-				 'LOCAL' : uc($type));
-			    last;
-			}
-		    }
-		}
-	    }
-
-	    # Do the chosen task
-	    if ($modify eq N("Printer connection type")) {
-		choose_printer_type($printer, $in, $upNetwork) &&
-		    setup_printer_connection($printer, $in, $upNetwork) &&
-		    #get_db_entry($printer, $in) &&
-		    get_printer_info($printer, $in) &&
-		    configure_queue($printer, $in);
-	    } elsif ($modify eq N("Printer name, description, location")) {
-		choose_printer_name($printer, $in) and
-		    get_printer_info($printer, $in) and
-		    configure_queue($printer, $in) or next;
-		# Delete old queue when it was renamed
-		if (lc($printer->{QUEUE}) ne lc($printer->{OLD_QUEUE})) {
-		    my $_w = $in->wait_message(
-			 N("Printerdrake"),
-			 N("Removing old printer \"%s\"...",
-			   $printer->{OLD_QUEUE}));
-		    printer::main::remove_queue($printer, $printer->{OLD_QUEUE});
-		    # If the default printer was renamed, correct the
-		    # the default printer setting of the spooler
-		    if ($queue eq $printer->{DEFAULT}) {
-			$printer->{DEFAULT} = $printer->{QUEUE};
-			printer::default::set_printer($printer);
-		    }
-		    $queue = $printer->{QUEUE};
-		}
-	    } elsif ($modify eq N("Printer manufacturer, model, driver") ||
-		     $modify eq N("Printer manufacturer, model")) {
-		get_db_entry($printer, $in);
-		choose_model($printer, $in) &&
-		    get_printer_info($printer, $in) &&
-		    setup_options($printer, $in) &&
-		    configure_queue($printer, $in);
-	    } elsif ($modify eq N("Printer options")) {
-		get_printer_info($printer, $in) &&
-		    setup_options($printer, $in) &&
-		    configure_queue($printer, $in);
-	    } elsif ($modify eq N("Set this printer as the default")) {
-		default_printer($printer, $in, $queue);
-		# The "Set this printer as the default" menu entry will
-		# disappear if the printer is the default, so go back to the
-		# default entry
-		$modify = N("Printer options");
-	    } elsif ($modify eq N("Enable Printer")) {
-		printer::main::enable_disable_queue($printer, $queue, 1) &&
-		    $in->ask_warn(N("Enable Printer"),
-				  N("Printer \"%s\" is now enabled.", 
-				    $queue));
-		$modify = N("Disable Printer");
-	    } elsif ($modify eq N("Disable Printer")) {
-		printer::main::enable_disable_queue($printer, $queue, 0) &&
-		    $in->ask_warn(N("Disable Printer"),
-				  N("Printer \"%s\" is now disabled.", 
-				    $queue));
-		$modify = N("Enable Printer");
-	    } elsif ($modify eq N("Printer communication error handling")) {
-		config_backend_error_handling($printer, $in) &&
-		    get_printer_info($printer, $in) &&
-		    configure_queue($printer, $in);
-	    } elsif ($modify eq N("Print test pages")) {
-		print_testpages($printer, $in, $upNetwork);
-	    } elsif ($modify eq N("Learn how to use this printer")) {
-		printer_help($printer, $in);
-	    } elsif ($modify eq N("Remove printer")) {
-		if (remove_printer($printer, $in, $queue)) {
-		    # Let the main menu cursor go to the default
-		    # position
-		    delete $printer->{QUEUE};
-		    undef $queue;
-		}
-	    }
-
-	    # Delete some variables
-	    cleanup($printer);
-	} else {
-	    # User closed the dialog
-
-	    # Delete some variables
-	    cleanup($printer);
-
-	    last;
-	}
-    }
-}
-
-sub remove_printer {
-
-    my ($printer, $in, $queue) = @_;
-
-    # Asks the user whether he really wants to remove the selected printer
-    # and, if yes, removes it. The default printer will be reassigned if
-    # needed.
-
-    if ($in->ask_yesorno(
-	 N("Warning"), N("Do you really want to remove the printer \"%s\"?", $queue),
-	 1)) {
-	my $_w = $in->wait_message(
-	     N("Printerdrake"),
-	     N("Removing printer \"%s\"...", $queue));
-	if (printer::main::remove_queue($printer, $queue)) { 
-	    # Define a new default printer if we have
-	    # removed the default one
-	    if ($queue eq $printer->{DEFAULT}) {
-		my @k = sort(keys %{$printer->{configured}});
-		$printer->{DEFAULT} = $k[0];
-		printer::default::set_printer($printer) if @k;
-	    }
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-sub default_printer {
-
-    my ($printer, $in, $queue) = @_;
-
-    # Makes the given queue the default queue and gives an information
-    # message
-
-    $printer->{DEFAULT} = $queue;
-    printer::default::set_printer($printer);
-    $in->ask_warn(N("Default printer"),
-		  N("The printer \"%s\" is set as the default printer now.",
-		    $queue));
-    return 1;
-}
-
-sub cleanup {
-    my ($printer) = @_;
-    # Clean up the $printer data structure after printer manipulations
-    foreach (qw(OLD_QUEUE TYPE str_type DBENTRY ARGS 
-		OLD_CHOICE MANUAL)) {
-	delete($printer->{$_});
-    }
-    $printer->{currentqueue} = {};
-    $printer->{complete} = 0;
-}
-
-sub final_cleanup {
-    my ($printer) = @_;
-    # Clean up the $printer data structure for auto-install log
-    foreach my $queue (keys %{$printer->{configured}}) {
-	foreach my $item (keys %{$printer->{configured}{$queue}}) {
-	    delete($printer->{configured}{$queue}{$item}) if $item ne "queuedata";
-	}
-	delete($printer->{configured}{$queue}{queuedata}{menuentry});
-    }
-    foreach (qw(Old_queue OLD_QUEUE QUEUE TYPE str_type currentqueue DBENTRY ARGS complete OLD_CHOICE NEW MORETHANONE MANUALMODEL AUTODETECT AUTODETECTLOCAL AUTODETECTNETWORK AUTODETECTSMB CONFIGLPD noninteractive expert))
-    { delete $printer->{$_} }
-}
-
diff --git a/perl-install/printer/services.pm b/perl-install/printer/services.pm
deleted file mode 100644
index f94cc5af5..000000000
--- a/perl-install/printer/services.pm
+++ /dev/null
@@ -1,63 +0,0 @@
-package printer::services;
-
-use strict;
-use services;
-use run_program;
-
-sub restart ($) {
-    my ($service) = @_;
-    if (services::restart($service)) {
-	# CUPS needs some time to come up.
-	wait_for_cups() if $service eq "cups";
-	return 1;
-    } else { return 0 }
-}
-
-sub start ($) {
-    my ($service) = @_;
-    if (services::start($service)) {
-	# CUPS needs some time to come up.
-	wait_for_cups() if $service eq "cups";
-	return 1;
-    } else { return 0 }
-}
-
-sub start_not_running_service ($) {
-    my ($service) = @_;
-    # The exit status is not zero when the service is not running
-    if (services::start_not_running_service($service)) {
-	return 0;
-    } else { 
-	run_program::rooted($::prefix, "/etc/rc.d/init.d/$service", "start");
-	if (($? >> 8) != 0) {
-	    return 0;
-	} else {
-	    # CUPS needs some time to come up.
-	    wait_for_cups() if $service eq "cups";
-	    return 1;
-	}
-    }
-}
-
-sub wait_for_cups() {
-    # CUPS needs some time to come up. Wait up to 30 seconds, checking
-    # whether CUPS is ready.
-    my $cupsready = 0;
-    my $i;
-    for ($i = 0; $i < 30; $i++) {
-	# Check whether CUPS is running without any console output
-	system(($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	    "/usr/bin/lpstat -r >/dev/null 2>&1");
-	if (($? >> 8) != 0) {
-	    # CUPS is not ready, continue
-	    sleep 1;
-	} else {
-	    # CUPS is ready, quit
-	    $cupsready = 1;
-	    last;
-	}
-    }
-    return $cupsready;
-}
-
-1;