hal: Branch 'master'

[David Zeuthen]

 configure.in                |    2 +-
 doc/spec/hal-spec.xml.in.in |    0 
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 35d4c8d611c76c65d8e0126785ee65f937570925 (from 89d144da2f8cf835532fda85315762f34fcfcaf4)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 26 21:18:08 2007 -0400

    fix up spec generation a bit more

diff --git a/configure.in b/configure.in
index 90240d6..d0efffe 100644
--- a/configure.in
+++ b/configure.in
@@ -851,7 +851,7 @@ doc/api/libhal/version.xml
 doc/api/libhal-storage/Makefile
 doc/api/libhal-storage/version.xml
 doc/spec/Makefile
-doc/spec/hal-spec.xml
+doc/spec/hal-spec.xml.in
 po/Makefile.in
 ])
 
diff --git a/doc/spec/hal-spec.xml.in b/doc/spec/hal-spec.xml.in
deleted file mode 100644
index acc0d40..0000000
--- a/doc/spec/hal-spec.xml.in
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-
-<book id="index">
-  <bookinfo>
-    <title>HAL @VERSION@ Specification</title>
-    <releaseinfo>Version @VERSION@</releaseinfo>
-    <date>March 24th, 2007</date> <!-- Update this manually -->
-    <authorgroup>
-      <author>
-        <firstname>David</firstname>
-        <surname>Zeuthen</surname>
-        <affiliation>
-          <address>
-           <email>david at fubar.dk</email>
-          </address>
-        </affiliation>
-      </author>
-    </authorgroup>
-  </bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-introduction.xml" />
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-properties.xml" />
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-fdi-files.xml" />
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-locking.xml" />
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-interfaces.xml" />
-  
-</book>
diff --git a/doc/spec/hal-spec.xml.in.in b/doc/spec/hal-spec.xml.in.in
new file mode 100644
index 0000000..acc0d40
--- /dev/null
+++ b/doc/spec/hal-spec.xml.in.in
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
+
+<book id="index">
+  <bookinfo>
+    <title>HAL @VERSION@ Specification</title>
+    <releaseinfo>Version @VERSION@</releaseinfo>
+    <date>March 24th, 2007</date> <!-- Update this manually -->
+    <authorgroup>
+      <author>
+        <firstname>David</firstname>
+        <surname>Zeuthen</surname>
+        <affiliation>
+          <address>
+           <email>david at fubar.dk</email>
+          </address>
+        </affiliation>
+      </author>
+    </authorgroup>
+  </bookinfo>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-introduction.xml" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-properties.xml" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-fdi-files.xml" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-locking.xml" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hal-spec-interfaces.xml" />
+  
+</book>