From 032d70f4b3851500fee1aa303f346d2a22e4d6d4 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Tue, 14 Jan 2003 23:19:10 +0000
Subject: Removed bugs from Titi which prevented printerdrake from installing
 the requested spooler.

---
 perl-install/printer/data.pm | 98 ++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

(limited to 'perl-install/printer/data.pm')

diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
index a6ce568c0..ef252a3a9 100644
--- a/perl-install/printer/data.pm
+++ b/perl-install/printer/data.pm
@@ -42,54 +42,54 @@ our %spoolers = ('pdq' => {
                             [ 'lpc', '/usr/sbin/lpc-lpd' ]
                         ]
                  },
-			 'lprng' => {
-				'print_command' => 'lpr-lpd',
-				'long_name' => N("LPRng - LPR New Generation"),
-				'short_name' => N("LPRng"),
-                    'boot_spooler' => 'lpd',
-                    'service' => 'lpd',
-                    'packages2add' => [ [qw(LPRng net-tools gpr a2ps ImageMagick)],
-                                        [qw(/usr/lib/filters/lpf
-                                            /usr/sbin/lpd
-                                            /sbin/ifconfig
-                                            /usr/bin/gpr
-                                            /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' => {
-				'print_command' => 'lpr-cups',
-				'long_name' => N("CUPS - Common Unix Printing System"),
-				'short_name' => N("CUPS"),
-                    'boot_spooler' => 'cups',
-                    'service' => 'cups',
-                    'packages2add' => [ ['cups', 'net-tools', 'xpp', if_($::expert, 'cups-drivers'),
-                                         $::isInstall ? 'curl' : 'webfetch'],
-                                        [ qw(/usr/lib/cups/cgi-bin/printers.cgi
-                                             /sbin/ifconfig
-                                             /usr/bin/xpp),
-                                          if_($::expert, "/usr/share/cups/model/postscript.ppd.gz"),
-                                          $::isInstall ? '/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' ]
-                    ]
-			 }
-            );
-our %spooler_inv = map { $spoolers{$_}{long_name} => $spoolers{$_} } keys %spoolers;
+		 'lprng' => {
+		     'print_command' => 'lpr-lpd',
+		     'long_name' => N("LPRng - LPR New Generation"),
+		     'short_name' => N("LPRng"),
+		     'boot_spooler' => 'lpd',
+		     'service' => 'lpd',
+		     'packages2add' => [ [qw(LPRng net-tools gpr a2ps ImageMagick)],
+					 [qw(/usr/lib/filters/lpf
+					     /usr/sbin/lpd
+					     /sbin/ifconfig
+					     /usr/bin/gpr
+					     /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' => {
+		     'print_command' => 'lpr-cups',
+		     'long_name' => N("CUPS - Common Unix Printing System"),
+		     'short_name' => N("CUPS"),
+		     'boot_spooler' => 'cups',
+		     'service' => 'cups',
+		     'packages2add' => [ ['cups', 'net-tools', 'xpp', if_($::expert, 'cups-drivers'),
+					  $::isInstall ? 'curl' : 'webfetch'],
+					 [ qw(/usr/lib/cups/cgi-bin/printers.cgi
+					      /sbin/ifconfig
+					      /usr/bin/xpp),
+					   if_($::expert, "/usr/share/cups/model/postscript.ppd.gz"),
+					   $::isInstall ? '/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' ]
+					]
+				    }
+		 );
+our %spooler_inv = map { $spoolers{$_}{long_name} => $_ } keys %spoolers;
 
 our %shortspooler_inv = map { $spoolers{$_}{short_name} => $spoolers{$_} } keys %spoolers;
-- 
cgit v1.2.1