summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/README2
-rw-r--r--perl-install/ChangeLog25
-rw-r--r--perl-install/common.pm36
-rw-r--r--perl-install/fs.pm1
-rw-r--r--perl-install/install2.pm6
-rw-r--r--perl-install/install_any.pm7
-rw-r--r--perl-install/install_steps.pm5
-rw-r--r--perl-install/install_steps_interactive.pm7
-rw-r--r--perl-install/lang.pm8
-rw-r--r--perl-install/share/compssList92
-rw-r--r--perl-install/share/compssUsers2
-rw-r--r--perl-install/share/list2
12 files changed, 118 insertions, 75 deletions
diff --git a/docs/README b/docs/README
index 2b4be2372..0110a648d 100644
--- a/docs/README
+++ b/docs/README
@@ -80,7 +80,7 @@ images/*.img
- all for everything, but need 2.88MB media (like el torito cdrom boot)
- hd for hard-disk install
- cdrom for cdrom install
- - network for ftp/nfs install
+ - network for ftp/nfs install (non-pcmcia devices)
- pcmcia for pcmcia install (see ``PCMCIA install'' below for more)
the following modules have been removed from:
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index ed73ab125..dabd47c5c 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,28 @@
+2000-10-06 Pixel <pixel@mandrakesoft.com>
+
+ * install_steps.pm (afterInstallPackages): put the Charset in
+ kdeglobals, otherwise kde uses charset iso8859-1 :(
+
+ * lang.pm (charset): created
+
+ * common.pm (update_userkderc): fix it, change the argument
+ passing
+
+2000-10-05 Pixel <pixel@mandrakesoft.com>
+
+ * share/compssList: raise kde-i18n-*, should be installed whenever
+ kdebase is installed
+
+ * pci_probing/pcitable: integrate patch from viet (concerns
+ sym53c8xx cards)
+
+ * share/compssUsers: use "documentation" as the database icon
+
+ * install_steps_interactive.pm (chooseGroups): fix to accept icons
+ not in the format "*_section.xpm"
+
+ * install2.pm (miscellaneous): put yes/no in sysconfig/usb entries
+
2000-10-05 dam's <damien@mandrakesoft.com>
* netconnect.pm (adsl_conf): updated pppoe conf.
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 2232048f6..baa46e46a 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -466,27 +466,25 @@ sub template2userfile {
}
}
sub update_userkderc {
- my ($prefix, $category, %subst) = @_;
-
- foreach my $file (list_skels($prefix, '.kderc')) {
- output $file,
- (map {
- my $l = $_;
- s/^\s*//;
- if (my $i = /^\[$category\]/i ... /^\[/) {
- if ($i =~ /E/) { #- for last line of category
- $l = join('', values %subst) . $l;
- %subst = ();
- } elsif (/^(\w*?)=/) {
- if (my $e = delete $subst{lc($1)}) {
- $l = "$1=$e\n";
- }
+ my ($file, $category, %subst) = @_;
+
+ output $file,
+ (map {
+ my $l = $_;
+ s/^\s*//;
+ if (my $i = /^\[$category\]/i ... /^\[/) {
+ if ($i =~ /E/) { #- for last line of category
+ $l = join('', map_each { "$::a=$::b\n" } %subst) . $l;
+ %subst = ();
+ } elsif (/^(\w*?)=/) {
+ if (my $e = delete $subst{lc($1)}) {
+ $l = "$1=$e\n";
}
}
- $l;
- } cat_($file)),
- (%subst && "[$category]\n", values %subst); #- if category has not been found above.
- }
+ }
+ $l;
+ } cat_($file)),
+ (%subst && "[$category]\n", map_each { "$::a=$::b\n" } %subst); #- if category has not been found above.
}
sub substInFile(&@) {
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index 0a799131a..d7bf77271 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -91,6 +91,7 @@ sub format_ext2($@) {
sub format_reiserfs($@) {
my ($dev, @options) = @_;
+ #TODO add -h tea
run_program::run("mkreiserfs", "-f", @options, devices::make($dev)) or die _("%s formatting of %s failed", "reiserfs", $dev);
}
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 2f3fd70f0..958f9b105 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -349,9 +349,9 @@ sub miscellaneous {
my $f = "$o->{prefix}/etc/sysconfig/usb";
output $f,
"USB=yes
-MOUSE=
-KEYBOARD=
-STORAGE=
+MOUSE=" . bool2yesno(hasUsbMouse()) . "
+KEYBOARD=" . bool2yesno(hasUsbKeyboard()) . "
+STORAGE=" . bool2yesno(hasUsbZip()) . "
VISOR=no
" if modules::get_alias("usb-interface") && ! -e $f;
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index c4f8fe828..bccc49e85 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -454,11 +454,12 @@ sub install_urpmi {
sub kderc_largedisplay {
my ($prefix) = @_;
- update_userkderc($prefix, 'KDE',
+ update_userkderc($_, 'KDE',
Contrast => 7,
kfmIconStyle => "Large",
kpanelIconStyle => "Normal", #- to change to Large when icons looks better
- KDEIconStyle => "Large");
+ KDEIconStyle => "Large") foreach list_skels($prefix, '.kderc');
+
substInFile {
s/^(GridWidth)=85/$1=100/;
s/^(GridHeight)=70/$1=75/;
@@ -565,7 +566,7 @@ sub loadO {
my ($O, $f) = @_; $f ||= auto_inst_file;
my $o;
if ($f =~ /^(floppy|patch)$/) {
- my $f = $f eq "floppy" ? 'Mandrake/base/auto_inst.cfg' : "patch";
+ my $f = $f eq "floppy" ? 'auto_inst.cfg' : "patch";
unless ($::testing) {
fs::mount(devices::make(detect_devices::floppy()), "/mnt", (arch() =~ /sparc/ ? "romfs" : "vfat"), 'readonly');
$f = "/mnt/$f";
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index f51a149cf..38b490c62 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -439,9 +439,12 @@ Consoles 1,3,4,7 may also contain interesting information";
#- simply disable it :-(
# 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);
+ }
# #- update language and icons for KDE.
-# update_userkderc($o->{prefix}, 'Locale', Language => "");
+# update_userkderc($_, 'Locale', Language => "") foreach list_skels($o->{prefix}, '.kderc');
# log::l("updating kde icons according to available devices");
# install_any::kdeicons_postinstall($o->{prefix});
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 39bd32b98..a0361cf6a 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -506,7 +506,12 @@ sub chooseGroups {
{ list => \@groups,
help => sub { translate($o->{compssUsersDescr}{$_}) },
ref => sub { \$o->{compssUsersChoice}{$_} },
- icon2f => sub { "/usr/share/icons/" . ($o->{compssUsersIcons}{$_} || 'default') . "_section.xpm" },
+ icon2f => sub {
+ my $f = "/usr/share/icons/" . ($o->{compssUsersIcons}{$_} || 'default');
+ -e "$f.xpm" or $f .= "_section";
+ -e "$f.xpm" or $f = '/usr/share/icons/default_section';
+ "$f.xpm";
+ },
label => sub { translate($_) . ($size{$_} ? sprintf " (%d%s)", round_down($size{$_} / sqr(1024), 10), _("MB") : '') },
},
$o->{meta_class} eq 'desktop' ? { list => [ _("All") ], ref => sub { \$all }, shadow => 0 } : (),
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 53d396054..176f7bdd9 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -433,6 +433,14 @@ sub get_x_fontset {
($big, $small);
}
+sub charset {
+ my ($lang, $prefix) = @_;
+ my $l = $languages{$lang} && $languages{$lang}[2];
+ foreach (cat_("$prefix/usr/X11R6/lib/X11/locale/locale.alias")) {
+ /$l:\s+.*\.(\S+)/ and return $1;
+ }
+}
+
#-######################################################################################
#- Wonderful perl :(
#-######################################################################################
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index daede6166..27a11f44a 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -1475,52 +1475,52 @@ libetherx-devel 0 0 0
screem 55 0 60
portsentry 0 15 0
ttfprint -10 -10 -10
-kde-i18n-Afrikaans -12 -60 -30
-kde-i18n-Basque -12 -60 -30
-kde-i18n-Brazil -12 -60 -30
-kde-i18n-Breton -12 -60 -30
-kde-i18n-British -12 -60 -30
-kde-i18n-Bulgarian -12 -60 -30
-kde-i18n-Catalan -12 -60 -30
-kde-i18n-Chinese -12 -60 -30
-kde-i18n-Croatian -12 -60 -30
-kde-i18n-Czech -12 -60 -30
-kde-i18n-Danish -12 -60 -30
-kde-i18n-Dutch -12 -60 -30
-kde-i18n-Esperanto -12 -60 -30
-kde-i18n-Estonian -12 -60 -30
-kde-i18n-Finnish -12 -60 -30
-kde-i18n-French -12 -60 -30
-kde-i18n-Galacian -12 -60 -30
-kde-i18n-German -12 -60 -30
-kde-i18n-Greek -12 -60 -30
-kde-i18n-Hebrew -12 -60 -30
-kde-i18n-Hungarian -12 -60 -30
-kde-i18n-Icelandic -12 -60 -30
-kde-i18n-Italian -12 -60 -30
-kde-i18n-Japanese -12 -60 -30
-kde-i18n-Korean -12 -60 -30
-kde-i18n-Lithuanian -12 -60 -30
-kde-i18n-Macedonian -12 -60 -30
-kde-i18n-Maori -12 -60 -30
-kde-i18n-Norwegian -12 -60 -30
-kde-i18n-Norwegian -12 -60 -30
-kde-i18n-Polish -12 -60 -30
-kde-i18n-Portuguese -12 -60 -30
-kde-i18n-Romanian -12 -60 -30
-kde-i18n-Russian -12 -60 -30
-kde-i18n-Serbian -12 -60 -30
-kde-i18n-Slovak -12 -60 -30
-kde-i18n-Slovenian -12 -60 -30
-kde-i18n-Spanish -12 -60 -30
-kde-i18n-Swedish -12 -60 -30
-kde-i18n-Tamil -12 -60 -30
-kde-i18n-Thai -12 -60 -30
-kde-i18n-Turkish -12 -60 -30
-kde-i18n-Ukrainian -12 -60 -30
-kde-i18n-Walloon -12 -60 -30
-kde-i18n-Welsh -12 -60 -30
-kde-i18n-Norwegian-Nynorsk -12 -60 -30
+kde-i18n-Afrikaans -12 -51 -23
+kde-i18n-Basque -12 -51 -23
+kde-i18n-Brazil -12 -51 -23
+kde-i18n-Breton -12 -51 -23
+kde-i18n-British -12 -51 -23
+kde-i18n-Bulgarian -12 -51 -23
+kde-i18n-Catalan -12 -51 -23
+kde-i18n-Chinese -12 -51 -23
+kde-i18n-Croatian -12 -51 -23
+kde-i18n-Czech -12 -51 -23
+kde-i18n-Danish -12 -51 -23
+kde-i18n-Dutch -12 -51 -23
+kde-i18n-Esperanto -12 -51 -23
+kde-i18n-Estonian -12 -51 -23
+kde-i18n-Finnish -12 -51 -23
+kde-i18n-French -12 -51 -23
+kde-i18n-Galacian -12 -51 -23
+kde-i18n-German -12 -51 -23
+kde-i18n-Greek -12 -51 -23
+kde-i18n-Hebrew -12 -51 -23
+kde-i18n-Hungarian -12 -51 -23
+kde-i18n-Icelandic -12 -51 -23
+kde-i18n-Italian -12 -51 -23
+kde-i18n-Japanese -12 -51 -23
+kde-i18n-Korean -12 -51 -23
+kde-i18n-Lithuanian -12 -51 -23
+kde-i18n-Macedonian -12 -51 -23
+kde-i18n-Maori -12 -51 -23
+kde-i18n-Norwegian -12 -51 -23
+kde-i18n-Norwegian -12 -51 -23
+kde-i18n-Polish -12 -51 -23
+kde-i18n-Portuguese -12 -51 -23
+kde-i18n-Romanian -12 -51 -23
+kde-i18n-Russian -12 -51 -23
+kde-i18n-Serbian -12 -51 -23
+kde-i18n-Slovak -12 -51 -23
+kde-i18n-Slovenian -12 -51 -23
+kde-i18n-Spanish -12 -51 -23
+kde-i18n-Swedish -12 -51 -23
+kde-i18n-Tamil -12 -51 -23
+kde-i18n-Thai -12 -51 -23
+kde-i18n-Turkish -12 -51 -23
+kde-i18n-Ukrainian -12 -51 -23
+kde-i18n-Walloon -12 -51 -23
+kde-i18n-Welsh -12 -51 -23
+kde-i18n-Norwegian-Nynorsk -12 -51 -23
linuxconf-lang-cn -35 -60 -35
linuxconf-lang-cs -35 -60 -35
linuxconf-lang-de -35 -60 -35
diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index 0ff1dff33..c772f0686 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -46,5 +46,5 @@ Games [icon=amusement] [descr=Amusement programs: arcade, boards, strategy, etc]
Documentation [icon=documentation] [descr=Books and Howto's on Linux and Free Software]
Books
-Databases [icon=database] [descr=Databases clients and servers (mysql and postgresql)]
+Databases [icon=documentation] [descr=Databases clients and servers (mysql and postgresql)]
Databases
diff --git a/perl-install/share/list b/perl-install/share/list
index 12a1eb0aa..12b11b03d 100644
--- a/perl-install/share/list
+++ b/perl-install/share/list
@@ -113,7 +113,9 @@
/usr/share/icons/chat_section.xpm
/usr/share/icons/default_section.xpm
/usr/share/icons/documentation_section.xpm
+/usr/share/icons/gnome.xpm
/usr/share/icons/graphics_section.xpm
+/usr/share/icons/kde.xpm
/usr/share/icons/multimedia_section.xpm
/usr/share/icons/networking_section.xpm
/usr/share/icons/office_section.xpm
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-21 22:13:32 +0000