From df1c736e622de70cf8011b26b94cbdfcb85c3408 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 15 Dec 2000 16:10:48 +0000
Subject: Cards+ and CardsNames are moved to ldetect-lst

---
 perl-install/Xconfigurator.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 5d0f51936..1b911fee1 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -73,16 +73,18 @@ sub readCardsDB {
     \%cards;
 }
 sub readCardsNames {
-    my $file = "/usr/X11R6/lib/X11/CardsNames";
+    my $file = "/usr/share/ldetect-lst/CardsNames";
     local *F; open F, $file or die "can't find $file\n";
-    map { (split '=>')[0] } <F>;
+    map { (split '=>')[0] } grep { !/^#/ } <F>;
 }
 sub cardName2RealName {
-    my $file = "/usr/X11R6/lib/X11/CardsNames";
+    my $file = "/usr/share/ldetect-lst/CardsNames";
     my ($name) = @_;
     local *F; open F, $file or die "can't find $file\n";
     local $_;
-    while (<F>) { chop;
+    while (<F>) { 
+	chop;
+	next if /^#/;	  
 	my ($name_, $real) = split '=>';
 	return $real if $name eq $name_;
     }
@@ -90,7 +92,7 @@ sub cardName2RealName {
 }
 sub updateCardAccordingName {
     my ($card, $name) = @_;
-    my $cards = readCardsDB("/usr/X11R6/lib/X11/Cards+");
+    my $cards = readCardsDB("/usr/share/ldetect-lst/Cards+");
 
     add2hash($card->{flags}, $cards->{$name}{flags});
     add2hash($card, $cards->{$name});
-- 
cgit v1.2.1