hal/fdi/20freedesktop Makefile.am, 1.4, 1.5 canon-digital-ixus-v.fdi, 1.3, NONE sony_dsc.fdi, NONE, 1.1

[David Zeuthen]

Update of /cvs/hal/hal/fdi/20freedesktop
In directory gabe:/tmp/cvs-serv12717/fdi/20freedesktop

Modified Files:
	Makefile.am 
Added Files:
	sony_dsc.fdi 
Removed Files:
	canon-digital-ixus-v.fdi 
Log Message:
2004-10-13  David Zeuthen  <davidz at redhat.com>

	* fdi/20freedesktop/sony_dsc.fdi: New file, to match krh's camera
	that is USB Mass Storage based.

	* fdi/20freedesktop/canon-digital-ixus-v.fdi: Removed

	* fdi/20freedesktop/Makefile.am (dist_fdi20freedesktop_DATA): 
	add sony, remove canon.

	* doc/spec/hal-spec.xml.in: Add a bunch of documentation to match
	the new .fdi parser and the policy stuff for storage devices
	
	* hald/device_info.c (handle_match): Remove debug output
	
	* hald/hald_dbus.c (device_remove_property): Require superuser



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	26 Jun 2004 08:07:52 -0000	1.4
+++ Makefile.am	13 Oct 2004 13:50:07 -0000	1.5
@@ -3,7 +3,7 @@
 fdi20freedesktopdir = $(datadir)/hal/fdi/20freedesktop
 
 dist_fdi20freedesktop_DATA = 		\
-	canon-digital-ixus-v.fdi	\
+	sony_dsc.fdi			\
 	6in1-card-reader.fdi		\
 	lexar-media-cf-reader.fdi	\
 	lucent-pcmcia-wireless.fdi	\

--- canon-digital-ixus-v.fdi DELETED ---

--- NEW FILE: sony_dsc.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 

<deviceinfo version="0.2">
  <device>
    <match key="info.bus" 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>