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, 2 insertions, 2 deletions

diff --git a/lib/Xconfig/resolution_and_depth.pm b/lib/Xconfig/resolution_and_depth.pm
index 6e4e0f0..3c84dc7 100644
--- a/lib/Xconfig/resolution_and_depth.pm
+++ b/lib/Xconfig/resolution_and_depth.pm
@@ -1,4 +1,4 @@
-package Xconfig::resolution_and_depth; # $Id$
+package Xconfig::resolution_and_depth; # $Id: resolution_and_depth.pm 250289 2008-12-08 09:59:02Z pixel $
 
 use diagnostics;
 use strict;
@@ -310,7 +310,7 @@ sub set_default_background {
     my @wanted = grep { $best->[0] == $_->{X} && $best->[1] == $_->{Y} } @l;
 
     if (-e "$dir/$theme{THEME}.xml") {
-	symlinkf "$theme{THEME}.xml", "$dir/Mandriva.xml";
+	symlinkf "$theme{THEME}.xml", "$dir/Mageia.xml";
     }
     
     foreach (@wanted) {