hal: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/policy/10osvendor/10-tabletPCs.fdi |   13 ++++++-------
 hald/linux/addons/.gitignore           |    1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2efd6fb21a97c8e34866f86cc0dd91cbf321c05b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Aug 20 19:36:20 2008 +0200

    added hald-addon-generic-backlight to .gitignore
    
    Added hald-addon-generic-backlight to .gitignore.

diff --git a/hald/linux/addons/.gitignore b/hald/linux/addons/.gitignore
index 9e9d379..5446309 100644
--- a/hald/linux/addons/.gitignore
+++ b/hald/linux/addons/.gitignore
@@ -5,6 +5,7 @@ Makefile.in
 *.lo
 *.la
 hald-addon-acpi
+hald-addon-generic-backlight
 hald-addon-hid-ups
 hald-addon-pmu
 hald-addon-storage
commit 2c24d04383cd524a440ad806a55936b40ede3675
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Aug 20 19:35:16 2008 +0200

    fixed 10-tabletPCs.fdi
    
    Fixed 10-tabletPCs.fdi.

diff --git a/fdi/policy/10osvendor/10-tabletPCs.fdi b/fdi/policy/10osvendor/10-tabletPCs.fdi
index 484bfb1..5b4a81d 100644
--- a/fdi/policy/10osvendor/10-tabletPCs.fdi
+++ b/fdi/policy/10osvendor/10-tabletPCs.fdi
@@ -26,13 +26,12 @@
       <!-- WACOM Tablets -->
       <match key="usb_device.product_id" int_outof="0x90;0x93;0x9a">
 	<!-- TabletPCs with USB Wacom Tablets -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" compare_ne="laptop">
-	    <!-- set the correct formfactor if not already laptop -->
-	    <merge key="/org/freedesktop/Hal/devices/computer:system.formfactor" type="string">laptop</merge> 
-	  </match>
-	  <!-- set the correct subtype -->
-	  <merge key="/org/freedesktop/Hal/devices/computer:system.formfactor.subtype" type="string">tabletpc</merge>
-        </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" compare_ne="laptop">
+	  <!-- set the correct formfactor if not already laptop -->
+	  <merge key="/org/freedesktop/Hal/devices/computer:system.formfactor" type="string">laptop</merge> 
+	</match>
+	<!-- set the correct subtype -->
+	<merge key="/org/freedesktop/Hal/devices/computer:system.formfactor.subtype" type="string">tabletpc</merge>
       </match>
     </match>