hal: Branch 'master'

[David Zeuthen]

 doc/TODO        |    3 ++
 fdi/Makefile.am |    4 +-
 fdi/fdi.dtd     |    1 
 fdi/fdi.rng     |   82 --------------------------------------------------------
 4 files changed, 6 insertions(+), 84 deletions(-)

New commits:
diff-tree d3aaf33d66443c0f18743a78511caf16df36cb69 (from 6992f57a90e9e2a5b9f9c008204f2ef953d4db63)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sun Apr 1 15:08:52 2007 -0400

    teach fdi.dtd about contains_not, rip out RNG scheme
    
    Also add a note to the TODO list that we should have a
    hal-fdi-file-validate tool much like desktop-file-validate

diff --git a/doc/TODO b/doc/TODO
index a429ae0..5b7f125 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -15,6 +15,9 @@ Items specifically planned for 0.5.10 
 (TODO: need to go through and nominate things for 0.5.10)
 ------------------------------------
 
+ - Should provide a hal-fdi-file-validate tool that validates fdi
+   files.
+
  - Rip out translation framework (.po files) since only deprecated
    functions in libhal-storage have relied on it since the 0.5.8
    release.
diff --git a/fdi/Makefile.am b/fdi/Makefile.am
index a8115b9..edf9d88 100644
--- a/fdi/Makefile.am
+++ b/fdi/Makefile.am
@@ -1,8 +1,8 @@
 
 SUBDIRS = information policy preprobe
 
-EXTRA_DIST = fdi.dtd fdi.rng
+EXTRA_DIST = fdi.dtd
 
 fdidir = $(datadir)/hal/fdi
 
-dist_fdi_DATA = fdi.dtd fdi.rng
+dist_fdi_DATA = fdi.dtd
diff --git a/fdi/fdi.dtd b/fdi/fdi.dtd
index 1cf19e4..6084bb1 100644
--- a/fdi/fdi.dtd
+++ b/fdi/fdi.dtd
@@ -20,6 +20,7 @@
     is_absolute_path (false|true) #IMPLIED
     contains         CDATA #IMPLIED
     contains_ncase   CDATA #IMPLIED
+    contains_not     CDATA #IMPLIED
     prefix           CDATA #IMPLIED
     prefix_ncase     CDATA #IMPLIED
     suffix           CDATA #IMPLIED
diff --git a/fdi/fdi.rng b/fdi/fdi.rng
deleted file mode 100644
index fa21205..0000000
--- a/fdi/fdi.rng
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0"?>
-<grammar 
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
->
-	<start>
-		<element name="deviceinfo">
-			<attribute name="version">
-				<choice>
-					<value>0.1</value>
-					<value>0.2</value>
-				</choice>	
-			</attribute>	
-			<zeroOrMore>	
-				<ref name="device"/>
-			</zeroOrMore>
-		</element>	
-	</start>
-	<define name="device">
-		<element name="device">
-			<zeroOrMore>
-				<choice>
-					<ref name="match"/>
-					<ref name="merge"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="match">
-		<element name="match">
-			<attribute name="key"/>
-			<choice>
-				<attribute name="bool">
-					<data type="boolean"/>
-				</attribute>
-				<attribute name="int">
-					<data type="string"/>
-				</attribute>	
-				<attribute name="string">
-					<text/>
-				</attribute>
-			</choice>
-			<zeroOrMore>
-				<choice>
-					<ref name="match"/>
-					<ref name="merge"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="merge">
-		<element name="merge">
-			<attribute name="key"/>
-			<choice>
-				<group>
-					<attribute name="type">
-						<value>string</value>
-					</attribute>
-					<text/>
-				</group>
-				<group>
-					<attribute name="type">
-						<value>int</value>
-					</attribute>
-					<data type="int"/>
-				</group>
-				<group>
-					<attribute name="type">
-						<value>bool</value>
-					</attribute>
-					<data type="boolean"/>
-				</group>
-				<group>
-					<attribute name="type">
-						<value>double</value>
-					</attribute>
-					<data type="double"/>
-				</group>
-			</choice>
-		</element>
-	</define>
-</grammar>