From 93768e3577249832a713f4716d219c3b776349ae Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 29 Jan 2008 09:13:27 +0000
Subject: oops, reverting again to xkb, since otherwise Ctrl-Alt-Fx doesn't
 work :-/

---
 perl-install/install/NEWS                    |   1 -
 perl-install/install/share/keyboards.tar.bz2 | Bin 31960 -> 0 bytes
 perl-install/install/share/list.xml          |   5 +----
 3 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 perl-install/install/share/keyboards.tar.bz2

(limited to 'perl-install/install')

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
Binary files a/perl-install/install/share/keyboards.tar.bz2 and /dev/null 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>
 
-- 
cgit v1.2.1