summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog15
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/install_any.pm3
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/share/compssUsers.desktop6
-rw-r--r--perl-install/share/list5
6 files changed, 24 insertions, 9 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 281a84a1e..e30ece69b 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,18 @@
+2000-10-06 Pixel <pixel@mandrakesoft.com>
+
+ * install_steps.pm (afterInstallPackages): don't fail if
+ kdeglobals file is not there
+
+ * share/compssUsers.desktop: fix icons
+
+ * detect_devices.pm (cdroms): fix for scsi cdrom drives
+
+ * pci_probing/pcitable: put cs46xx instead of snd-card-cs461x
+ (dixit jeff)
+
+ * diskdrake.pm (Resize): comment ext2&reiserfs resizing for the
+ moment
+
2000-10-06 Frederic Lepied <flepied@mandrakesoft.com>
* Xconfigurator.pm (write_XF86Config): added mode of wacom devices
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 9a28f0624..250cf498f 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -43,7 +43,7 @@ sub ls120s() { grep { $_->{type} =~ /.d/ && isLS120Drive($_) } get(); }
sub usbfdus() { grep { $_->{type} =~ /.d/ && isUSBFDUDrive($_) } get(); }
sub cdroms() {
my @l = grep { $_->{type} eq 'cdrom' } get();
- if (my @l2 = grep { isBurner($_->{device}) } @l) {
+ if (my @l2 = IDEburners()) {
require modules;
modules::add_alias('scsi_hostadapter', 'ide-scsi');
my $nb = 1 + max(-1, map { $_->{device} =~ /scd (\d+)/x } @l);
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 9fdd43a41..4ad3761f6 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -314,9 +314,6 @@ sub setPackages($) {
push @l, "Glide_V5" if detect_devices::matching_desc('Voodoo 5');
push @l, "Glide_V3-DRI" if detect_devices::matching_desc('Voodoo (3|Banshee)');
push @l, "Device3Dfx", "XFree86-glide-module" if detect_devices::matching_desc('Voodoo');
- require timezone;
- require lang;
- push @l, "isdn4k-utils" if ($o->{timezone}{timezone} || timezone::bestTimezone(lang::lang2text($o->{lang}))) =~ /Europe/;
$_->{values} = [ map { $_ + 50 } @{$_->{values}} ] foreach grep {$_} map { pkgs::packageByName($o->{packages}, $_) } @l;
#- add OpenGL games that are only usefull if a 3D accelerated card is installed.
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 38b490c62..5934476c4 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -440,7 +440,7 @@ Consoles 1,3,4,7 may also contain interesting information";
# substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec;
}
if (my $charset = lang::charset($o->{lang}, $o->{prefix})) {
- update_userkderc("$o->{prefix}/usr/share/config/kdeglobals", 'Locale', Charset => $charset);
+ eval { update_userkderc("$o->{prefix}/usr/share/config/kdeglobals", 'Locale', Charset => $charset) };
}
# #- update language and icons for KDE.
diff --git a/perl-install/share/compssUsers.desktop b/perl-install/share/compssUsers.desktop
index a56a3b259..d82d4fcaf 100644
--- a/perl-install/share/compssUsers.desktop
+++ b/perl-install/share/compssUsers.desktop
@@ -16,7 +16,7 @@ Multimedia - Sound [icon=multimedia] [descr=Audio-related tools: mp3 or midi pla
Multimedia - Video [icon=video] [descr=Video players and editors]
Video
-Multimedia - CD Burning [icon=cdburning] [descr=Tools to create and burn CD's]
+Multimedia - CD Burning [icon=cd_burning] [descr=Tools to create and burn CD's]
Archiving/Cd burning
More Graphical Desktops (Gnome, IceWM) [icon=windowmanager] [descr=Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc]
@@ -26,14 +26,14 @@ More Graphical Desktops (Gnome, IceWM) [icon=windowmanager] [descr=Gnome, Icewm,
+XFree86-75dpi-fonts
+fonts-ttf-west_european
-Personnal Information Management [icon=pim] [descr=Tools for your Palm Pilot or your Visor]
+Personnal Information Management [icon=remote_access] [descr=Tools for your Palm Pilot or your Visor]
+jpilot
+pilot-link
+kde-pim
+gnome-pim
+gnome-pim-conduits
-Personnal Finance [icon=money] [descr=Programs to manage your finance, such as gnucash]
+Personnal Finance [icon=sciences] [descr=Programs to manage your finance, such as gnucash]
+gnucash
+MoneyDance
diff --git a/perl-install/share/list b/perl-install/share/list
index 12b11b03d..63932f20e 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -18,7 +18,6 @@
/sbin/mke2fs
/sbin/mkreiserfs
/sbin/raidstart
-/usr/X11R6/lib/X11/Cards
/usr/X11R6/lib/modules/xf86Wacom.so
/usr/bin/bzip2
/usr/bin/packdrake
@@ -110,6 +109,7 @@
/usr/sbin/ext2resize
/usr/sbin/rescuept
/usr/share/icons/amusement_section.xpm
+/usr/share/icons/cd_burning_section.xpm
/usr/share/icons/chat_section.xpm
/usr/share/icons/default_section.xpm
/usr/share/icons/documentation_section.xpm
@@ -119,4 +119,7 @@
/usr/share/icons/multimedia_section.xpm
/usr/share/icons/networking_section.xpm
/usr/share/icons/office_section.xpm
+/usr/share/icons/remote_access_section.xpm
+/usr/share/icons/sciences_section.xpm
+/usr/share/icons/video_section.xpm
/usr/share/icons/windowmanager_section.xpm