no_comment

4 files changed, 18 insertions, 23 deletions

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index ee89fc849..446191c16 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-05  Pixel  <pixel@mandrakesoft.com>
 
+	* Xconfigurator.pm (monitorConfiguration): remove the special case
+	for fbdev.
+
 	* install_steps_interactive.pm (setup_thiskind): replace return by
 	next in case load_module fails.
 
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 22b5a5434..0d46c73db 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -221,20 +221,13 @@ sub monitorConfiguration(;$$) {
     my $monitor = shift || {};
     my $useFB = shift || 0;
 
-    if ($useFB) {
-	#- use smallest values for monitor configuration since FB is used,
-	#- BIOS initialize graphics, current X server will not refuse that.
-	$monitor->{hsyncrange} ||= $hsyncranges[1];
-	$monitor->{vsyncrange} ||= $vsyncranges[0];
-	add2hash($monitor, { type => "Unknown", vendor => "Unknown", model => "Unknown" });
-    } else {
-	$monitor->{hsyncrange} && $monitor->{vsyncrange} and return $monitor;
+    $monitor->{hsyncrange} && $monitor->{vsyncrange} and return $monitor;
 
-	readMonitorsDB("/usr/X11R6/lib/X11/MonitorsDB");
+    readMonitorsDB("/usr/X11R6/lib/X11/MonitorsDB");
 
-	add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Unlisted', keys %monitors], _("Generic") . '|' . translate($default_monitor)) }) unless $monitor->{type};
-	if ($monitor->{type} eq 'Unlisted') {
-	    $in->ask_from_entries_ref('',
+    add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Unlisted', keys %monitors], _("Generic") . '|' . translate($default_monitor)) }) unless $monitor->{type};
+    if ($monitor->{type} eq 'Unlisted') {
+	$in->ask_from_entries_ref('',
 _("The two critical parameters are the vertical refresh rate, which is the rate
 at which the whole screen is refreshed, and most importantly the horizontal
 sync rate, which is the rate at which scanlines are displayed.
@@ -242,16 +235,13 @@ sync rate, which is the rate at which scanlines are displayed.
 It is VERY IMPORTANT that you do not specify a monitor type with a sync range
 that is beyond the capabilities of your monitor: you may damage your monitor.
  If in doubt, choose a conservative setting."),
-				      [ _("Horizontal refresh rate"), _("Vertical refresh rate") ],
-				      [ { val => \$monitor->{hsyncrange}, list => \@hsyncranges },
-					{ val => \$monitor->{vsyncrange}, list => \@vsyncranges }, ]);
-	} else {
-	    add2hash($monitor, $monitors{$monitor->{type}});
-	}
-	add2hash($monitor, { type => "Unknown", vendor => "Unknown", model => "Unknown" });
+				  [ _("Horizontal refresh rate"), _("Vertical refresh rate") ],
+				  [ { val => \$monitor->{hsyncrange}, list => \@hsyncranges },
+				    { val => \$monitor->{vsyncrange}, list => \@vsyncranges }, ]);
+    } else {
+	add2hash($monitor, $monitors{$monitor->{type}});
     }
-
-    $monitor;
+    add2hash($monitor, { type => "Unknown", vendor => "Unknown", model => "Unknown" });
 }
 
 sub testConfig($) {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 1d31dbefe..0ea5c2be4 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -397,7 +397,7 @@ Consoles 1,3,4,7 may also contain interesting information";
 	    if (!$hasttf) {
 		$hasttf = $o->ask_okcancel('', 
 _("Some true type fonts from windows have been found on your computer.
-Do you want to use them? Be sure you have the right to use them under Linux.")) or goto nottf;
+Do you want to use them? Be sure you have the right to use them under Linux."), 1) or goto nottf;
 		mkdir "$o->{prefix}$dest", 0755;
 	    }
 	    /(.*)\.ttf/i and symlink "$D/$_", "$o->{prefix}$dest/$1.ttf" foreach grep { /\.ttf/i } all("$o->{prefix}$D");
@@ -420,7 +420,7 @@ GridHeight=70
 	} "$o->{prefix}$_/.kde/share/config/kfmrc" 
     }
 
-    #- to unsure linuxconf doesn't cry against those files being in the future
+    #- to ensure linuxconf doesn't cry against those files being in the future
     -e $_ and touch($_) foreach map { "$o->{prefix}/$_" } '/etc/conf.modules', '/etc/crontab', '/etc/sysconfig/mouse', '/etc/X11/fs/config';
 
     #- move some file after an upgrade that may be seriously annoying.
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index fac386269..155c811be 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -1267,6 +1267,8 @@ citrix-icaclient-en                           40   -70   -40
 citrix-icaclient-fr                           40   -70   -40
 citrix-icaclient-ge                           40   -70   -40
 citrix-icaclient-sp                           40   -70   -40
+compupic                                      45     0    30
+cybersched                                     0     0     0
 eagle                                         15     0    25
 printpro                                       0     0     0
 printpro-agfa                                  0     0     0