hal/fdi/20freedesktop canon-digital-ixus-v.fdi,1.2,1.3

[David Zeuthen]

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

Modified Files:
	canon-digital-ixus-v.fdi 
Log Message:
2004-08-27  David Zeuthen  <david at fubar.dk>

	* AUTHORS: Add Kay Sievers <kay.sievers at vrfy.org> cause he rocks.
	Sort the list in alphabetical order of surname (I'm just soo
	political correct :-)

	* fdi/20freedesktop/canon-digital-ixus-v.fdi: Merge onto usb_device
	since we really don't know what interface to target

	* hald/linux/hald_helper.h: Change comment about seqnum

	* hald/linux/libsysfs/sysfs_dir.c (sysfs_open_link): Patch from
	Steve Grubb <linux4_ever at yahoo.com> to fix leak on error condition.

	* hald/linux/osspec.c: 
	(add_computer_callouts_done): Move from TDL to GDL
	(osspec_probe): Add to TDL; callouts may need it (seen by Kristof
	Vansant <de_lupus at pandora.be>
	(hald_helper_device_node): Print out seqnum
	(hald_helper_data): Pass seqnum

	* hald/logger.h: Ignore ENABLE_VERBOSE_MODE; always compile all
	logging statements in (should take the heat of some bugreports)

	* tools/linux/hal_dev.c (main): Pass seqnum if available; otherwise
	pass -1.



Index: canon-digital-ixus-v.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/20freedesktop/canon-digital-ixus-v.fdi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- canon-digital-ixus-v.fdi	9 Aug 2004 18:33:29 -0000	1.2
+++ canon-digital-ixus-v.fdi	26 Aug 2004 22:16:17 -0000	1.3
@@ -2,9 +2,9 @@
 
 <deviceinfo version="0.2">
   <device>
-    <match key="info.bus" string="usb">
-      <match key="usb.vendor_id" int="0x04a9">
-        <match key="usb.product_id" int="0x3052">
+    <match key="info.bus" string="usb_device">
+      <match key="usb_device.vendor_id" int="0x04a9">
+        <match key="usb_device.product_id" int="0x3052">
           <merge key="info.category" type="string">camera</merge>
           <merge key="info.capabilities" type="string">camera</merge>
           <merge key="camera.access_method" type="string">user</merge>