diff options
| -rw-r--r-- | perl-install/ChangeLog | 10 | ||||
| -rw-r--r-- | perl-install/Xconfigurator.pm | 17 | ||||
| -rw-r--r-- | perl-install/printer.pm | 2 | ||||
| -rw-r--r-- | perl-install/share/compssList | 2 |
4 files changed, 23 insertions, 8 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index eeb40435f..1bd26b921 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,13 @@ +2000-09-21 François Pons <fpons@mandrakesoft.com> + + * printer.pm: changed "PostScript" ppd default description to "Raw + queue (no filtering)", asked by Till. + * Xconfigurator.pm: add log of what user select for 3D hw + acceleration. + * share/compssList: changed XFree86-glide-module to -2 because the + level is the same for XFree86-Glide* which may have multiple + different version installed due to dependancies of the first one. + 2000-09-21 dam's <damien@mandrakesoft.com> * netconnect.pm (conf_network_card): added check when dhcp. Cable connection diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 17a547d3c..ebc01134c 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -198,7 +198,7 @@ sub cardConfiguration(;$$$) { $card->{type} =~ /SiS /); #- 3D acceleration configuration for XFree 4.0 using DRI. $card->{DRI_glx} = ($card->{identifier} =~ /Voodoo [35]/ || $card->{identifier} =~ /Voodoo Banshee/ || #- 16bit only - #- NOT WORKING $card->{identifier} =~ /Matrox.* G[24]00/ || #- prefer 16bit (24bit not well tested according to DRI) + $card->{identifier} =~ /Matrox.* G[24]00/ || #- prefer 16bit (24bit not well tested according to DRI) $card->{type} =~ /Intel 810/ || #- 16bit $card->{type} =~ /ATI Rage 128/); #- 16 and 32 bits, prefer 16bit as no DMA. @@ -211,12 +211,14 @@ sub cardConfiguration(;$$$) { #- basic installation, use of XFree 4.0 or XFree 3.3. my ($xf4_ver, $xf3_ver) = ("4.0.1", "3.3.6"); my $xf3_tc = { text => _("XFree %s", $xf3_ver), - code => sub { $card->{Utah_glx} = $card->{DRI_glx} = ''; $card->{use_xf4} = '' } }; + code => sub { $card->{Utah_glx} = $card->{DRI_glx} = ''; $card->{use_xf4} = ''; + log::l("Using XFree $xf3_ver") } }; my $msg = _("Which configuration of XFree do you want to have?"); my @choices = $card->{use_xf4} ? (($card->{prefer_xf3} ? ($xf3_tc) : ()), (!$card->{prefer_xf3} || $::expert ? ({ text => _("XFree %s", $xf4_ver), - code => sub { $card->{Utah_glx} = $card->{DRI_glx} = '' } }) : (),), + code => sub { $card->{Utah_glx} = $card->{DRI_glx} = ''; + log::l("Using XFree $xf4_ver") } }) : (),), ($::expert && !$card->{prefer_xf3} ? ($xf3_tc) : ())) : ($xf3_tc); #- try to figure if 3D acceleration is supported @@ -228,7 +230,8 @@ Your card is supported by XFree %s which may have a better support in 2D.", $xf3 _("Your card can have 3D hardware acceleration support with XFree %s.", $xf3_ver)) . "\n\n" . $msg; $::beginner and @choices = (); #- keep it by default here as it is the only choice available. unshift @choices, { text => _("XFree %s with 3D hardware acceleration", $xf3_ver), - code => sub { $card->{use_xf4} = '' } }; + code => sub { $card->{use_xf4} = ''; + log::l("Using XFree $xf3_ver with 3D hardware acceleration") } }; } #- an expert user may want to try to use an EXPERIMENTAL 3D acceleration, currenlty @@ -241,14 +244,16 @@ Your card is supported by XFree %s which may have a better support in 2D.", $xf3 _("Your card can have 3D hardware acceleration support with XFree %s, NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.", $xf3_ver)) . "\n\n" . $msg; push @choices, { text => _("XFree %s with EXPERIMENTAL 3D hardware acceleration", $xf3_ver), - code => sub { $card->{use_xf4} = ''; $card->{Utah_glx} = 'EXPERIMENTAL' } }; + code => sub { $card->{use_xf4} = ''; $card->{Utah_glx} = 'EXPERIMENTAL'; + log::l("Using XFree $xf3_ver with EXPERIMENTAL 3D hardware acceleration") } }; } #- ask the expert user to enable or not hardware acceleration support. if ($card->{use_xf4} && $card->{DRI_glx}) { $msg = _("Your card can have 3D hardware acceleration support with XFree %s.", $xf4_ver) . "\n\n" . $msg; $::expert or @choices = (); #- keep all user by default with XFree 4.0 including 3D acceleration. - unshift @choices, { text => _("XFree %s with 3D hardware acceleration", $xf4_ver) }; + unshift @choices, { text => _("XFree %s with 3D hardware acceleration", $xf4_ver), + code => sub { log::l("Using XFree $xf4_ver with 3D hardware acceleration") } }; } #- examine choice of user, beware the list MUST NOT BE REORDERED AS THERE ARE FALL TRHOUGH! diff --git a/perl-install/printer.pm b/perl-install/printer.pm index 01fe4c76e..985b395d7 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -384,7 +384,7 @@ sub poll_ppd_base { scalar(keys %descr_to_ppd) > 5 or die "unable to connect to cups server"; #- assume a default printer not using any ppd at all. - $descr_to_ppd{"PostScript"} = ''; + $descr_to_ppd{"Raw queue (no filtering)"} = ''; } #-****************************************************************************** diff --git a/perl-install/share/compssList b/perl-install/share/compssList index 9659e6bf6..323887222 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -114,7 +114,7 @@ XFree86-Xvfb 0 0 15 XFree86-cyrillic-fonts -20 -30 -20 XFree86-devel 12 0 55 XFree86-doc -30 -30 -30 -XFree86-glide-module -1 -1 -1 +XFree86-glide-module -2 -2 -2 XFree86-libs 10 0 0 XFree86-server -30 -30 -30 XFree86-server-common -30 -30 -30 |