summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile5
-rw-r--r--perl-install/Xconfigurator.pm14
-rw-r--r--perl-install/install2.pm7
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/install_steps_interactive.pm8
-rw-r--r--perl-install/interactive_gtk.pm2
-rw-r--r--perl-install/my_gtk.pm18
-rw-r--r--perl-install/pkgs.pm36
-rw-r--r--perl-install/share/compssList481
-rw-r--r--perl-install/share/install.rc2
-rw-r--r--perl-install/share/po/Makefile4
12 files changed, 410 insertions, 171 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index 986cf9fec..9b0d037f7 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -73,6 +73,9 @@ gendepslist: %: %.cc
$(BASE)/depslist: gendepslist $(RPMS)
./gendepslist $(BASE)/depslist $(ROOTDEST)/Mandrake/RPMS/*.rpm
+$(BASE)/hdlist: $(RPMS)
+ $(ROOTDEST)/misc/genhdlist $(ROOTDEST)
+
install_pms: all
for i in `perl -ne 's/sub (\w+?)_? {.*/$$1/ and print' commands.pm`; do ln -sf commands $(DEST)/usr/bin/$$i; done
@@ -164,7 +167,7 @@ as_root:
mount /dev/loop0 /mnt/initrd
chmod a+w /mnt/initrd
-full_stage2: $(BASE)/depslist
+full_stage2: $(BASE)/depslist $(BASE)/hdlist
rm -rf $(DEST)
mkdir -p $(DEST)
$(MAKE) get_needed_files
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index ffb966628..04e7326b8 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -258,7 +258,7 @@ sub testFinalConfig($;$) {
write_XF86Config($o, $::testing ? $tmpconfig : "$prefix/etc/X11/XF86Config");
$auto
- or $in->ask_yesorno(_("Test configuration"), _("Do you want to test the configuration?"))
+ or $in->ask_yesorno(_("Test configuration"), _("Do you want to test the configuration?"), 1)
or return 1;
unlink "$prefix/tmp/.X9-lock";
@@ -315,7 +315,7 @@ sub testFinalConfig($;$) {
$time-- or Gtk->main_quit;
});
- exit (interactive_gtk->new->ask_yesorno('', [ _("Is this ok?"), $text ], 1) ? 0 : 222);
+ exit (interactive_gtk->new->ask_yesorno('', [ _("Is this ok?"), $text ], 0) ? 0 : 222);
};
my $rc = close F;
my $err = $?;
@@ -334,7 +334,7 @@ sub autoResolutions($;$) {
$nowarning || $in->ask_okcancel(_("Automatic resolutions"),
_("To find the available resolutions i will try different ones.
Your screen will blink...
-You can switch if off if you want, you'll hear a beep when it's over")) or return;
+You can switch if off if you want, you'll hear a beep when it's over"), 1) or return;
#- swith to virtual console 1 (hopefully not X :)
my $vt = setVirtual(1);
@@ -483,7 +483,7 @@ sub resolutionsConfiguration($%) {
if ($options{nowarning} || $in->ask_okcancel(_("Automatic resolutions"),
_("I can try to find the available resolutions (eg: 800x600).
Alas it can freeze sometimes
-Do you want to try?"))) {
+Do you want to try?"), 1)) {
autoResolutions($o, $options{nowarning});
is_empty_hash_ref($card->{depth}) and $in->ask_warn('',
_("No valid modes found
@@ -566,8 +566,6 @@ sub write_XF86Config {
#- Write monitor section.
$O = $o->{monitor};
- $O->{modelines} .= $o->{card}{type} eq "TG 96" ? $modelines_text_Trident_TG_96xx : $modelines_text;
-
print F $monitorsection_text1;
print F qq( Identifier "$O->{type}"\n);
print F qq( VendorName "$O->{vendor}"\n);
@@ -580,7 +578,7 @@ sub write_XF86Config {
print F qq( VertRefresh $O->{vsyncrange}\n);
print F "\n";
print F $monitorsection_text4;
- print F $O->{modelines} || ($o->{card}{type} eq "TG 96" ? $modelines_text_Trident_TG_96xx : $modelines_text);
+ print F ($O->{modelines} || '') . ($o->{card}{type} eq "TG 96" ? $modelines_text_Trident_TG_96xx : $modelines_text);
print F "\nEndSection\n\n\n";
#- Write Device section.
@@ -724,7 +722,7 @@ sub main {
if ($ok) {
my $run = $o->{xdm} || $::auto || $in->ask_yesorno(_("X at startup"),
_("I can set up your computer to automatically start X upon booting.
-Would you like X to start when you reboot?"));
+Would you like X to start when you reboot?"), 1);
rewriteInittab($run ? 5 : 3) unless $::testing;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index fd6aae4a6..b18895f3e 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -19,6 +19,7 @@ use keyboard;
use lilo;
use mouse;
use fs;
+use timezone;
use fsedit;
use devices;
use partition_table qw(:types);
@@ -52,7 +53,7 @@ my @installSteps = (
setRootPassword => [ __("Set root password"), 1, 1, "formatPartitions" ],
addUser => [ __("Add a user"), 1, 1, "doInstallStep" ],
createBootdisk => [ __("Create bootdisk"), 1, 0, "doInstallStep" ],
- setupBootloader => [ __("Install bootloader"), 1, 1],#, "doInstallStep" ],
+ setupBootloader => [ __("Install bootloader"), 1, 1, "doInstallStep" ],
configureX => [ __("Configure X"), 1, 0, "formatPartitions" ],
exitInstall => [ __("Exit install"), 0, 0 ],
);
@@ -326,7 +327,9 @@ sub selectInstallClass {
$o->{partitions} ||= $suggestedPartitions{$o->{installClass}};
$o->{partitioning}{auto_allocate} ||= -1 if $::beginner;
- $o->setPackages(\@install_classes) if $o->{steps}{choosePackages}{entered} >= 1;
+ $o->setPackages(\@install_classes)
+ if $o->{steps}{choosePackages}{entered} >= 1 &&
+ !$o->{steps}{doInstallStep}{done};
}
#------------------------------------------------------------------------------
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index d79dd42e3..9812c3efb 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -130,7 +130,7 @@ sub setPackages($$) {
} foreach @{$o->{base}};
pkgs::setShowFromCompss($o->{compss}, $o->{installClass}, $o->{lang});
- pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{lang});
+ ($o->{packages_}{ind}, $o->{packages_}{select_level}) = pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{lang});
}
sub addToBeDone(&$) {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index d86ba2ee5..42dd72d17 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -282,7 +282,7 @@ sub createBootdisk($) {
#------------------------------------------------------------------------------
sub setupBootloaderBefore {
my ($o) = @_;
- add2hash($o->{bootloader} ||= {}, lilo::read("$o->{prefix}/etc/lilo.conf"));
+ add2hash($o->{bootloader} ||= {}, lilo::read($o->{prefix}, "/etc/lilo.conf"));
lilo::suggest($o->{prefix}, $o->{bootloader}, $o->{hds}, $o->{fstab}, install_any::kernelVersion());
$o->{bootloader}{keytable} ||= keyboard::kmap($o->{keyboard});
}
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 213347628..5b616bd2c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -524,7 +524,7 @@ depending on the normal bootloader. This is useful if you don't want to install
lilo on your system, or another operating system removes lilo, or lilo doesn't
work with your hardware configuration. A custom bootdisk can also be used with
the Mandrake rescue image, making it much easier to recover from severe system
-failures. Would you like to create a bootdisk for your system?"), !$o->{mkbootdisk}) or return;
+failures. Would you like to create a bootdisk for your system?"), $o->{mkbootdisk}) or return;
$o->{mkbootdisk} = $l[0] if !$o->{mkbootdisk} || $o->{mkbootdisk} eq "1";
} else {
@l or die _("Sorry, no floppy drive available");
@@ -561,7 +561,7 @@ sub setupBootloader {
_("Where do you want to install the bootloader?"),
\@l, $l[!$onmbr]) eq $l[0];
} else {
- $::expert and $o->ask_yesorno('', _("Do you want to use lilo?")) || return;
+ $::expert and $o->ask_yesorno('', _("Do you want to use lilo?"), 1) || return;
my @l = (
_("Boot device") => { val => \$b->{boot}, list => [ map { "/dev/$_->{device}" } @{$o->{hds}}, @{$o->{fstab}} ], not_edit => !$::expert },
@@ -708,7 +708,7 @@ For example you can have ``io=0x300 irq=7''", $l),
if ($@) {
$o->ask_yesorno('',
_("Loading of module %s failed
-Do you want to try again with other parameters?", $l)) or return;
+Do you want to try again with other parameters?", $l), 1) or return;
goto ASK;
}
$l, $m;
@@ -729,7 +729,7 @@ sub load_thiskind {
#------------------------------------------------------------------------------
sub setup_thiskind {
my ($o, $type, $auto, $at_least_one) = @_;
- my @l = $o->load_thiskind($type) unless $::expert && $o->ask_yesorno('', "Skip $type pci probe", 0);
+ my @l = $o->load_thiskind($type) unless $::expert && $o->ask_yesorno('', _("Skip %s pci probe", $type), 1);
return if $auto && (@l || !$at_least_one);
while (1) {
my $msg = @l ?
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 95c668378..af0026df4 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -204,7 +204,7 @@ sub ask_from_entries_refW {
sub wait_messageW($$$) {
my ($o, $title, $message) = @_;
- my $w = my_gtk->new(_("Resizing"), %$o, grab => 1);
+ my $w = my_gtk->new($title, %$o, grab => 1);
my $W = pop @$message;
gtkadd($w->{window},
gtkpack(new Gtk::VBox(0,0),
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index a102ab1f6..b11dd3a3f 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -7,7 +7,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $border);
@ISA = qw(Exporter);
%EXPORT_TAGS = (
helpers => [ qw(create_okcancel createScrolledWindow create_menu create_notebook create_packtable create_hbox create_vbox create_adjustment create_box_with_title) ],
- wrappers => [ qw(gtksignal_connect gtkpack gtkpack_ gtkappend gtkadd gtktext_insert gtkset_usize gtkset_justify gtkset_active gtkshow gtkdestroy gtkset_mousecursor gtkset_background gtkset_default_fontset) ],
+ wrappers => [ qw(gtksignal_connect gtkpack gtkpack_ gtkpack__ gtkappend gtkadd gtktext_insert gtkset_usize gtkset_justify gtkset_active gtkshow gtkdestroy gtkset_mousecursor gtkset_background gtkset_default_fontset) ],
ask => [ qw(ask_warn ask_okcancel ask_yesorno ask_from_entry ask_from_list ask_file) ],
);
$EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ];
@@ -90,13 +90,11 @@ sub gtksignal_connect($@) {
}
sub gtkpack($@) {
my $box = shift;
- foreach (@_) {
- my $l = $_;
- ref $l or $l = new Gtk::Label($l);
- $box->pack_start($l, 1, 1, 0);
- $l->show;
- }
- $box
+ gtkpack_($box, map { 1, $_} @_);
+}
+sub gtkpack__($@) {
+ my $box = shift;
+ gtkpack_($box, map { 0, $_} @_);
}
sub gtkpack_($@) {
my $box = shift;
@@ -318,7 +316,9 @@ sub _create_window($$) {
}
$w->set_title($title);
- $w->signal_connect("expose_event" => sub { c::XSetInputFocus($w->window->XWINDOW) }) if $my_gtk::force_focus || $o->{force_focus};
+
+ $w->signal_connect("map_event" => sub { c::XSetInputFocus($w->window->XWINDOW); })
+ if $my_gtk::force_focus || $o->{force_focus};
$w->signal_connect("delete_event" => sub { $o->{retval} = undef; Gtk->main_quit });
$w->set_uposition(@{$my_gtk::force_position || $o->{force_position}}) if $my_gtk::force_position || $o->{force_position};
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index f9c5a462a..7adb586fd 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -101,6 +101,11 @@ sub set($$$) {
$val ? &select($packages, $p) : unselect($packages, $p);
}
+sub unselect_all($) {
+ my ($packages) = @_;
+ $_->{selected} = $_->{base} foreach values %$packages;
+}
+
sub psUsingDirectory() {
my $dirname = "/tmp/rhimage/Mandrake/RPMS";
my %packages;
@@ -180,21 +185,26 @@ sub readCompss($) {
}
sub readCompssList($) {
- my ($packages) = @_;
- my $level;
+ my ($packages, $compss) = @_;
+ my %compss; map { $compss{$_->{name}} = $_ } @$compss;
my $f = install_any::getFile("compssList") or die "can't find compssList";
+ local $_ = <$f>;
+ my $level = [ split ];
+
+ my $e;
foreach (<$f>) {
/^\s*$/ || /^#/ and next;
+ /^packages\s*$/ and do { $e = $packages; next };
+ /^categories\s*$/ and do { $e = \%compss; next };
+
my ($name, @values) = split;
- if ($name eq "package") {
- $level = \@values;
- } else {
- my $p = $packages->{$name} or log::l("unknown packages $name (in compssList)"), next;
- $p->{values} = \@values;
- }
+ $e or log::l("neither packages nor categories");
+
+ my $p = $e->{$name} or log::l("unknown entry $name (in compssList)"), next;
+ $p->{values} = \@values;
}
$level;
}
@@ -223,20 +233,21 @@ sub setShowFromCompss($$$) {
sub setSelectedFromCompssList($$$$$) {
my ($compssListLevels, $packages, $size, $install_class, $lang) = @_;
+ my ($level, $ind) = 100;
my @packages = values %$packages;
my @places = do {
- my $ind;
map_index { $ind = $::i if $_ eq $install_class } @{$compssListLevels};
defined $ind or log::l("unknown install class $install_class in compssList"), return;
my @values = map { $_->{values}[$ind] } @packages;
- sort { $values[$b] <=> $values[$a] }
- grep { $packages[$_]->{values}[$ind] } #- remove null values (won't get installed)
- 0 .. $#packages;
+ sort { $values[$b] <=> $values[$a] } 0 .. $#packages;
};
foreach (@places) {
my $p = $packages[$_];
+ $level = min($level, $p->{values}[$ind]);
+ last if $level == 0;
+
verif_lang($p, $lang) or next;
&select($packages, $p);
@@ -248,6 +259,7 @@ sub setSelectedFromCompssList($$$$$) {
last;
}
}
+ $ind, $level;
}
sub init_db {
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index b4996d093..408f31c36 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -1,48 +1,51 @@
-package beginner server developer
-adjtimex 0 100 95
+ beginner server developer
+
+packages
+
+adjtimex 0 99 95
AfterStep 42 0 0
afterstep-apps 0 0 0
aktion 85 0 15
am-utils 0 0 0
anacron 70 0 98
-anonftp 50 100 0
+anonftp 50 99 0
AnotherLevel 80 0 0
-apache 0 100 25
+apache 0 99 25
apache-devel 37 0 25
-apmd 50 100 25
+apmd 50 99 25
arpwatch 0 0 0
-ash 70 100 100
-at 37 100 98
+ash 70 99 99
+at 37 99 98
audiofile 50 0 26
audiofile-devel 50 0 26
aumix 90 0 2
-authconfig 50 100 50
+authconfig 50 99 50
autoconf 10 0 98
autofs 0 0 50
automake 10 0 98
awesfx 90 0 0
-basesystem 95 100 100
-bash 95 100 99
+basesystem 95 99 99
+bash 95 99 99
bash1 0 0 0
bash-doc 0 0 75
bc 20 0 25
-bdflush 99 100 0
-bdflush-lowmem 0 100 0
-BeroFTPD 0 100 10
-BeroList 0 100 0
-BeroList-CGI 0 100 0
+bdflush 99 99 0
+bdflush-lowmem 0 99 0
+BeroFTPD 0 99 10
+BeroList 0 99 0
+BeroList-CGI 0 99 0
bin86 40 0 97
-bind 0 100 0
+bind 0 99 0
bind-devel 0 0 0
-bind-utils 35 100 0
+bind-utils 35 99 0
binutils 50 0 95
bison 10 0 90
BitchX 0 0 0
blt 0 0 85
bootparamd 0 0 0
byacc 50 0 90
-bzip2 68 100 85
-caching-nameserver 0 100 0
+bzip2 68 99 85
+caching-nameserver 0 99 0
cbb 15 0 0
cdecl 10 0 70
cdp 90 0 0
@@ -55,30 +58,30 @@ chkconfig 22 0 10
chkfontpath 44 0 50
chos 0 0 0
chos-chos 0 0 0
-cleanfeed 0 100 0
+cleanfeed 0 99 0
colorgcc 0 0 99
comanche 0 80 0
compat-glibc 0 0 99
comstat 0 0 0
-console-tools 40 100 99
+console-tools 40 99 99
control-center 78 0 10
control-center-devel 25 0 10
control-panel 91 0 0
-cpio 80 100 97
+cpio 80 99 97
cpp 50 0 98
cproto 50 0 90
-cracklib 50 100 35
-cracklib-dicts 50 100 35
+cracklib 50 99 35
+cracklib-dicts 50 99 35
crontabs 75 98 98
ctags 50 0 90
-cvs 50 100 80
+cvs 50 99 80
cxhextris 0 0 0
defrag 0 0 0
desktop-backgrounds 90 0 0
-desktopcfg 100 0 0
-dev 99 100 100
-dhcp 0 100 0
-dhcpcd 0 100 0
+desktopcfg 99 0 0
+dev 99 99 99
+dhcp 0 99 0
+dhcpcd 0 99 0
dialog 20 0 75
diffstat 0 0 95
diffutils 50 0 95
@@ -87,14 +90,14 @@ dosemu 0 0 0
dosemu-freedos 0 0 0
dosfstools 0 0 0
dump 0 0 95
-e2fsprogs 80 100 99
+e2fsprogs 80 99 99
e2fsprogs-devel 0 0 25
econf 0 0 0
ed 40 0 5
ee 82 0 0
-efax 0 100 0
+efax 0 99 0
eject 80 0 0
-ElectricFence 0 0 100
+ElectricFence 0 0 99
elm 30 0 0
emacs 40 0 85
emacs-el 0 0 50
@@ -106,7 +109,7 @@ enlightenment-conf 75 0 0
enscript 0 0 75
esound 79 0 0
esound-devel 25 0 0
-etcskel 95 100 0
+etcskel 95 99 0
ethemes 0 0 0
exmh 50 0 0
expect 0 0 75
@@ -116,19 +119,19 @@ face-xface 0 0 0
faq 75 0 0
fbset 0 0 0
fdutils 0 0 0
-fetchmail 25 100 0
+fetchmail 25 99 0
fetchmailconf 0 0 0
file 50 0 98
-filesystem 95 100 99
-fileutils 75 100 99
-findutils 75 100 95
+filesystem 95 99 99
+fileutils 75 99 99
+findutils 75 99 95
finger 50 0 0
flash 82 0 0
flex 50 0 80
fmirror 0 0 0
fnlib 75 0 0
fnlib-devel 25 0 0
-fortune-mod 95 100 0
+fortune-mod 95 99 0
freeciv 92 0 0
freetype 65 0 0
freetype-devel 0 0 0
@@ -139,7 +142,7 @@ fvwm2 40 0 0
fvwm2-icons 45 0 0
fwois 0 0 0
gaddr 56 0 0
-gated 0 100 0
+gated 0 99 0
gatos 65 0 0
gawk 50 0 95
gcc-fr 0 0 0
@@ -156,8 +159,8 @@ gettext 10 0 75
getty_ps 60 0 0
gfcc 0 0 0
gftp 75 0 0
-ghostscript 55 100 85
-ghostscript-fonts 0 100 85
+ghostscript 55 99 85
+ghostscript-fonts 0 99 85
giftrans 0 0 75
gimp 80 0 50
gimp-data-extras 50 0 0
@@ -166,9 +169,9 @@ gimp-libgimp 60 0 50
gimp-manual 0 0 25
git 70 0 0
glade 0 0 70
-glib 45 0 100
-glib10 45 0 100
-glibc 75 100 100
+glib 45 0 99
+glib10 45 0 99
+glibc 75 99 99
glibc-devel 40 0 99
glibc-localedata 45 0 98
glibc-profile 0 0 98
@@ -229,8 +232,8 @@ guile 0 0 85
guile-devel 0 0 85
gv 65 0 0
GXedit 0 0 60
-gzip 70 100 98
-hdparm 75 100 100
+gzip 70 99 98
+hdparm 75 99 99
helptool 75 0 0
hexedit 0 0 95
howot-croatian 0 0 0
@@ -258,25 +261,25 @@ icewm 80 0 0
icewm-themes 62 0 0
ImageMagick 0 0 65
ImageMagick-devel 0 0 65
-imap 0 100 0
+imap 0 99 0
imblib-cfgeditor 0 0 75
imlib 50 0 75
imlib-devel 25 0 50
imwheel 85 0 0
indent 40 0 97
-indexhtml 100 100 100
+indexhtml 99 99 99
inews 0 0 0
info 95 0 0
-initscripts 100 100 100
-inn 0 100 20
-inn-devel 0 100 20
+initscripts 99 99 99
+inn 0 99 20
+inn-devel 0 99 20
install-guide 0 0 0
-interconfig 0 100 100
-intimed 0 100 0
-ipchains 0 100 0
-ipxutils 0 100 0
+interconfig 0 99 99
+intimed 0 99 0
+ipchains 0 99 0
+ipxutils 0 99 0
irssi 79 0 0
-isapnptools 91 100 100
+isapnptools 91 99 99
isdn4k-utils 0 0 0
isicom 0 0 0
ispell 30 0 0
@@ -290,14 +293,14 @@ joe 0 0 0
kaffe 0 0 50
kapm 0 0 0
kbatmon 0 0 0
-kBeroFTPD 0 100 0
+kBeroFTPD 0 99 0
kblade 0 0 0
kblindsel 0 0 0
kcdwrite 0 0 0
kcmclock 0 0 0
kcmlaptop 1 0 0
kcpumon 0 0 0
-kdbconfig 100 100 100
+kdbconfig 99 99 99
kdbg 0 0 0
kdeadmin 70 0 0
kdebase 85 0 0
@@ -321,7 +324,7 @@ kdpms 78 0 0
keasycd 0 0 0
kencoder 0 0 0
kernekcfg 0 0 0
-kernel 99 100 100
+kernel 99 99 99
kernel-BOOT 0 0 0
kernel-doc 0 0 75
kernel-headers 0 0 99
@@ -391,8 +394,8 @@ ld.so 70 0 98
less 10 0 97
lftp 0 0 0
lha 0 0 80
-libc 30 100 85
-libelf 0 100 90
+libc 30 99 85
+libelf 0 99 90
libghttp 50 0 60
libghttp-devel 25 0 60
libglade 60 0 60
@@ -414,7 +417,7 @@ libpng-devel 25 0 75
libPropList 60 0 90
libstdc++ 50 0 90
libstdc++-devel 0 0 90
-libtermcap 50 100 95
+libtermcap 50 99 95
libtermcap-devel 0 0 95
libtiff 75 0 80
libtiff-devel 25 0 80
@@ -425,30 +428,30 @@ libungif-progs 0 0 0
libunicode 0 0 90
libxml 70 0 75
libxml-devel 0 0 75
-lilo 98 100 100
-linuxconf 80 0 100
+lilo 98 99 99
+linuxconf 80 0 99
linuxconf-devel 0 0 70
linux_logo 80 0 0
-logrotate 75 100 100
-losetup 11 100 100
+logrotate 75 99 99
+losetup 11 99 99
lout 0 0 10
lout-doc 0 0 10
lpg 75 0 90
-lpr 75 100 100
+lpr 75 99 99
lrzsz 0 0 0
lslk 0 0 0
lsof 0 0 0
-lynx 10 100 80
+lynx 10 99 80
m4 5 0 90
macutils 0 0 0
mailcap 50 0 0
-mailx 50 100 0
+mailx 50 99 0
make 10 0 98
-MAKEDEV 90 100 100
+MAKEDEV 90 99 99
man 93 0 90
mandrake_desk 97 0 0
mandrake_doc 95 0 0
-mandrake-release 75 100 100
+mandrake-release 75 99 99
MandrakeUpdate 85 0 0
man-pages 75 0 80
man-pages-cs 0 0 0
@@ -464,11 +467,11 @@ mars-nwe 0 0 0
mawk 0 0 90
maxwell 34 0 0
mc 35 0 0
-mcserv 0 100 0
+mcserv 0 99 0
Mesa 0 0 70
Mesa-demos 0 0 60
Mesa-devel 0 0 70
-metamail 50 100 50
+metamail 50 99 50
mgetty 10 0 0
mgetty-sendfax 10 0 0
mgetty-viewfax 10 0 0
@@ -477,19 +480,19 @@ mikmod 80 0 0
mingetty 24 0 0
minicom 0 0 0
minigetty 0 0 0
-mirrordir 0 100 0
+mirrordir 0 99 0
mkbootdisk 66 0 0
mkdosfs-ygg 0 0 0
mkinitrd 50 0 0
mkisofs 0 0 0
mkkickstart 0 0 0
mktemp 50 0 95
-mkxauth 70 100 0
+mkxauth 70 99 0
modemtool 75 0 0
-mod_perl 0 100 0
-mod_php3 0 100 0
+mod_perl 0 99 0
+mod_php3 0 99 0
modutils 75 0 99
-mount 50 100 99
+mount 50 99 99
mouseconfig 85 0 0
mpage 50 0 90
mpg123 95 0 0
@@ -503,16 +506,16 @@ mysql-share 0 0 0
nag 0 0 25
nc 0 0 0
ncftp 75 0 0
-ncompress 70 100 97
+ncompress 70 99 97
ncpfs 0 0 0
ncurses 75 0 90
ncurses-devel 25 0 90
netcfg 75 0 0
-netkit-base 80 100 80
+netkit-base 80 99 80
netscape-common 90 0 0
netscape-communicator 95 0 0
netscape-navigator 0 0 0
-net-tools 50 100 90
+net-tools 50 99 90
newt 60 0 85
newt-devel 25 0 85
nmh 50 0 0
@@ -524,22 +527,22 @@ ORBit 0 0 60
ORBit-devel 0 0 60
p2c 0 0 75
p2c-devel 0 0 60
-pam 45 100 97
-passwd 70 100 98
+pam 45 99 97
+passwd 70 99 98
patch 80 0 80
pciutils 0 0 0
pdksh 0 0 0
-perl 60 100 90
+perl 60 99 90
perlfitlib 0 0 0
perl-GTK 0 0 80
-perl-MD5 0 100 85
+perl-MD5 0 99 85
perl-Parse-RecDescent 0 0 85
perl-PDL 0 0 85
pgcc 60 0 95
pgcc-c++ 60 0 93
pgcc-g77 0 0 85
pgcc-objc 60 0 85
-pidentd 0 100 95
+pidentd 0 99 95
pilot-link 25 0 0
pilot-link-devel 25 0 0
pine 60 0 0
@@ -548,17 +551,17 @@ playmidi-X11 0 0 0
pmake 10 0 85
pmake-custom 0 0 80
popt 50 0 90
-portmap 32 100 0
+portmap 32 99 0
postfix 0 0 0
-postgresql 0 100 0
+postgresql 0 99 0
postgresql-clients 0 0 0
-postgresql-devel 0 100 0
-postgresql-server 0 100 0
+postgresql-devel 0 99 0
+postgresql-server 0 99 0
postgresql-tcl 0 0 0
ppp 0 0 0
printtool 0 0 0
procinfo 0 0 99
-procmail 35 100 0
+procmail 35 99 0
procps 75 0 0
procps-X11 0 0 0
psacct 0 0 95
@@ -576,55 +579,55 @@ qt-devel 25 0 60
qt-qgl 0 0 50
qt-qimgio 21 0 50
qt-qxt 0 0 50
-quota 75 100 0
-raidtools 0 100 0
+quota 75 99 0
+raidtools 0 99 0
rcs 40 0 75
-rdate 10 100 0
-rdist 10 100 0
+rdate 10 99 0
+rdist 10 99 0
readline 50 0 70
recode 0 0 80
rgrep 0 0 85
rhl-install-guide-en 0 0 0
rhmask 0 0 0
rhsound 50 0 0
-rhs-printfilters 0 100 0
+rhs-printfilters 0 99 0
rmt 37 0 0
-rootfiles 75 100 0
-routed 50 100 0
-rpm 90 100 98
+rootfiles 75 99 0
+routed 50 99 0
+rpm 90 99 98
rpm-devel 25 0 90
-rsh 75 100 85
-rsync 0 100 85
+rsh 75 99 85
+rsync 0 99 85
rusers 50 0 0
rwall 0 0 0
rwho 50 0 0
-rxvt 09 0 100
+rxvt 09 0 99
sag 65 0 25
sahsh 0 0 0
-samba 0 100 0
+samba 0 99 0
sane 75 0 0
sane-devel 0 0 0
screen 0 0 0
sed 5 0 98
-sendmail 0 100 0
-sendmail.cf 0 100 0
+sendmail 0 99 0
+sendmail.cf 0 99 0
sendmail-doc 0 0 0
setconsole 58 0 0
setserial 80 0 0
setup 80 0 0
setuptoll 0 0 0
sgml-tools 0 0 85
-shadow-utils 0 100 0
+shadow-utils 0 99 0
shapecfg 0 0 0
-sharutils 75 100 0
-sh-utils 85 100 98
+sharutils 75 99 0
+sh-utils 85 99 98
slang 50 0 85
slang-devel 25 0 70
sliplogin 0 0 0
-slocate 75 100 90
+slocate 75 99 90
slrn 75 0 0
sndconfig 40 0 0
-sox 82 100 90
+sox 82 99 90
sox-devel 0 0 70
space_sounds 65 0 0
specspo 0 0 0
@@ -641,26 +644,26 @@ switchdesk-kde 85 0 0
sxitchdesk 0 0 0
symlinks 0 0 0
sysklogd 50 0 0
-SysVinit 99 100 100
+SysVinit 99 99 99
t1lib-devel 0 0 96
talk 75 0 0
taper 0 0 0
-tar 90 100 98
+tar 90 99 98
tcl 60 0 70
tclx 60 0 70
tcpdump 0 85 0
-tcp_wrappers 50 100 0
+tcp_wrappers 50 99 0
tcsh 70 0 0
-telnet 80 100 95
-telnet-server 80 100 0
-termcap 75 100 98
+telnet 80 99 95
+telnet-server 80 99 0
+termcap 75 99 98
tetex 15 0 50
tetex-afm 15 0 40
tetex-dvilj 15 0 40
tetex-dvips 15 0 40
tetex-latex 15 0 40
texinfo 0 0 50
-textutils 50 100 90
+textutils 50 99 90
text-xdvi 0 0 50
tftp 35 0 0
thud 0 0 0
@@ -675,8 +678,8 @@ tix 60 0 65
tk 60 0 65
tkinter 60 0 65
tksysv 75 0 65
-tmpwatch 46 100 0
-traceroute 20 100 0
+tmpwatch 46 99 0
+traceroute 20 99 0
transfig 0 0 0
tree 0 0 0
trn 65 0 0
@@ -689,21 +692,21 @@ ucd-snmp-utils 0 0 85
umb-scheme 0 0 85
unarj 0 0 0
unit 0 0 0
-unzip 90 100 97
+unzip 90 99 97
urlview 0 0 0
urw-fonts 48 0 0
usermode 80 0 0
usernet 70 0 0
utemper 0 0 0
-util-linux 90 100 98
-uucp 0 100 0
+util-linux 90 99 98
+uucp 0 99 0
vigmeup 0 0 0
-vim-common 5 100 0
+vim-common 5 99 0
vim-enhanced 0 0 0
-vim-minimal 5 100 0
+vim-minimal 5 99 0
vim-X11 0 0 0
-vixie-cron 75 100 99
-vlock 0 100 90
+vixie-cron 75 99 99
+vlock 0 99 90
vnc 0 0 0
vnc-java 0 0 0
vnc-server 0 0 0
@@ -711,7 +714,7 @@ vnc-SVGALIB 0 0 0
w3c-libwww 0 0 0
w3c-libwww-apps 0 0 0
w3c-libwww-devel 0 0 0
-wget 75 100 0
+wget 75 99 0
which 75 0 99
WindowMaker 85 0 0
wine 0 0 0
@@ -721,7 +724,7 @@ wmconfig 75 0 0
wmnet 20 0 0
WMRack 0 0 0
words 60 0 0
-wu-ftpd 0 100 0
+wu-ftpd 0 99 0
X11R6-contrib 75 0 75
x3270 0 0 0
xanim 75 0 0
@@ -816,3 +819,225 @@ zip 90 0 95
zlib 75 0 98
zlib-devel 25 0 80
zsh 35 0 80
+
+categories
+
+administration:rpm:console 90 90 90
+administration:rpm:x11 90 00 90
+administration:system:console 00 00 90
+administration:system:x11 00 00 90
+administration:utilities:console 90 90 90
+administration:utilities:x11 90 00 90
+amusement:console 00 00 90
+amusement:x11 90 00 90
+archiving:console 00 90 90
+archiving:x11 90 00 90
+base 00 00 90
+cd-burning:console 00 00 90
+cd-burning:x11 00 00 90
+communications:fax:console 00 90 90
+communications:fax:x11 90 00 90
+communications:modem:console 90 90 90
+communications:modem:x11 90 90 90
+communications:pilot:console 00 90 90
+communications:pilot:x11 90 00 90
+compression:console 10 20 30
+compression:x11 40 50 60
+configuration:identification:console 70 80 90
+configuration:identification:x11 90 01 10
+configuration:libs:console 20 20 30
+configuration:libs:x11 40 50 60
+configuration:network:firewall:console 70 80 90
+configuration:network:firewall:x11 00 10 20
+configuration:network:ftp:console 30 40 50
+configuration:network:ftp:x11 60 70 80
+configuration:network:http:console 90 10 10
+configuration:network:http:x11 20 30 40
+configuration:network:mail:console 50 60 70
+configuration:network:mail:x11 80 90 10
+configuration:power:console 10 30 30
+configuration:power:x11 40 60 60
+configuration:time:console 70 90 90
+configuration:time:x11 00 10 20
+configuration:sound:console 30 40 50
+configuration:sound:x11 60 70 80
+configuration:system:console 90 10 10
+configuration:system:x11 20 30 40
+configuration:xfree:console 50 60 70
+configuration:xfree:x11 80 90 10
+daemons:administartion 00 30 10
+daemons:console 00 00 30
+daemons:database 00 00 80
+daemons:disk 00 00 40
+daemons:kernel 00 00 30
+daemons:network:base 00 00 90
+daemons:network:corba 00 00 70
+daemons:network:dhcp 00 00 60
+daemons:network:ftp 00 00 60
+daemons:network:http 00 00 60
+daemons:network:mail 00 00 10
+daemons:network:midnight_commander 00 00 30
+daemons:network:name_server 00 00 20
+daemons:network:netware 00 00 50
+daemons:network:nfs 00 00 50
+daemons:network:nis 00 00 10
+daemons:network:routing 00 00 60
+daemons:network:samba 00 00 10
+daemons:network:snmp 00 00 50
+daemons:network:slip 00 00 00
+daemons:network:telnet 00 00 00
+daemons:network:uucp 00 00 00
+daemons:network:usenet 00 00 00
+daemons:network:vnc 00 00 00
+daemons:power 00 00 00
+daemons:print 00 00 00
+daemons:security 00 00 00
+daemons:sound 00 00 00
+daemons:time 00 00 00
+daemons:xfree86 00 00 00
+database:console 10 80 00
+database:x11 60 00 00
+developpment:debuggers 00 00 90
+developpment:libs:cdrecord 00 00 90
+developpment:libs:database 00 00 90
+developpment:libs:gnome 00 00 90
+developpment:libs:graphics 00 00 90
+developpment:libs:gtk 00 00 90
+developpment:libs:gtk 00 00 90
+developpment:libs:filesystems 00 00 90
+developpment:libs:kde 00 00 90
+developpment:libs:misc 00 00 90
+developpment:libs:network 00 00 90
+developpment:libs:qt 00 00 90
+developpment:libs:sound 00 00 90
+developpment:libs:user-interface 00 00 90
+developpment:language 00 00 90
+developpment:tools:console 00 00 90
+developpment:tools:x11 00 00 90
+disks 00 50 70
+documentation:languages:chinese 90 90 90
+documentation:languages:croatian 90 90 90
+documentation:languages:czech 90 90 90
+documentation:languages:en 90 90 90
+documentation:languages:french 90 90 90
+documentation:languages:german 90 90 90
+documentation:languages:greek 90 90 90
+documentation:languages:indonesian 90 90 90
+documentation:languages:italian 90 90 90
+documentation:languages:japanese 90 90 90
+documentation:languages:korean 90 90 90
+documentation:languages:polish 90 90 90
+documentation:languages:russian 90 90 90
+documentation:languages:serbian 90 90 90
+documentation:languages:turkish 90 90 90
+documentation:misc 90 90 90
+documentation:tools:console 70 80 80
+documentation:tools:x11 90 10 50
+editors:console 30 80 80
+editors:x11 80 10 80
+emulators:console 50 10 50
+emulators:x11 80 10 50
+filemanagers:console 40 80 80
+filemanagers:x11 70 00 70
+files 00 50 10
+finances:console 00 00 10
+finances:x11 50 10 50
+games:console 40 10 40
+games:x11 60 10 60
+gnome 80 10 40
+identification:console 10 50 20
+identification:x11 10 40 30
+info:console 40 90 90
+info:x11 60 20 90
+kde 90 10 90
+kernel 00 50 90
+kernel:tools:console 10 50 90
+kernel:tools:x11 20 50 90
+libs:application 00 10 90
+libs:compression 00 10 90
+libs:database 00 10 90
+libs:fonts:console 00 10 90
+libs:fonts:x11 00 10 90
+libs:gnome 00 10 90
+libs:graphics 00 10 90
+libs:gtk 00 10 90
+libs:kde 00 10 90
+libs:math 00 10 90
+libs:misc:console 00 10 90
+libs:misc:x11 00 10 90
+libs:network 00 10 90
+libs:qt 00 10 90
+libs:sound 00 10 90
+libs:user_interface 00 10 90
+misc:console 50 80 80
+misc:x11 50 80 80
+monitoring:cpu:console 30 90 90
+monitoring:cpu:x11 50 80 90
+monitoring:disks:console 30 90 90
+monitoring:disks:x11 50 80 90
+monitoring:misc:console 30 90 90
+monitoring:misc:x11 50 80 90
+monitoring:memory:console 30 90 90
+monitoring:memory:x11 50 80 90
+monitoring:network:console 30 90 90
+monitoring:network:x11 50 80 90
+monitoring:power:console 30 90 90
+monitoring:power:x11 50 80 90
+multimedia:graphic:acquisition:console 70 20 70
+multimedia:graphic:acquisition:x11 80 10 80
+multimedia:graphic:console 70 20 70
+multimedia:graphic:image-viewer 90 10 80
+multimedia:graphic:x11 90 10 80
+multimedia:sound:players:console 80 10 70
+multimedia:sound:players:x11 90 10 70
+multimedia:sounds 90 10 60
+multimedia:video:console 80 10 60
+multimedia:video:x11 90 10 60
+network:ftp:console 70 60 70
+network:ftp:x11 80 10 70
+network:irc&co:console 80 60 70
+network:irc&co:x11 80 10 70
+network:mail:console 60 90 80
+network:mail:x11 70 10 80
+network:misc:console 50 90 80
+network:misc:x11 60 10 80
+network:netware:console 30 90 80
+network:netware:x11 40 10 80
+network:nfs:console 30 90 80
+network:nfs:x11 40 10 80
+network:nis:console 30 90 80
+network:nis:x11 40 10 80
+network:tools:console 30 90 80
+network:tools:x11 40 10 80
+network:usenet:console 40 90 80
+network:usenet:x11 80 10 80
+network:web:console 10 90 80
+network:web:x11 90 10 90
+productivity:console 60 50 50
+productivity:x11 90 00 80
+science:chemistry:console 50 00 80
+science:chemistry:x11 80 00 80
+science:math:console 20 00 80
+science:math:x11 80 00 80
+science:meteo:console 70 00 80
+science:meteo:x11 80 00 80
+shells 00 90 90
+terminal:console 50 90 90
+terminal:x11 70 10 80
+text:console 40 90 90
+text:x11 80 90 90
+time:console 80 90 90
+time:x11 90 10 90
+translations 90 90 90
+updates:console 00 90 90
+updates:x11 90 00 90
+utilities:console:files 20 90 90
+utilities:console:kernel 00 80 90
+utilities:console:misc 50 80 80
+utilities:x11:misc 80 00 80
+window-managers:backgrounds 90 00 90
+window-managers:configuration 90 00 90
+window-managers:themes 90 00 90
+window-managers:window-managers 90 00 90
+xfree86:base 00 00 00
+xfree86:fonts 00 00 00
diff --git a/perl-install/share/install.rc b/perl-install/share/install.rc
index 6c4a6c0d6..68a02053c 100644
--- a/perl-install/share/install.rc
+++ b/perl-install/share/install.rc
@@ -1,7 +1,6 @@
style "default-font"
{
fontset = "\
--*-arial-medium-r-normal-*-*-100-*-*-*-*-*-*,\
-*-helvetica-medium-r-normal-*-*-100-*-*-*-*-*-*,\
-cronyx-helvetica-medium-r-normal-*-*-110-*-*-*-*-*-*,\
-*-tahoma-medium-r-normal-*-*-*-*-*-*-*-*-*,\
@@ -24,7 +23,6 @@ style "steps"
fg[NORMAL] = { 1.0, 1.0, 1.0 }
fontset = "\
--*-arial-medium-r-normal-*-*-80-*-*-*-*-*-*,\
-*-helvetica-medium-r-normal-*-*-80-*-*-*-*-*-*,\
-cronyx-helvetica-medium-r-normal-*-*-110-*-*-*-*-*-*,\
-*-tahoma-medium-r-normal-*-*-*-*-*-*-*-*-*,\
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index 2d0aa6db6..ad4f9486b 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -9,7 +9,7 @@ clean:
$(POFILES): panoramix.pot
cp -f $@ $@t
- msgmerge $@t $< > $@ || true
+ msgmerge $@t $< > $@
rm $@t
panoramix.pot: $(PMSFILES)
@@ -18,5 +18,5 @@ panoramix.pot: $(PMSFILES)
rm $(PMSCFILES)
$(PMSCFILES): %_.c: %
- perl -pe 's|#(.*)|/*\1*\/|; s|$$|\\n\\|' $< > $@
+ perl -pe 's|^(__?\()| $$1|; s|#(.*)|/*\1*\/|; s|$$|\\n\\|' $< > $@
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-18 20:42:03 +0000