Drop DEVICEMANAGER_DIR. This allows us to do make install even in

    maintainer mode, but changes to datafiles (glade and png's) needs to be
    installed every time unless Const.py is directly edited. Add
    autogeneration of fdi/Makefile and fdi/10generic/Makefile and
    fdi/20freedesktop/Makefile.
Fix check for merge of the other non-string types (bool, int, double)
    (end): Merge non-string types
rename various properties to match the spec.
rename various properties to match the spec.
Implement merging with persistent unplugged devices; search for .fdi files
Don't destroy persistent devices on remove; rather mark the unplugged,
    info.not_available set to true, and remove some key properties in info
    and linux namespace.
Renamed capability from storage to storage_controller to match spec.. Hmm..
    not sure..
Use @DATADIR@ and path instead of @DEVICEMANAGER_DIR@
Add support for capability camera and fixup how the storage icon is
    selected to reflect the new spec
new file
new file
removed
new file
removed
removed
new file

4 files changed, 15 insertions, 104 deletions

diff --git a/fdi/10generic/usb-classes.fdi b/fdi/10generic/usb-classes.fdi
deleted file mode 100644
index b08f0620..00000000
--- a/fdi/10generic/usb-classes.fdi
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
-
-<deviceinfo>
-
-  <device>
-    <match key="Bus" string="usbif">
-      <match key="usbif.bInterfaceClass" int="0x03">
-          <match key="usbif.bInterfaceProtocol" int="0x02">
-            <merge key="DeviceInfoFileVendor" type="string">Free Desktop Project</merge>
-            <merge key="DeviceInfoFileId" type="string">org.freedesktop.org.Hal.FDIRepo.USBClass.3.star.2</merge>
-            <merge key="Product" type="string">HID Mouse Interface</merge>
-            <merge key="Category" type="string">Mouse</merge>
-            <merge key="Capabilities" type="string">Mouse</merge>
-          </match>
-      </match>
-    </match>
-  </device>
-
-  <device>
-    <match key="Bus" string="usbif">
-      <match key="usbif.bInterfaceClass" int="0x03">
-          <match key="usbif.bInterfaceProtocol" int="0x01">
-            <merge key="DeviceInfoFileVendor" type="string">Free Desktop Project</merge>
-            <merge key="DeviceInfoFileId" type="string">org.freedesktop.org.Hal.FDIRepo.USBClass.3.star.1</merge>
-            <merge key="Product" type="string">HID Keyboard Interface</merge>
-            <merge key="Category" type="string">Keyboard</merge>
-            <merge key="Capabilities" type="string">Keyboard</merge>
-          </match>
-      </match>
-    </match>
-  </device>
-
-  <device>
-    <match key="Bus" string="usbif">
-      <match key="usbif.bInterfaceClass" int="0x08">
-            <merge key="DeviceInfoFileVendor" type="string">Free Desktop Project</merge>
-            <merge key="DeviceInfoFileId" type="string">org.freedesktop.org.Hal.FDIRepo.USBClass.8.star.star</merge>
-            <merge key="Product" type="string">USB Mass Storage Interface</merge>
-      </match>
-    </match>
-  </device>
-
-  <device>
-    <match key="Bus" string="usbif">
-      <match key="usbif.bInterfaceClass" int="0x09">
-            <merge key="DeviceInfoFileVendor" type="string">Free Desktop Project</merge>
-            <merge key="DeviceInfoFileId" type="string">org.freedesktop.org.Hal.FDIRepo.USBClass.9.star.star</merge>
-            <merge key="Product" type="string">USB Hub Interface</merge>
-      </match>
-    </match>
-  </device>
-
-</deviceinfo>
diff --git a/fdi/20freedesktop/canon-digital-ixus-v.fdi b/fdi/20freedesktop/canon-digital-ixus-v.fdi
new file mode 100644
index 00000000..e5083d8b
--- /dev/null
+++ b/fdi/20freedesktop/canon-digital-ixus-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="0x3052">
+          <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>
diff --git a/fdi/20freedesktop/ibm-usb-hub-keyboard.fdi b/fdi/20freedesktop/ibm-usb-hub-keyboard.fdi
deleted file mode 100644
index 1ee725f4..00000000
--- a/fdi/20freedesktop/ibm-usb-hub-keyboard.fdi
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
-
-<deviceinfo>
-  <device>
-    <match key="Bus" string="usb">
-      <match key="usb.idVendor" int="0x04b3">
-        <match key="usb.idProduct" int="0x3006">
-          <merge key="DeviceInfoFileVendor" type="string">Free Desktop Project</merge>
-          <merge key="DeviceInfoFileId" type="string">org.freedesktop.org.Hal.FDIRepo.IBMUsbPreferredKeyboard.Hub</merge>
-          <merge key="Vendor" type="string">IBM</merge>
-          <merge key="Product" type="string">Preferred USB Keyboard</merge>
-          <merge key="Category" type="string">Hub</merge>
-          <merge key="Capabilities" type="string">Hub</merge>
-        </match>
-      </match>
-    </match>
-  </device>
-
-  <device>
-    <match key="Bus" string="usb">
-      <match key="usb.idVendor" int="0x04b3">
-        <match key="usb.idProduct" int="0x3005">
-          <merge key="DeviceInfoFileVendor" type="string">Free Desktop Project</merge>
-          <merge key="DeviceInfoFileId" type="string">org.freedesktop.org.Hal.FDIRepo.IBMUsbPreferredKeyboard.Hub</merge>
-          <merge key="Vendor" type="string">IBM</merge>
-          <merge key="Product" type="string">Preferred USB Keyboard</merge>
-          <merge key="Category" type="string">Keyboard</merge>
-          <merge key="Capabilities" type="string">HID Keyboard</merge>
-        </match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/fdi/20freedesktop/lexar-cf-card-reader.fdi b/fdi/20freedesktop/lexar-cf-card-reader.fdi
deleted file mode 100644
index e06a888c..00000000
--- a/fdi/20freedesktop/lexar-cf-card-reader.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
-
-<deviceinfo>
-  <device>
-    <match key="Bus" string="usb">
-      <match key="usb.idVendor" int="0x05dc">
-        <match key="usb.idProduct" int="0x0002">
-          <merge key="DeviceInfoFileVendor" type="string">Free Desktop Project</merge>
-          <merge key="DeviceInfoFileId" type="string">org.freedesktop.org.Hal.FDIRepo.LexarCFReader</merge>
-          <merge key="Vendor" type="string">Lexar Media</merge>
-          <merge key="Product" type="string">CompactFlash Card Reader</merge>
-          <merge key="Category" type="string">Storage</merge>
-          <merge key="Capabilities" type="string">Storage</merge>
-        </match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>