summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/Makefile.drakxtools30
-rw-r--r--perl-install/c/stuff.xs.pm4
-rw-r--r--perl-install/install2.pm9
-rw-r--r--perl-install/install_steps_interactive.pm3
-rw-r--r--perl-install/interactive_newt.pm4
-rw-r--r--perl-install/pkgs.pm2
-rw-r--r--perl-install/share/compssList54
7 files changed, 92 insertions, 14 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
new file mode 100644
index 000000000..5e4eff121
--- /dev/null
+++ b/perl-install/Makefile.drakxtools
@@ -0,0 +1,30 @@
+DIRS = ddcprobe po Newt c pci_probing resize_fat
+PREFIX =
+SBINDEST = $(PREFIX)/usr/sbin
+ETCDEST = $(PREFIX)/etc/gtk
+BINDEST = $(PREFIX)/usr/bin
+LIBDEST = $(PREFIX)/usr/lib/libDrakX
+X11DEST = $(PREFIX)/usr/X11R6/lib/X11
+
+.PHONY: $(DIRS)
+
+all: $(DIRS)
+
+$(DIRS):
+ install -d auto
+ $(MAKE) -C $@
+
+install:
+ install -d $(BINDEST) $(ETCDEST) $(SBINDEST) $(LIBDEST) $(X11DEST) $(DIRS:%=$(LIBDEST)/%)
+ install diskdrake XFdrake ddcprobe/ddcxinfos $(SBINDEST)
+
+ for i in *.pm ; do perl -pe '$$_ = "\n" if /\s*use\s+(diagnostics|vars|strict)/' $$i > $(LIBDEST)/$$i ; done
+ install -m 644 MonitorsDB $(X11DEST)
+ install -m 644 diskdrake.rc $(ETCDEST)
+ install -m 644 po/*.po $(LIBDEST)/po
+ install -m 644 $(patsubst %,Newt/%.pm,Newt) $(LIBDEST)/Newt
+ install -m 644 $(patsubst %,c/%.pm,stuff) $(LIBDEST)/c
+ install -m 644 $(patsubst %,pci_probing/%.pm,main pcitable pci_class) $(LIBDEST)/pci_probing
+ install -m 644 $(patsubst %,resize_fat/%.pm,main any boot_sector c_rewritten dir_entry directory fat info_sector io) $(LIBDEST)/resize_fat
+ cp -rf auto $(LIBDEST)
+
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index 784afa807..94610be77 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -576,6 +576,10 @@ headerRead(fd, magicp)
OUTPUT:
RETVAL
+void
+headerFree(header)
+ void *header
+
char *
headerGetEntry_string(h, query)
void *h
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 980277321..609a2b720 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -227,14 +227,7 @@ sub selectMouse {
add2hash($o->{mouse} ||= {}, { mouse::read($o->{prefix}) }) if $o->{isUpgrade} && !$clicked;
$o->selectMouse($clicked);
- addToBeDone {
- mouse::write($o->{prefix}, $o->{mouse});
- my $t = "modprobe usbmouse\n";
- substInFile {
- s/$t//;
- $_ .= $t if eof;
- } "$o->{prefix}/etc/rc.d/rc.local" if $o->{mouse}{FULLNAME} =~ /USB/i;
- } 'doInstallStep';
+ addToBeDone { mouse::write($o->{prefix}, $o->{mouse}) } 'doInstallStep';
}
#------------------------------------------------------------------------------
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 1e50b75a3..f6b5a9f9e 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -138,8 +138,7 @@ sub selectMouse {
$name = $o->ask_from_list_('', _("What is the type of your mouse?"), [ mouse::names() ], $name);
$o->{mouse} = mouse::name2mouse($name);
}
- my $b = $o->{mouse}{nbuttons} < 3;
- $o->{mouse}{XEMU3} = 'yes' if $::expert && $o->ask_yesorno('', _("Emulate third button?"), $b) || $b;
+ $o->{mouse}{XEMU3} = 'yes' if $o->{mouse}{nbuttons} < 3 && (!$::expert || $o->ask_yesorno('', _("Emulate third button?"), 1));
$o->{mouse}{device} = mouse::serial_ports_names2dev(
$o->ask_from_list(_("Mouse Port"),
diff --git a/perl-install/interactive_newt.pm b/perl-install/interactive_newt.pm
index 3325dfb28..729453c60 100644
--- a/perl-install/interactive_newt.pm
+++ b/perl-install/interactive_newt.pm
@@ -23,7 +23,7 @@ sub new() {
bless {}, $_[0];
}
-sub end { Newt::Finished }
+sub end() { Newt::Finished }
END { end() }
sub myTextbox {
@@ -62,7 +62,7 @@ sub ask_from_listW {
}
my $i; map_index { $i = $::i if $def eq $_ } @$l;
my ($r, $e) = Newt::WinMenu($title, $mesg, 40, 5, 5, 8, $l, $i, @okcancel);
- return if $r > 1;
+ $r > 1 and die "ask_from_list cancel";
if ($special) {
$r ? $okcancel[0] : $l->[$e];
} else {
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index ac8717f42..3800e3979 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -18,7 +18,7 @@ XFree86-P9000 XFree86-S3 XFree86-S3V XFree86-SVGA XFree86-W32 XFree86-I128
XFree86-Sun XFree86-SunMono XFree86-Sun24 XFree86-3DLabs kernel-BOOT
MySQL MySQL_GPL mod_php3 midgard postfix metroess metrotmpl
hackkernel hackkernel-BOOT hackkernel-fb hackkernel-headers
-hackkernel-pcmcia-cs hackkernel-smp hackkernel-smp-fb autoirpm
+hackkernel-pcmcia-cs hackkernel-smp hackkernel-smp-fb autoirpm autoirpm-icons
);
my @preferred = qw(
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 7b4a67e52..70677a13a 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -22,7 +22,7 @@ aumix 15 0 2
authconfig 90 99 90
autoconf 5 0 94
autofs 22 0 50
-autoirpm-icons 85 0 70
+autoirpm-icons 85 0 80
automake 5 0 94
awesfx 15 0 13
bash1 15 0 13
@@ -83,6 +83,7 @@ dip 15 0 13
dosemu 55 0 49
dosemu-freedos 55 0 49
dosfstools 25 0 22
+drakxtools 89 0 83
dump 9 0 87
e2fsprogs-devel 1 0 25
ed 45 0 5
@@ -379,6 +380,57 @@ libxml-devel 3 0 71
linuxconf 82 0 96
linuxconf-devel 1 0 70
linux_logo 1 0 0
+locales 96 96 96
+locales-ar 22 22 22
+locales-bg 22 22 22
+locales-br 22 22 22
+locales-ca 22 22 22
+locales-cs 22 22 22
+locales-cy 22 22 22
+locales-da 22 22 22
+locales-de 22 22 22
+locales-el 22 22 22
+locales-en 22 22 22
+locales-eo 22 22 22
+locales-es 22 22 22
+locales-et 22 22 22
+locales-eu 22 22 22
+locales-fi 22 22 22
+locales-fo 22 22 22
+locales-fr 22 22 22
+locales-ga 22 22 22
+locales-gl 22 22 22
+locales-he 22 22 22
+locales-hr 22 22 22
+locales-hu 22 22 22
+locales-hy 22 22 22
+locales-id 22 22 22
+locales-is 22 22 22
+locales-it 22 22 22
+locales-ja 22 22 22
+locales-ka 22 22 22
+locales-kl 22 22 22
+locales-ko 22 22 22
+locales-lo 22 22 22
+locales-lt 22 22 22
+locales-lv 22 22 22
+locales-nl 22 22 22
+locales-no 22 22 22
+locales-oc 22 22 22
+locales-pl 22 22 22
+locales-pt 22 22 22
+locales-ro 22 22 22
+locales-ru 22 22 22
+locales-sk 22 22 22
+locales-sl 22 22 22
+locales-sr 22 22 22
+locales-sv 22 22 22
+locales-th 22 22 22
+locales-tr 22 22 22
+locales-uk 22 22 22
+locales-vi 22 22 22
+locales-wa 22 22 22
+locales-zh 22 22 22
lout 15 0 10
lout-doc 15 0 10
lpg 60 0 80
generated by cgit v1.2.1 (git 2.21.0) at 2024-07-02 07:44:36 +0000