summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Zeuthen <david@fubar.dk>2004-08-12 17:40:14 +0000
committerDavid Zeuthen <david@fubar.dk>2004-08-12 17:40:14 +0000
commit1bc2d0368129bb0f9e66c0c6140ab1c623a925d5 (patch)
tree5c2ba18e00ff2b831b1d59ce98642a5e3a5375c5
parentb0a1b22ad8ca58c06eb678bba59b4ed151f70cd9 (diff)
Bump to 0.2.96HAL_0_2_96
Include example-manager.py instead of examply-manager.py. Sigh. New file Removed
-rw-r--r--ChangeLog11
-rw-r--r--configure.in4
-rw-r--r--doc/spec/Makefile.am15
-rwxr-xr-xdoc/spec/example-manager.py (renamed from doc/spec/examply-manager.py)0
-rw-r--r--doc/spec/hal-spec.html8
-rw-r--r--doc/spec/hal-spec.xml.in2
6 files changed, 25 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 296db719..6c5fb812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2004-08-12 David Zeuthen <david@fubar.dk>
+ * configure.in: Bump to 0.2.96
+
+ * doc/spec/hal-spec.xml.in: Include example-manager.py instead of
+ examply-manager.py. Sigh.
+
+ * doc/spec/example-manager.py: New file
+
+ * doc/spec/examply-manager.py: Removed
+
+2004-08-12 David Zeuthen <david@fubar.dk>
+
* doc/spec/hal-spec.xml.in: Rewrite block.no_partitions spec.
Add storage.[serial|firmware_version] which was forgotton.
diff --git a/configure.in b/configure.in
index f8d0d81d..6a0958b5 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(hal, 0.2.95, david@fubar.dk)
-AM_INIT_AUTOMAKE(hal, 0.2.95)
+AC_INIT(hal, 0.2.96, david@fubar.dk)
+AM_INIT_AUTOMAKE(hal, 0.2.96)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff --git a/doc/spec/Makefile.am b/doc/spec/Makefile.am
index 06b7c984..52adef46 100644
--- a/doc/spec/Makefile.am
+++ b/doc/spec/Makefile.am
@@ -1,12 +1,6 @@
if DOCBOOK_DOCS_ENABLED
-EXTRA_DIST = \
- hal-spec.xml \
- example-manager.py \
- hal-arch.dia \
- hal-linux26.dia
-
FIGURE_FILES = \
hal-arch.png \
hal-devices1.png \
@@ -16,14 +10,19 @@ FIGURE_FILES = \
hal-linux26.png
-EXTRA_DIST += hal-spec.html $(FIGURE_FILES)
-
htmldocdir = $(datadir)/doc/hal-$(VERSION)/spec
htmldoc_DATA = hal-spec.html $(FIGURE_FILES)
hal-spec.html : hal-spec.xml $(FIGURE_FILES)
$(DOCBOOK) --nochunks hal-spec.xml -o .
+EXTRA_DIST = hal-spec.html \
+ hal-spec.xml.in \
+ example-manager.py \
+ hal-arch.dia \
+ hal-linux26.dia \
+ $(FIGURE_FILES)
+
clean-local:
rm -f *~
rm -f hal-spec.html hal-spec.xml
diff --git a/doc/spec/examply-manager.py b/doc/spec/example-manager.py
index 753bf8ab..753bf8ab 100755
--- a/doc/spec/examply-manager.py
+++ b/doc/spec/example-manager.py
diff --git a/doc/spec/hal-spec.html b/doc/spec/hal-spec.html
index 74c9b420..865cb253 100644
--- a/doc/spec/hal-spec.html
+++ b/doc/spec/hal-spec.html
@@ -2,7 +2,7 @@
<HTML
><HEAD
><TITLE
->HAL 0.2.95 Specification</TITLE
+>HAL 0.2.96 Specification</TITLE
><META
NAME="GENERATOR"
CONTENT="Modular DocBook HTML Stylesheet Version 1.7"></HEAD
@@ -24,7 +24,7 @@ CLASS="TITLEPAGE"
CLASS="title"
><A
NAME="AEN2"
->HAL 0.2.95 Specification</A
+>HAL 0.2.96 Specification</A
></H1
><H3
CLASS="author"
@@ -51,7 +51,7 @@ HREF="mailto:david@fubar.dk"
></DIV
><SPAN
CLASS="releaseinfo"
->Version 0.2.95<BR></SPAN
+>Version 0.2.96<BR></SPAN
><HR></DIV
><DIV
CLASS="TOC"
@@ -548,7 +548,7 @@ CLASS="CALSTABLE"
></TR
><TR
><TD
->0.2.95</TD
+>0.2.96</TD
><TD
>&nbsp;</TD
><TD
diff --git a/doc/spec/hal-spec.xml.in b/doc/spec/hal-spec.xml.in
index 1e725c9e..26efc3ec 100644
--- a/doc/spec/hal-spec.xml.in
+++ b/doc/spec/hal-spec.xml.in
@@ -2930,7 +2930,7 @@ void NewCapability(string udi, string capability)
</para>
<programlisting>
- <inlinegraphic format="linespecific" fileref="examply-manager.py"/>
+ <inlinegraphic format="linespecific" fileref="example-manager.py"/>
</programlisting>
<para>