hal/doc/spec Makefile.am, 1.5, 1.6 example-manager.py, NONE, 1.1 examply-manager.py, 1.2, NONE hal-spec.html, 1.13, 1.14 hal-spec.xml.in, 1.12, 1.13

David Zeuthen david at freedesktop.org
Thu Aug 12 10:40:17 PDT 2004


Update of /cvs/hal/hal/doc/spec
In directory pdx:/tmp/cvs-serv11287/doc/spec

Modified Files:
	Makefile.am hal-spec.html hal-spec.xml.in 
Added Files:
	example-manager.py 
Removed Files:
	examply-manager.py 
Log Message:
2004-08-12  David Zeuthen  <david at 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



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/doc/spec/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	9 Aug 2004 18:33:29 -0000	1.5
+++ Makefile.am	12 Aug 2004 17:40:14 -0000	1.6
@@ -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 @@
 	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

--- NEW FILE: example-manager.py ---
#!/usr/bin/python
 
import gtk
import dbus

def device_added(interface, signal_name, service, path, message):
    [udi] = message.get_args_list ()
    print 'Device %s was added'%udi

def device_removed(interface, signal_name, service, path, message):
    [udi] = message.get_args_list ()
    print 'Device %s was removed'%udi

 
bus = dbus.Bus (dbus.Bus.TYPE_SYSTEM)
hal_service = bus.get_service ('org.freedesktop.Hal')
hal_manager = hal_service.get_object ('/org/freedesktop/Hal/Manager',
				      'org.freedesktop.Hal.Manager')

devices = hal_manager.GetAllDevices ()
for d in devices:
    print 'Found device %s'%d

bus.add_signal_receiver (device_added,
			 'DeviceAdded',
			 'org.freedesktop.Hal.Manager',
			 'org.freedesktop.Hal',
			 '/org/freedesktop/Hal/Manager')
bus.add_signal_receiver (device_removed,
			 'DeviceRemoved',
			 'org.freedesktop.Hal.Manager',
			 'org.freedesktop.Hal',
			 '/org/freedesktop/Hal/Manager')
gtk.main()

--- examply-manager.py DELETED ---

Index: hal-spec.html
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- hal-spec.html	12 Aug 2004 14:34:36 -0000	1.13
+++ hal-spec.html	12 Aug 2004 17:40:14 -0000	1.14
@@ -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="title"
 ><A
 NAME="AEN2"
->HAL 0.2.95 Specification</A
+>HAL 0.2.96 Specification</A
 ></H1
 ><H3
 CLASS="author"
@@ -51,7 +51,7 @@
 ></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 @@
 ></TR
 ><TR
 ><TD
->0.2.95</TD
+>0.2.96</TD
 ><TD
 >&nbsp;</TD
 ><TD

Index: hal-spec.xml.in
===================================================================
RCS file: /cvs/hal/hal/doc/spec/hal-spec.xml.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- hal-spec.xml.in	12 Aug 2004 14:34:36 -0000	1.12
+++ hal-spec.xml.in	12 Aug 2004 17:40:14 -0000	1.13
@@ -2930,7 +2930,7 @@
       </para>
 
 <programlisting>
-  <inlinegraphic format="linespecific" fileref="examply-manager.py"/>
+  <inlinegraphic format="linespecific" fileref="example-manager.py"/>
 </programlisting>
 
       <para>




More information about the hal-commit mailing list