diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-01-10 16:08:34 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-01-10 16:08:34 +0000 |
| commit | 5b3615c6c03f8961facaf6e35c8963c0f9456197 (patch) | |
| tree | 2d27c3298cce44eae42ceb819204454395bdd042 /perl-install | |
| parent | 3a2545452f8ddb6bfe8eee02c313769d38f74300 (diff) | |
| download | drakx-5b3615c6c03f8961facaf6e35c8963c0f9456197.tar drakx-5b3615c6c03f8961facaf6e35c8963c0f9456197.tar.gz drakx-5b3615c6c03f8961facaf6e35c8963c0f9456197.tar.bz2 drakx-5b3615c6c03f8961facaf6e35c8963c0f9456197.tar.xz drakx-5b3615c6c03f8961facaf6e35c8963c0f9456197.zip | |
no_comment
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Xconfigurator_consts.pm | 4 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 4 | ||||
| -rw-r--r-- | perl-install/share/compssList | 3 | ||||
| -rw-r--r-- | perl-install/timezone.pm | 1 |
5 files changed, 9 insertions, 5 deletions
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm index aae59790f..4cb0d8730 100644 --- a/perl-install/Xconfigurator_consts.pm +++ b/perl-install/Xconfigurator_consts.pm @@ -149,8 +149,8 @@ $default_monitor = "High Frequency SVGA, 1024x768 at 70 Hz"; %lines = ( #- 'Cirrus Logic|GD 5446' => [ ' Option "no_bitblt"' ], 'Silicon Integrated Systems [SiS]|86C326' => [ ' Option "noaccel"' ], - 'Trident Microsystems|Cyber 9525' => [ ' Option "noaccel"' ], - 'S3 Inc.|86c368 [Trio 3D/2X]' => [ ' ChipID 0x8a10' ], +#- 'Trident Microsystems|Cyber 9525' => [ ' Option "noaccel"' ], +#- 'S3 Inc.|86c368 [Trio 3D/2X]' => [ ' ChipID 0x8a10' ], ); #- most usefull server options have to be accessible at the beginning, since diff --git a/perl-install/install2.pm b/perl-install/install2.pm index e111c9043..6c7f6d784 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -352,7 +352,7 @@ sub choosePackages { if ($_[1] > 1 || !$o->{isUpgrade} || $::expert) { if ($_[1] == 1) { $o->{compssUsersChoice}{$_} = 1 foreach @{$o->{compssUsersSorted}}, 'Miscellaneous'; - $o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|ko|th|vi|zh/; #- gnome handles much this fonts much better + $o->{compssUsersChoice}{KDE} = 0 if $o->{lang} =~ /ja|el|ko|th|vi|zh/; #- gnome handles much this fonts much better } $o->choosePackages($o->{packages}, $o->{compss}, diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 8ab9d4073..72a442c3f 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -648,9 +648,13 @@ sub kdeicons_postinstall($) { } elsif (m|^/dev/(\S+)\s+(/mnt/DOS_\S*)\s+|) { my %toreplace = ( device => $1, id => $1, mntpoint => $2 ); template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$1.kdelnk", 1, %toreplace); + symlink "hd_umount.xpm", "$prefix/usr/share/icons/hd_unmount.xpm"; + symlink "hd_umount.xpm", "$prefix/usr/share/icons/large/hd_unmount.xpm"; } elsif (m|^/dev/(\S+)\s+(\S*)\s+vfat\s+|) { my %toreplace = ( device => $1, id => $1, mntpoint => $2 ); template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$1.kdelnk", 1, %toreplace); + symlink "hd_umount.xpm", "$prefix/usr/share/icons/hd_unmount.xpm"; + symlink "hd_umount.xpm", "$prefix/usr/share/icons/large/hd_unmount.xpm"; } } diff --git a/perl-install/share/compssList b/perl-install/share/compssList index 4a106ed16..e135fe17e 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -385,7 +385,7 @@ ispell-nl -15 -15 -15 ispell-no -15 -15 -15 ispell-pl -15 -15 -15 ispell-pt -15 -15 -15 -ispell-pt_BR -15 -15 -51 +ispell-pt_BR -15 -15 -15 ispell-ro -15 -15 -15 ispell-ru -15 -15 -15 ispell-sl -15 -15 -15 @@ -884,7 +884,6 @@ transfig 16 0 14 tree 40 25 10 trn 46 0 41 trojka 54 0 48 -ttfonts 87 0 80 tunelp 24 15 28 ucd-snmp 0 70 45 ucd-snmp-devel 0 25 45 diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm index 0154277ac..a25dcf36c 100644 --- a/perl-install/timezone.pm +++ b/perl-install/timezone.pm @@ -50,6 +50,7 @@ my %l2t = ( 'French (Canada)' => 'Canada/Atlantic', # or Newfoundland ? or Eastern ? 'Gaeilge (Ireland)' => 'Europe/Dublin', 'German (Germany)' => 'Europe/Berlin', +'Greek (Greece)' => 'Europe/Athens', 'Hungarian (Hungary)' => 'Europe/Budapest', 'Icelandic (Iceland)' => 'Atlantic/Reykjavik', 'Indonesian (Indonesia)' => 'Asia/Jakarta', |