diff options
| -rw-r--r-- | perl-install/ChangeLog | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/keyboarddrake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 0fbb8689c..1bc4f944b 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,5 +1,7 @@ 2000-09-21 Pixel <pixel@mandrakesoft.com> + * standalone/keyboarddrake: fix for XF4 + * Xconfigurator.pm (write_XF86Config): comment the omit xfree86-dga diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake index 3f3c78750..ca22c38eb 100755 --- a/perl-install/standalone/keyboarddrake +++ b/perl-install/standalone/keyboarddrake @@ -36,7 +36,7 @@ my $f = "/etc/X11/XF86Config"; my $g = "/etc/X11/XF86Config-4"; substInFile { - if (/^Section "Keyboard"/ .. /^EndSection/) { + if (/^Section\s+"Keyboard"/ .. /^EndSection/) { s|^(\s*XkbLayout\s+).*|$1"$xkb"| and $_ .= join '', map { " $_\n" } @{$xkb_options{$xkb} || []}; s,^(\s*(XkbVariant|XkbOptions)\s+).*,,; # remove existing one @@ -44,7 +44,7 @@ substInFile { } $f if -e $f && !$::testing; substInFile { - if (/^Identifier "Keyboard1"/ .. /^EndSection/) { + if (/Identifier\s+"Keyboard1"/ .. /^EndSection/) { s|^(\s*Option\s+"XkbLayout"\s+).*|$1"$xkb"| and $_ .= join '', map { /(\S+)(.*)/; qq( Option "$1" $2\n) } @{$xkb_options{$xkb} || []}; s,^(\s*Option\s+"(XkbVariant|XkbOptions)"\s+).*,,; # remove existing one |