summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-01-12 12:28:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-01-12 12:28:01 +0000
commitb360535ff274a20ac7f958132859bc6525e662f8 (patch)
tree88f5793154facfe847bc3cc4952acd9031e0b396 /perl-install
parente29fda8babb4dd6c1f3fe431985d5aba29b3210c (diff)
downloaddrakx-backup-do-not-use-b360535ff274a20ac7f958132859bc6525e662f8.tar
drakx-backup-do-not-use-b360535ff274a20ac7f958132859bc6525e662f8.tar.gz
drakx-backup-do-not-use-b360535ff274a20ac7f958132859bc6525e662f8.tar.bz2
drakx-backup-do-not-use-b360535ff274a20ac7f958132859bc6525e662f8.tar.xz
drakx-backup-do-not-use-b360535ff274a20ac7f958132859bc6525e662f8.zip
no_comment
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_any.pm4
-rw-r--r--perl-install/install_steps_gtk.pm3
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/pkgs.pm1
-rw-r--r--perl-install/share/compssList32
-rw-r--r--perl-install/share/compssUsers15
-rw-r--r--perl-install/timezone.pm1
7 files changed, 32 insertions, 26 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 72a442c3f..ae74d7cea 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -109,7 +109,7 @@ sub getAvailableSpace {
do { $_->{mntpoint} eq '/' and return int($_->{size} * 512 / 1.07) } foreach @{$o->{fstab}};
if ($::testing) {
- my $nb = 350;
+ my $nb = 1350;
log::l("taking ${nb}MB for testing");
return $nb << 20;
}
@@ -661,8 +661,10 @@ sub kdeicons_postinstall($) {
my @l = map { "$prefix$_/Desktop/Doc.kdelnk" } list_skels();
if (my ($lang) = eval { all("$prefix/usr/doc/mandrake") }) {
substInFile { s|^(URL=.*?)/?$|$1/$lang| } @l;
+ substInFile { s|^(url=/usr/doc/mandrake/)$|$1$lang| } "$prefix/usr/lib/desktop-links/mandrake.links";
} else {
unlink @l;
+ substInFile { $_ = '' if /^\[MDKsupport\]$/ .. /^\s*$/ } "$prefix/usr/lib/desktop-links/mandrake.links";
}
my $lang = quotemeta $ENV{LANG};
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 5c3ad0a7e..41e17160f 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -303,8 +303,9 @@ When sure, press Ok."))) {
sub chooseSizeToInstall {
my ($o, $packages, $min_size, $max_size) = @_;
my ($min, $max) = map { pkgs::correctSize($_ / sqr(1024)) } $min_size, $max_size;
+ log::l("choosing size to install between $min and $max (really between $min_size and $max_size)");
my $w = my_gtk->new('');
- my $adj = create_adjustment($max, $min, $max * 0.9);
+ my $adj = create_adjustment($max, $min, $max);
my $spin = gtkset_usize(new Gtk::SpinButton($adj, 0, 0), 100, 0);
gtkadd($w->{window},
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d4a2f248e..c844e5a9c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -267,7 +267,7 @@ _("You need %dMB for a full install of the groups you selected.
You can go on anyway, but be warned that you won't get all packages", $max_size / sqr(1024)), 1) or goto &choosePackages
}
- my $size2install = $::beginner ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, min($max_size, $available)) or goto &choosePackages;
+ my $size2install = $::beginner ? $available * 0.7 : $o->chooseSizeToInstall($packages, $min_size, min($max_size, $available * 0.9)) or goto &choosePackages;
($o->{packages_}{ind}) =
pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, 1, $size2install, $o->{installClass});
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index a905b9284..4d8c591f4 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -330,6 +330,7 @@ sub setSelectedFromCompssList {
if ($max_size && $nb > $max_size) {
unselect($packages, $p);
$min_level = $p->{values}[$ind];
+ log::l("setSelectedFromCompssList: up to indice $min_level (reached size $max_size)");
last;
}
}
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index e135fe17e..daa3468b0 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -77,7 +77,7 @@ acon 0 0 0
adjtimex 22 35 87
aktion 76 0 15
am-utils 0 25 19
-ami -5 -5 -5
+ami -10 -10 -10
ami-gnome -20 -20 -20
anacron 85 70 85
anonftp 0 86 13
@@ -214,11 +214,11 @@ fmirror 45 35 40
fnlib 10 0 7
fnlib-devel 10 0 0
fonts-ttf-big5 -10 0 -10
-fonts-ttf-decoratives -10 0 -10
+fonts-ttf-decoratives 72 0 68
fonts-ttf-gb2312 -10 0 -10
fonts-ttf-japanese -10 0 -10
fonts-ttf-korean -10 0 -10
-fonts-ttf-west_european -10 0 -10
+fonts-ttf-west_european 77 0 74
fortune-mod 45 99 49
freeciv 54 0 53
freetype 10 0 4
@@ -405,7 +405,7 @@ kcmclock 0 0 0
kcmkdesu 80 0 70
kcmlaptop 72 0 60
kdbg 15 0 27
-kde-doc-translation-fr -5 -5 -5
+kde-doc-translation-fr -12 -20 -16
kde-themes 72 0 60
kdeadmin 72 0 60
kdebase 79 0 68
@@ -457,7 +457,7 @@ kmp3te 72 0 60
kmpg 72 0 60
knetload 72 0 60
knewmail 72 0 60
-kon2 -5 -60 -5
+kon2 -12 -60 -15
kover 72 0 60
kpackage 77 0 67
kpacman 55 0 59
@@ -604,17 +604,17 @@ mailx 92 92 92
make 50 3 94
man 90 65 72
man-pages 90 65 72
-man-pages-cs -5 -30 -25
-man-pages-de -5 -30 -25
-man-pages-es -5 -30 -25
-man-pages-fr -5 -30 -25
-man-pages-hu -5 -30 -25
-man-pages-id -5 -30 -25
-man-pages-it -5 -30 -25
-man-pages-ja -5 -30 -25
-man-pages-ko -5 -30 -25
-man-pages-pl -5 -30 -25
-man-pages-ru -5 -30 -25
+man-pages-cs -10 -30 -25
+man-pages-de -10 -30 -25
+man-pages-es -10 -30 -25
+man-pages-fr -10 -30 -25
+man-pages-hu -10 -30 -25
+man-pages-id -10 -30 -25
+man-pages-it -10 -30 -25
+man-pages-ja -10 -30 -25
+man-pages-ko -10 -30 -25
+man-pages-pl -10 -30 -25
+man-pages-ru -10 -30 -25
mandrake-release 99 99 99
mandrake_desk 88 0 88
mandrake_doc-de -15 0 -25
diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers
index d749c4ef7..282a2ffe6 100644
--- a/perl-install/share/compssUsers
+++ b/perl-install/share/compssUsers
@@ -4,7 +4,8 @@ Graphics Manipulation
KDE
kde
+XFree86
- +XFree86-75dpi-fonts
+ +XFree86-75dpi-fonts
+ +fonts-ttf-west_european
Gnome
gnome
@@ -12,11 +13,12 @@ Gnome
+gmc
+XFree86
+XFree86-75dpi-fonts
+ +fonts-ttf-west_european
Other window managers
window-managers:window-managers
+XFree86
- +XFree86-75dpi-fonts
+ +XFree86-75dpi-fonts
Mail/WWW/News Tools
network:web
@@ -36,7 +38,8 @@ Office
Multimedia Support
configuration:sound
- multimedia
+ multimedia:sound
+ multimedia:video
daemons:sound
Games
@@ -57,15 +60,13 @@ Network Management Workstation
daemons:network:ftp
daemons:network:nfs
daemons:network:telnet
- +BeroList
+# +BeroList
+comsat
+postfix
+imap
Documentation
- documentation:languages:en
- documentation:misc
- documentation:tools
+ documentation
Databases
database
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index a25dcf36c..728de2f4d 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -43,6 +43,7 @@ my %l2t = (
'Dutch (Netherlands)' => 'Europe/Amsterdam',
'English (USA)' => 'America/New_York',
'English (UK)' => 'Europe/London',
+'Esperanto' => 'Europe/Warsaw',
'Estonian (Estonia)' => 'Europe/Tallinn',
'Finnish (Finland)' => 'Europe/Helsinki',
'French (France)' => 'Europe/Paris',
generated by cgit v1.2.1 (git 2.21.0) at 2024-07-03 10:44:57 +0000