From ae827cca5790bf684bbf7e7258c8615690b0633d Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 20 Feb 2001 13:45:20 +0000
Subject: various

---
 perl-install/Makefile         | 2 +-
 perl-install/Xconfigurator.pm | 3 ++-
 perl-install/class_discard.pm | 6 +++++-
 perl-install/modules.pm       | 1 +
 perl-install/my_gtk.pm        | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/perl-install/Makefile b/perl-install/Makefile
index cb60263fa..9fc6cbed9 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -88,7 +88,7 @@ ifeq (sparc,$(ARCH))
 	ln -s /usr/X11R6/lib/X11/xkb/xkbcomp $(DEST)/usr/bin/xkbcomp
 endif
 ifeq (i386,$(ARCH))
-	install -s ../kernel/cardmgr/cardmgr $(DEST)/usr/bin
+#	install -s ../kernel/cardmgr/cardmgr $(DEST)/usr/bin
 endif
 
 	for i in `cat /tmp/list`; do \
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index ffa57f784..30c4fdc4e 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -17,7 +17,6 @@ my $tmpconfig = "/tmp/Xconfig";
 
 my ($prefix, %monitors, %standard_monitors_);
 
-1;
 
 sub getVGAMode($) { $_[0]->{card}{vga_mode} || $vgamodes{"640x480x16"}; }
 
@@ -1165,3 +1164,5 @@ Would you like X to start when you reboot?"), 1);
 	run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
     }
 }
+
+1;
diff --git a/perl-install/class_discard.pm b/perl-install/class_discard.pm
index 2a1b91351..7ecd1375b 100644
--- a/perl-install/class_discard.pm
+++ b/perl-install/class_discard.pm
@@ -1,7 +1,11 @@
 package class_discard; # $Id$
 
+use log;
+
 sub new { bless {}, "class_discard" }
 
-sub AUTOLOAD { }
+sub AUTOLOAD {
+    log::l("class_discard: $AUTOLOAD called at ", caller);
+}
 
 1;
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 52e100f6b..642a663e9 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -97,6 +97,7 @@ arch() =~ /^sparc/ ? (
   "parport" => "parport",
   "parport_pc" => "parport_pc",
   "sunrpc" => "sunrpc",
+  "pci-scan" => "pci-scan",
 }],
 [ 'isdn', {
    "hisax" => "hisax",
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 3df0bc18a..b0a09ff78 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -375,7 +375,7 @@ sub create_packtable($@) {
 		ref $_ or $_ = new Gtk::Label($_);
 		$j != $#$l ?
 		  $w->attach($_, $j, $j + 1, $i, $i + 1, 'fill', 'fill', 5, 0) :
-		  $w->attach($_, $j, $j + 1, $i, $i + 1, { 'fill', 'expand' }, ref($_) eq 'Gtk::ScrolledWindow' ? { 'fill', 'expand' } : 0, 0, 0);
+		  $w->attach($_, $j, $j + 1, $i, $i + 1, 1|4, ref($_) eq 'Gtk::ScrolledWindow' ? 1|4 : 0, 0, 0);
 		$_->show;
 	    }
 	} @$l;
-- 
cgit v1.2.1