hal: Branch 'master'

David Zeuthen david at kemper.freedesktop.org
Sun Mar 25 22:12:44 PDT 2007


 configure.in                         |    1 
 doc/Makefile.am                      |    2 -
 doc/conf/.gitignore                  |    4 ---
 doc/conf/Makefile.am                 |    9 -------
 doc/conf/match-USB-camera.fdi        |   18 ---------------
 doc/conf/match-USB-mp3-player.fdi    |   20 -----------------
 doc/conf/match-cardreader.fdi        |   27 -----------------------
 doc/conf/storage-non-fixed.fdi       |   17 --------------
 doc/conf/storage-policy-examples.fdi |   41 -----------------------------------
 doc/conf/storage-skip-all.fdi        |   10 --------
 doc/spec/Makefile.am                 |    2 -
 11 files changed, 2 insertions(+), 149 deletions(-)

New commits:
diff-tree d75618d5abbcd8f7218d65bbe99744d9052bb61b (from e10554d1c15eb1e6513d8199d8433fc9574d8351)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Mar 26 01:12:44 2007 -0400

    remove doc/conf and remember to install the CSS stylesheet

diff --git a/configure.in b/configure.in
index b24449a..71d1073 100644
--- a/configure.in
+++ b/configure.in
@@ -881,7 +881,6 @@ doc/api/libhal/Makefile
 doc/api/libhal/version.xml
 doc/api/libhal-storage/Makefile
 doc/api/libhal-storage/version.xml
-doc/conf/Makefile
 doc/spec/Makefile
 doc/spec/hal-spec.xml
 po/Makefile.in
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a72f0ba..991ba5f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 
 EXTRA_DIST = TODO
 
-SUBDIRS = api spec conf
+SUBDIRS = api spec
 
 MAINTAINERCLEANFILES =		\
 	*~			\
diff --git a/doc/conf/.gitignore b/doc/conf/.gitignore
deleted file mode 100644
index 35e3b27..0000000
--- a/doc/conf/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*~
diff --git a/doc/conf/Makefile.am b/doc/conf/Makefile.am
deleted file mode 100644
index b5783c8..0000000
--- a/doc/conf/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-
-EXTRA_DIST = storage-policy-examples.fdi storage-skip-all.fdi \
-	     storage-non-fixed.fdi match-cardreader.fdi \
-	     match-USB-camera.fdi match-USB-mp3-player.fdi
-
-confdir = $(DOCDIR)/conf
-conf_DATA = storage-policy-examples.fdi storage-skip-all.fdi \
-	    storage-non-fixed.fdi match-cardreader.fdi \
-	    match-USB-camera.fdi match-USB-mp3-player.fdi
diff --git a/doc/conf/match-USB-camera.fdi b/doc/conf/match-USB-camera.fdi
deleted file mode 100644
index d29c7c1..0000000
--- a/doc/conf/match-USB-camera.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Example: This device information file matches a Sony digital still 
-              camera by matching on the USB vendor and product identifers.  -->
-
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.subsystem" string="usb">
-      <match key="usb.vendor_id" int="0x054c">
-        <match key="usb.product_id" int="0x0010">
-          <merge key="info.category" type="string">camera</merge>
-          <merge key="info.capabilities" type="string">camera</merge>
-          <merge key="camera.access_method" type="string">storage</merge>
-        </match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/doc/conf/match-USB-mp3-player.fdi b/doc/conf/match-USB-mp3-player.fdi
deleted file mode 100644
index 6c5ac39..0000000
--- a/doc/conf/match-USB-mp3-player.fdi
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Example: This device information file matches an USB Mass Storage based MP3 player 
-              by the matching on the USB vendor and product identifiers. -->
-
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.subsystem" string="usb">
-      <match key="usb.vendor_id" int="0x066f">
-        <match key="usb.product_id" int="0x8000">
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="info.capabilities" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.access_method" type="string">storage</merge>
-          <merge key="portable_audio_player.output_formats" type="string">audio/mpeg audio/x-ms-wma</merge>
-          <merge key="portable_audio_player.input_formats" type="string">audio/x-wav</merge>
-        </match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/doc/conf/match-cardreader.fdi b/doc/conf/match-cardreader.fdi
deleted file mode 100644
index 3600854..0000000
--- a/doc/conf/match-cardreader.fdi
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Example: This device information file matches a memory card reader with 
-              multiple storage ports that can be active at the same time. -->
-
-<deviceinfo version="0.2">
-  <device>
-    <match key="storage.bus" string="usb">
-      <match key="@storage.originating_device:usb.vendor_id" int="0x0424">
-        <match key="@storage.originating_device:usb.product_id" int="0x20fc">
-          <match key="storage.lun" int="0">
-            <merge key="storage.drive_type" type="string">compact_flash</merge>
-	  </match>
-          <match key="storage.lun" int="1">
-            <merge key="storage.drive_type" type="string">memory_stick</merge>
-	  </match>
-          <match key="storage.lun" int="2">
-            <merge key="storage.drive_type" type="string">smart_media</merge>
-	  </match>
-          <match key="storage.lun" int="3">
-            <merge key="storage.drive_type" type="string">sd_mmc</merge>
-	  </match>
-        </match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/doc/conf/storage-non-fixed.fdi b/doc/conf/storage-non-fixed.fdi
deleted file mode 100644
index 5c312f7..0000000
--- a/doc/conf/storage-non-fixed.fdi
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This .fdi files makes sure no fixed storage device gets tagged as
-     mountable except if it's a floppy or optical drive -->
-<deviceinfo version="0.2">
-  <device>
-    <match key="storage.hotpluggable" bool="false">
-	<merge key="storage.policy.should_mount" type="bool">false</merge>
-	<match key="storage.drive_type" string="floppy">
-	  <merge key="storage.policy.should_mount" type="bool">true</merge>
-	</match>
-	<match key="storage.drive_type" string="cdrom">
-	  <merge key="storage.policy.should_mount" type="bool">true</merge>
-	</match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/doc/conf/storage-policy-examples.fdi b/doc/conf/storage-policy-examples.fdi
deleted file mode 100644
index cbf482c..0000000
--- a/doc/conf/storage-policy-examples.fdi
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-
-  <!-- Example: Match volumes from an external USB harddisk enclosure by 
-                matching on vendor and model. Use mount points 
-
-  		    my_usbdisk_part_<partition-number>
-
-		NB: some drives (ieee1394 based IIRC) even export the
-		property storage.serial, the unique serial number of the
-		disk which is a better match -->
-  <device>
-    <match key="block.is_volume" bool="true">
-      <match key="volume.fsusage" string="filesystem">
-	<match key="@block.storage_device:storage.vendor" string="ST360021">
-	  <match key="@block.storage_device:storage.model" string="A">
-	    <merge key="volume.policy.desired_mount_point" type="string">my_usbdisk_partition_</merge>
-	    <append key="volume.policy.desired_mount_point" type="copy_property">volume.partition.number</append>
-	  </match>
-	</match>
-      </match>
-    </match>
-  </device>
-
-  <!-- Example: Match a volume from an USB Storage Based mp3 player
-                by the file system UUID and assign a mount point.
-
-                NB: When reformatting the volume a new UUID will be
-                used and this rule will have to be altered -->
-  <device>
-    <match key="block.is_volume" bool="true">
-      <match key="volume.fsusage" string="filesystem">
-	<match key="volume.uuid" string="4150-3F34">
-	  <merge key="volume.policy.desired_mount_point" type="string">my_mp3_player</merge>
-	</match>
-      </match>
-    </match>
-  </device>
-
-</deviceinfo>
diff --git a/doc/conf/storage-skip-all.fdi b/doc/conf/storage-skip-all.fdi
deleted file mode 100644
index f8b3300..0000000
--- a/doc/conf/storage-skip-all.fdi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- This .fdi files will tag all storage devices as non mountable -->
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.category" string="storage">
-      <merge key="storage.policy.should_mount" type="bool">false</merge>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/doc/spec/Makefile.am b/doc/spec/Makefile.am
index 4bdce9a..e482f6e 100644
--- a/doc/spec/Makefile.am
+++ b/doc/spec/Makefile.am
@@ -13,7 +13,7 @@ SPEC_XML_EXTRA_FILES =			\
 if DOCBOOK_DOCS_ENABLED
 
 htmldocdir = $(DOCDIR)/spec
-htmldoc_DATA = hal-spec.html $(FIGURE_FILES)
+htmldoc_DATA = hal-spec.html $(FIGURE_FILES) docbook.css
 
 hal-spec.html : hal-spec.xml $(SPEC_XML_EXTRA_FILES) $(FIGURE_FILES)
 	${XMLLINT} --xinclude hal-spec.xml > ~hal-spec.xml || rm -f ~hal-spec.xml


More information about the hal-commit mailing list