diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-01-29 09:09:55 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-01-29 09:09:55 +0000 |
| commit | 8c2c7f8786ec0409de52d8ecba0cc5e79d7cb384 (patch) | |
| tree | b34d3b7c361182f1cb5c35caa9a98b386a7cc66b | |
| parent | 33e59650fe44d4678273e68e89a981d88afdbcc6 (diff) | |
| download | drakx-8c2c7f8786ec0409de52d8ecba0cc5e79d7cb384.tar drakx-8c2c7f8786ec0409de52d8ecba0cc5e79d7cb384.tar.gz drakx-8c2c7f8786ec0409de52d8ecba0cc5e79d7cb384.tar.bz2 drakx-8c2c7f8786ec0409de52d8ecba0cc5e79d7cb384.tar.xz drakx-8c2c7f8786ec0409de52d8ecba0cc5e79d7cb384.zip | |
- revert to using xmodmap instead of xkb (workaround bug #35912)
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/share/keyboards.tar.bz2 | bin | 0 -> 31960 bytes | |||
| -rw-r--r-- | perl-install/install/share/list.xml | 5 |
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 85542ddc7..00cb30ca7 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- revert to using xmodmap instead of xkb (workaround bug #35912) - handle new drivers: o ethernet: cpmac o gigabit: ipg diff --git a/perl-install/install/share/keyboards.tar.bz2 b/perl-install/install/share/keyboards.tar.bz2 Binary files differnew file mode 100644 index 000000000..c9765dc60 --- /dev/null +++ b/perl-install/install/share/keyboards.tar.bz2 diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml index 16b975c50..5e25c8306 100644 --- a/perl-install/install/share/list.xml +++ b/perl-install/install/share/list.xml @@ -37,7 +37,7 @@ setfont kbd_mode Xorg xset - xkbcomp setxkbmap + xmodmap <!-- should be "xkbcomp setxkbmap", but can't be because of #35912 --> fb2png perl @@ -75,6 +75,7 @@ libshadow.so </from> +<!-- <from dir="/usr/share/X11/xkb"> <filter subst="s!//.*!!"> geometry/pc @@ -88,6 +89,7 @@ </from> </filter> </from> +--> <from dir="/usr/share/fonts/"> <to flatten="on"> @@ -400,6 +402,7 @@ <from dir="share"> <from expand="tar"> fonts.tar.bz2 + keyboards.tar.bz2 keymaps.tar.bz2 </from> |