From f77c8e8447276f649dba448cb87fd6f53fe1637e Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Thu, 3 Feb 2011 13:54:58 +0000 Subject: 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 --- lib/Xconfig/card.pm | 2 +- lib/Xconfig/default.pm | 2 +- lib/Xconfig/main.pm | 2 +- lib/Xconfig/monitor.pm | 2 +- lib/Xconfig/parse.pm | 2 +- lib/Xconfig/proprietary.pm | 5 +++-- lib/Xconfig/resolution_and_depth.pm | 4 ++-- lib/Xconfig/screen.pm | 2 +- lib/Xconfig/test.pm | 2 +- lib/Xconfig/various.pm | 5 +---- lib/Xconfig/xfree.pm | 4 ++-- 11 files changed, 15 insertions(+), 17 deletions(-) (limited to 'lib/Xconfig') diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm index 7a5b892..979de95 100644 --- a/lib/Xconfig/card.pm +++ b/lib/Xconfig/card.pm @@ -1,4 +1,4 @@ -package Xconfig::card; # $Id$ +package Xconfig::card; # $Id: card.pm 266355 2010-02-22 20:51:38Z pzanoni $ use diagnostics; use strict; diff --git a/lib/Xconfig/default.pm b/lib/Xconfig/default.pm index cc09660..f0826bc 100644 --- a/lib/Xconfig/default.pm +++ b/lib/Xconfig/default.pm @@ -1,4 +1,4 @@ -package Xconfig::default; # $Id$ +package Xconfig::default; # $Id: default.pm 266062 2010-02-09 18:55:05Z anssi $ use diagnostics; use strict; diff --git a/lib/Xconfig/main.pm b/lib/Xconfig/main.pm index f59ecd1..7400ed9 100644 --- a/lib/Xconfig/main.pm +++ b/lib/Xconfig/main.pm @@ -1,4 +1,4 @@ -package Xconfig::main; # $Id$ +package Xconfig::main; # $Id: main.pm 261482 2009-10-06 10:15:34Z cfergeau $ use diagnostics; use strict; diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm index 26251e0..d3f6688 100644 --- a/lib/Xconfig/monitor.pm +++ b/lib/Xconfig/monitor.pm @@ -1,4 +1,4 @@ -package Xconfig::monitor; #- $Id$ +package Xconfig::monitor; #- $Id: monitor.pm 261588 2009-10-08 17:02:40Z blino $ use diagnostics; use strict; diff --git a/lib/Xconfig/parse.pm b/lib/Xconfig/parse.pm index 9a5ff1c..ae1f87a 100644 --- a/lib/Xconfig/parse.pm +++ b/lib/Xconfig/parse.pm @@ -1,4 +1,4 @@ -package Xconfig::parse; # $Id$ +package Xconfig::parse; # $Id: parse.pm 247269 2008-10-01 13:57:30Z pixel $ use diagnostics; use strict; diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm index 34b1c4f..86b8a4d 100644 --- a/lib/Xconfig/proprietary.pm +++ b/lib/Xconfig/proprietary.pm @@ -1,4 +1,4 @@ -package Xconfig::proprietary; # $Id$ +package Xconfig::proprietary; # $Id: proprietary.pm 269741 2010-06-02 09:25:33Z cfergeau $ use diagnostics; use strict; @@ -96,7 +96,8 @@ sub may_use_Driver2 { log::explanations("Using specific NVIDIA driver and GLX extensions"); $card2->{DRI_GLX_SPECIAL} = 1; - $card2->{Options}{IgnoreEDID} = 1 if member($card2->{DriverVersion}, qw(71xx 96xx)); + $card2->{Options}{IgnoreEDID} = 1 if ($card2->{DriverVersion} eq "71xx"); + $card2->{Options}{UseEDID} = 0 if ($card2->{DriverVersion} eq "96xx"); $card2; } elsif ($card2->{Driver} eq 'fglrx') { $check_drv->('fglrx_drv', "fglrx$card2->{DriverVersion}") or return; 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) { diff --git a/lib/Xconfig/screen.pm b/lib/Xconfig/screen.pm index e0a3ebd..ad835fa 100644 --- a/lib/Xconfig/screen.pm +++ b/lib/Xconfig/screen.pm @@ -1,4 +1,4 @@ -package Xconfig::screen; # $Id$ +package Xconfig::screen; # $Id: screen.pm 210131 2004-11-18 13:25:45Z prigaux $ use diagnostics; use strict; diff --git a/lib/Xconfig/test.pm b/lib/Xconfig/test.pm index 1fd15fb..f29a07f 100644 --- a/lib/Xconfig/test.pm +++ b/lib/Xconfig/test.pm @@ -1,4 +1,4 @@ -package Xconfig::test; # $Id$ +package Xconfig::test; # $Id: test.pm 252243 2009-01-29 17:57:45Z pixel $ use diagnostics; use strict; 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} ? diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm index efe8d10..6b284aa 100644 --- a/lib/Xconfig/xfree.pm +++ b/lib/Xconfig/xfree.pm @@ -1,6 +1,6 @@ -package Xconfig::xfree; # $Id$ +package Xconfig::xfree; # $Id: xfree.pm 262502 2009-10-21 13:46:52Z cfergeau $ -my ($Revision) = '$Revision$' =~ /(\d+)/; +my ($Revision) = '$Revision: 262502 $' =~ /(\d+)/; use diagnostics; use strict; -- cgit v1.2.1