summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-29 09:13:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-29 09:13:27 +0000
commit93768e3577249832a713f4716d219c3b776349ae (patch)
treef46a976f870f7faf6783f197ec9ccaabd0e8bce7
parent2f64a8615af3c812e8907731c08e3dd621a294ce (diff)
downloaddrakx-93768e3577249832a713f4716d219c3b776349ae.tar
drakx-93768e3577249832a713f4716d219c3b776349ae.tar.gz
drakx-93768e3577249832a713f4716d219c3b776349ae.tar.bz2
drakx-93768e3577249832a713f4716d219c3b776349ae.tar.xz
drakx-93768e3577249832a713f4716d219c3b776349ae.zip
oops, reverting again to xkb, since otherwise Ctrl-Alt-Fx doesn't work :-/
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/share/keyboards.tar.bz2bin31960 -> 0 bytes
-rw-r--r--perl-install/install/share/list.xml5
3 files changed, 1 insertions, 5 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 00cb30ca7..85542ddc7 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,3 @@
-- 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
deleted file mode 100644
index c9765dc60..000000000
--- a/perl-install/install/share/keyboards.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 5d4c01bba..e33c60f24 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -37,7 +37,7 @@
setfont kbd_mode
Xorg xset
- xmodmap <!-- should be "xkbcomp setxkbmap", but can't be because of #35912 -->
+ xkbcomp setxkbmap
fb2png
perl
@@ -75,7 +75,6 @@
libshadow.so
</from>
-<!--
<from dir="/usr/share/X11/xkb">
<filter subst="s!//.*!!">
geometry/pc
@@ -89,7 +88,6 @@
</from>
</filter>
</from>
--->
<from dir="/usr/share/fonts/">
<to flatten="on">
@@ -402,7 +400,6 @@
<from dir="share">
<from expand="tar">
fonts.tar.bz2
- keyboards.tar.bz2
keymaps.tar.bz2
</from>