diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-10-09 17:18:38 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-10-09 17:18:38 +0000 |
| commit | ab7b3d5214d7bd9e9e9684008225cb9b081cfb5a (patch) | |
| tree | 25c71d1724fb3794d21fd3d5561895f8c30f0d5f | |
| parent | 04b569a6e4c9c2e5f8f766681bf96e343a96d30c (diff) | |
| download | drakx-ab7b3d5214d7bd9e9e9684008225cb9b081cfb5a.tar drakx-ab7b3d5214d7bd9e9e9684008225cb9b081cfb5a.tar.gz drakx-ab7b3d5214d7bd9e9e9684008225cb9b081cfb5a.tar.bz2 drakx-ab7b3d5214d7bd9e9e9684008225cb9b081cfb5a.tar.xz drakx-ab7b3d5214d7bd9e9e9684008225cb9b081cfb5a.zip | |
no_comment
| -rw-r--r-- | perl-install/ChangeLog | 5 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 9 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 4cabb392d..46e93295e 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,8 @@ +2000-10-09 Pixel <pixel@mandrakesoft.com> + + * install_any.pm (kdeicons_postinstall): remove the handling of + doc desktop icons. see dadou + 2000-10-09 Guillaume Cottenceau <gc@mandrakesoft.com> * share/compssUsers: new list (with icons) diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index c8daa3f2b..2d458c1a5 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -494,15 +494,6 @@ sub kdeicons_postinstall { 1, %$_) if $name; } - my @l = list_skels($prefix, 'Desktop/Doc.kdelnk'); - if (my ($lang) = all("$prefix/usr/doc/mandrake")) { - substInFile { s|^(URL=.*?)/?$|$1/$lang/index.html| } @l; - substInFile { s|^(url=/usr/doc/mandrake/)$|$1$lang/index.html| } "$prefix/usr/lib/desktop-links/mandrake.links"; - } else { - unlink @l; - substInFile { $_ = '' if /^\[MDKsupport\]$/ .. /^\s*$/ } "$prefix/usr/lib/desktop-links/mandrake.links"; - } - # rename the .kdelnk to the name found in the .kdelnk as kde doesn't use it # for displaying foreach my $dir (grep { -d $_ } list_skels($prefix, 'Desktop')) { diff --git a/perl-install/modules.pm b/perl-install/modules.pm index b60eb2c4a..6e8c8a039 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -154,7 +154,7 @@ arch() =~ /^sparc/ ? ( "pluto" => "Sun SparcSTORAGE Array SCSI", #- name it "fc4:soc:pluto" ? ) : arch() =~ /alpha/ ? () : ( "DAC960" => "Mylex DAC960", - "dpt_i2o" => "Distributed Tech SmartCache/Raid I-IV Controller", # not there anymore? + "dpt_i2o" => "Distributed Tech SmartCache/Raid I-V Controller", "megaraid" => "AMI MegaRAID", "aacraid" => "AACxxx Raid Controller", "cpqarray" => "Compaq Smart-2/P RAID Controller", |