diff -u hal-0.2.92/fdi/20freedesktop/Makefile.in hal-0.2.92/fdi/20freedesktop/Makefile.in
--- hal-0.2.92/fdi/20freedesktop/Makefile.in
+++ hal-0.2.92/fdi/20freedesktop/Makefile.in
@@ -168,6 +168,7 @@
 
 dist_fdi20freedesktop_DATA = canon-digital-ixus-v.fdi \
                              6in1-card-reader.fdi     \
+                             canon-digital-ixus-400-v.fdi     \
                              lexar-media-cf-reader.fdi
 
 subdir = fdi/20freedesktop
diff -u hal-0.2.92/debian/changelog hal-0.2.92/debian/changelog
--- hal-0.2.92/debian/changelog
+++ hal-0.2.92/debian/changelog
@@ -1,3 +1,9 @@
+hal (0.2.92-1ubuntu11) warty; urgency=low
+
+  * Add fdi file for Canon Digital Ixus 400 (Warty #1286)
+
+ -- Thom May <thom@planetarytramp.net>  Mon, 20 Sep 2004 12:45:10 +0100
+
 hal (0.2.92-1ubuntu10) warty; urgency=low
 
   * debian/patches/09_fix_sysfs_read_attribute.patch: Fix type of length in
only in patch2:
unchanged:
--- hal-0.2.92.orig/fdi/20freedesktop/canon-digital-ixus-400-v.fdi
+++ hal-0.2.92/fdi/20freedesktop/canon-digital-ixus-400-v.fdi
@@ -0,0 +1,15 @@
+<?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="0x04a9">
+        <match key="usb.product_id" int="0x3075">
+          <merge key="info.category" type="string">camera</merge>
+          <merge key="info.capabilities" type="string">camera</merge>
+          <merge key="info.persistent" type="bool">true</merge>
+        </match>
+      </match>
+    </match>
+  </device>
+</deviceinfo>