hal: Branch 'master'

[Danny Kukawka]

 fdi/fdi.dtd |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

New commits:
diff-tree fcee3eb024085dddf9ef30c3f9a35dc4cb059ae7 (from 133eb5ba05effb6e8e9796476769ee61ba39ef56)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jun 14 00:26:06 2007 +0200

    sync fdi.dtd from hal package with hal-info
    
    Synced the actual fdi.dtd from hal package with hal-info to avoid
    problems with 'make distcheck'

diff --git a/fdi/fdi.dtd b/fdi/fdi.dtd
index 3e0bc42..7adb36c 100644
--- a/fdi/fdi.dtd
+++ b/fdi/fdi.dtd
@@ -8,7 +8,7 @@
 
 <!ELEMENT device (match|merge)*  >
 
-<!ELEMENT match (match|merge|prepend|append|remove|spawn)* >
+<!ELEMENT match (match|merge|prepend|append|addset|remove|spawn)* >
 <!ATTLIST match 
     key              CDATA #REQUIRED
     string           CDATA #IMPLIED
@@ -29,6 +29,8 @@
     compare_le       CDATA #IMPLIED
     compare_gt       CDATA #IMPLIED
     compare_ge       CDATA #IMPLIED
+    compare_ne       CDATA #IMPLIED
+    sibling_contains CDATA #IMPLIED
 >
 
 <!ELEMENT merge (#PCDATA) >
@@ -49,6 +51,12 @@
     type   (string|strlist|int|bool|double|copy_property) #REQUIRED
 >
 
+<!ELEMENT addset (#PCDATA) >
+<!ATTLIST addset 
+    key    CDATA #REQUIRED
+    type   (string|strlist|int|bool|double|copy_property) #REQUIRED
+>
+
 <!ELEMENT remove (#PCDATA) >
 <!ATTLIST remove
     key    CDATA #REQUIRED