Annotation of /trunk/hal/patches/hal-0.5.10-add-Dell-laptop-panel-device-only-if-dcdbas-is-loade.patch
Parent Directory
| 
Revision Log
Revision 597 -
(hide annotations)
(download)
Mon May 19 19:05:19 2008 UTC (16 years ago) by niro
File size: 2185 byte(s)
Mon May 19 19:05:19 2008 UTC (16 years ago) by niro
File size: 2185 byte(s)
-gentoo patches
| 1 | niro | 597 | From 065734e082730c248c2743ac6a35789719522b64 Mon Sep 17 00:00:00 2001 |
| 2 | From: Danny Kukawka <danny.kukawka@web.de> | ||
| 3 | Date: Thu, 6 Dec 2007 18:47:46 +0100 | ||
| 4 | Subject: [PATCH] add Dell laptop panel device only if dcdbas is loaded | ||
| 5 | |||
| 6 | This changes HAL to provide the Dell laptop panel device (for brightness | ||
| 7 | support) only if the needed dcdbas device is available (which means the | ||
| 8 | module is loaded). | ||
| 9 | |||
| 10 | The patch aggregate also the different spellings of Dell ("Dell Inc.", | ||
| 11 | "Dell Computer Corporation") to one match. | ||
| 12 | --- | ||
| 13 | .../10osvendor/10-dell-laptop-brightness.fdi | 22 +++++++------------ | ||
| 14 | 1 files changed, 8 insertions(+), 14 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi b/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi | ||
| 17 | index b5a3bff..31ebec2 100644 | ||
| 18 | --- a/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi | ||
| 19 | +++ b/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi | ||
| 20 | @@ -9,20 +9,14 @@ | ||
| 21 | to work correctly. | ||
| 22 | See http://bugs.freedesktop.org/show_bug.cgi?id=7221 for details. --> | ||
| 23 | <device> | ||
| 24 | - <match key="system.kernel.name" string="Linux"> | ||
| 25 | - <match key="system.hardware.vendor" string="Dell Computer Corporation"> | ||
| 26 | - <match key="system.formfactor" string="laptop"> | ||
| 27 | - <spawn udi="/org/freedesktop/Hal/devices/dell_lcd_panel"/> | ||
| 28 | - </match> | ||
| 29 | - </match> | ||
| 30 | - </match> | ||
| 31 | - </device> | ||
| 32 | - | ||
| 33 | - <device> | ||
| 34 | - <match key="system.kernel.name" string="Linux"> | ||
| 35 | - <match key="system.hardware.vendor" string="Dell Inc."> | ||
| 36 | - <match key="system.formfactor" string="laptop"> | ||
| 37 | - <spawn udi="/org/freedesktop/Hal/devices/dell_lcd_panel"/> | ||
| 38 | + <match key="info.bus" string="platform"> | ||
| 39 | + <match key="platform.id" string="dcdbas"> | ||
| 40 | + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux"> | ||
| 41 | + <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell "> | ||
| 42 | + <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop"> | ||
| 43 | + <spawn udi="/org/freedesktop/Hal/devices/dell_lcd_panel"/> | ||
| 44 | + </match> | ||
| 45 | + </match> | ||
| 46 | </match> | ||
| 47 | </match> | ||
| 48 | </match> | ||
| 49 | -- | ||
| 50 | 1.5.3.7 | ||
| 51 |