From 065734e082730c248c2743ac6a35789719522b64 Mon Sep 17 00:00:00 2001
From: Danny Kukawka <danny.kukawka@web.de>
Date: Thu, 6 Dec 2007 18:47:46 +0100
Subject: [PATCH] add Dell laptop panel device only if dcdbas is loaded

This changes HAL to provide the Dell laptop panel device (for brightness
support) only if the needed dcdbas device is available (which means the
module is loaded).

The patch aggregate also the different spellings of Dell ("Dell Inc.",
"Dell Computer Corporation") to one match.
---
 .../10osvendor/10-dell-laptop-brightness.fdi       |   22 +++++++------------
 1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi b/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi
index b5a3bff..31ebec2 100644
--- a/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi
+++ b/fdi/policy/10osvendor/10-dell-laptop-brightness.fdi
@@ -9,20 +9,14 @@
        to work correctly.
        See http://bugs.freedesktop.org/show_bug.cgi?id=7221 for details. -->
   <device>
-    <match key="system.kernel.name" string="Linux"> 
-      <match key="system.hardware.vendor" string="Dell Computer Corporation">
-        <match key="system.formfactor" string="laptop">
-           <spawn udi="/org/freedesktop/Hal/devices/dell_lcd_panel"/>
-        </match>
-      </match>
-    </match>
-  </device>
-
-  <device>
-    <match key="system.kernel.name" string="Linux"> 
-      <match key="system.hardware.vendor" string="Dell Inc.">
-        <match key="system.formfactor" string="laptop">
-           <spawn udi="/org/freedesktop/Hal/devices/dell_lcd_panel"/>
+    <match key="info.bus" string="platform">
+      <match key="platform.id" string="dcdbas">
+        <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
+            <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+              <spawn udi="/org/freedesktop/Hal/devices/dell_lcd_panel"/>
+            </match>
+          </match>
         </match>
       </match>
     </match>
-- 
1.5.3.7