Synthesized commit during git-svn import combining previous Mandriva history with Magiea.

This commit consitsts of the following subversion commits:

------------------------------------------------------------------------
r391 | dmorgan | 2011-02-03 13:54:58 +0000 (Thu, 03 Feb 2011) | 1 line

Import cleaned drakx-kbd-mouse-x11
------------------------------------------------------------------------

In addition to the above commits, the following cleaning work has been recorded:

- License is GPLv2

- Problematic files:
 o lib/keyboard.pm: run_program::run('mandriva-setup-keyboard');  (does this need to be changed?) we keep it for now
 o lib/Xconfig/resolution_and_depth.pm: symlinkf "$theme{THEME}.xml", "$dir/Mandriva.xml"; (this will be changed, and should be synced with whatever will be does to the default Mageia wallpapers theme; this .xml file is used to change the wallpaper in GNOME/KDE depending on the time of the day)
=> switched to Mageia.xml

- Various icons that'll need to be changed in data/pixmaps: done with oxygen icons

1 files changed, 1 insertions, 4 deletions

diff --git a/lib/Xconfig/various.pm b/lib/Xconfig/various.pm
index 4a8ed22..59cf92b 100644
--- a/lib/Xconfig/various.pm
+++ b/lib/Xconfig/various.pm
@@ -1,4 +1,4 @@
-package Xconfig::various; # $Id$
+package Xconfig::various; # $Id: various.pm 269742 2010-06-02 09:25:35Z cfergeau $
 
 use diagnostics;
 use strict;
@@ -240,9 +240,6 @@ sub choose {
 	{ text => N("Disable Ctrl-Alt-Backspace"),
 	  type => 'bool', val => \$various->{DontZap} },
 	{ label => N("Graphic card options"), title => 1 },
-	  exists $various->{use_DRI_GLX} ?
-	{ text => N("3D hardware acceleration"),
-	  type => 'bool', val => \$various->{use_DRI_GLX} } : (),
 	{ text => N("Enable Translucency (Composite extension)"),
 	  type => 'bool', val => \$various->{Composite} },
 	  exists $various->{HWCursor} ?