SOURCES (AC-branch): hal-storage-policy-fixed-drives.fdi (NEW), ha...

baggins baggins at pld-linux.org
Mon May 15 00:38:08 CEST 2006


Author: baggins                      Date: Sun May 14 22:38:08 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   hal-storage-policy-fixed-drives.fdi (NONE -> 1.1.4.1)  (NEW), hal-libgphoto2.fdi (1.1 -> 1.1.4.1) , hal-libgphoto_udev.rules (1.1 -> 1.1.4.1) , hald.sysconfig (1.2 -> 1.2.2.1) , haldaemon.init (1.5 -> 1.5.4.1) 

---- Diffs:

================================================================
Index: SOURCES/hal-storage-policy-fixed-drives.fdi
diff -u /dev/null SOURCES/hal-storage-policy-fixed-drives.fdi:1.1.4.1
--- /dev/null	Mon May 15 00:38:08 2006
+++ SOURCES/hal-storage-policy-fixed-drives.fdi	Mon May 15 00:38:03 2006
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
+
+<deviceinfo version="0.2">
+<device>
+  <match key="@block.storage_device:storage.hotpluggable" bool="false">
+    <match key="@block.storage_device:storage.removable" bool="false">
+      <merge key="volume.ignore" type="bool">true</merge>
+    </match>
+  </match>
+</device>
+</deviceinfo>

================================================================
Index: SOURCES/hal-libgphoto2.fdi
diff -u SOURCES/hal-libgphoto2.fdi:1.1 SOURCES/hal-libgphoto2.fdi:1.1.4.1
--- SOURCES/hal-libgphoto2.fdi:1.1	Tue Jan 10 23:55:23 2006
+++ SOURCES/hal-libgphoto2.fdi	Mon May 15 00:38:03 2006
@@ -52,6 +52,13 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x03f0">
+        <match key="usb.product_id" int="0x6202">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x03f0">
         <match key="usb.product_id" int="0x6302">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -128,6 +135,27 @@
           <merge key="camera.access_method" type="string">libgphoto2</merge>
         </match>
       </match>
+      <match key="usb.vendor_id" int="0x03f0">
+        <match key="usb.product_id" int="0x7702">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x03f0">
+        <match key="usb.product_id" int="0x7a02">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x03f0">
+        <match key="usb.product_id" int="0x7b02">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
       <match key="usb.vendor_id" int="0x040a">
         <match key="usb.product_id" int="0x0100">
           <merge key="info.category" type="string">camera</merge>
@@ -220,6 +248,13 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x040a">
+        <match key="usb.product_id" int="0x0403">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x040a">
         <match key="usb.product_id" int="0x0500">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -416,6 +451,13 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x040a">
+        <match key="usb.product_id" int="0x057e">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x040a">
         <match key="usb.product_id" int="0x057f">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -423,6 +465,13 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x040a">
+        <match key="usb.product_id" int="0x0580">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x040a">
         <match key="usb.product_id" int="0x0584">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -436,6 +485,41 @@
           <merge key="camera.access_method" type="string">libgphoto2</merge>
         </match>
       </match>
+      <match key="usb.vendor_id" int="0x040a">
+        <match key="usb.product_id" int="0x058a">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x040a">
+        <match key="usb.product_id" int="0x058c">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x040a">
+        <match key="usb.product_id" int="0x058d">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x040a">
+        <match key="usb.product_id" int="0x058e">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x040a">
+        <match key="usb.product_id" int="0x058f">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
       <match key="usb.vendor_id" int="0x041e">
         <match key="usb.product_id" int="0x4007">
           <merge key="info.category" type="string">camera</merge>
@@ -1046,35 +1130,63 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x04a9">
+        <match key="usb.product_id" int="0x30f9">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04a9">
+        <match key="usb.product_id" int="0x30fc">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04a9">
+        <match key="usb.product_id" int="0x30fd">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04a9">
+        <match key="usb.product_id" int="0x30ff">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04a9">
         <match key="usb.product_id" int="0x310e">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
           <merge key="camera.access_method" type="string">libgphoto2</merge>
         </match>
       </match>
-      <match key="usb.vendor_id" int="0x04b0">
-        <match key="usb.product_id" int="0x0102">
+      <match key="usb.vendor_id" int="0x04a9">
+        <match key="usb.product_id" int="0x3116">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
           <merge key="camera.access_method" type="string">libgphoto2</merge>
         </match>
       </match>
       <match key="usb.vendor_id" int="0x04b0">
-        <match key="usb.product_id" int="0x0103">
+        <match key="usb.product_id" int="0x0102">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
           <merge key="camera.access_method" type="string">libgphoto2</merge>
         </match>
       </match>
       <match key="usb.vendor_id" int="0x04b0">
-        <match key="usb.product_id" int="0x0104">
+        <match key="usb.product_id" int="0x0103">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
           <merge key="camera.access_method" type="string">libgphoto2</merge>
         </match>
       </match>
       <match key="usb.vendor_id" int="0x04b0">
-        <match key="usb.product_id" int="0x0108">
+        <match key="usb.product_id" int="0x0104">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
           <merge key="camera.access_method" type="string">libgphoto2</merge>
@@ -1186,6 +1298,13 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x04b0">
+        <match key="usb.product_id" int="0x0129">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04b0">
         <match key="usb.product_id" int="0x012d">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -1193,6 +1312,34 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x04b0">
+        <match key="usb.product_id" int="0x012e">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04b0">
+        <match key="usb.product_id" int="0x0130">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04b0">
+        <match key="usb.product_id" int="0x0135">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04b0">
+        <match key="usb.product_id" int="0x0142">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04b0">
         <match key="usb.product_id" int="0x0202">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -1207,6 +1354,13 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x04b0">
+        <match key="usb.product_id" int="0x0206">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04b0">
         <match key="usb.product_id" int="0x0302">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -1242,7 +1396,14 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x04b0">
-        <match key="usb.product_id" int="0x040c">
+        <match key="usb.product_id" int="0x040a">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x04b0">
+        <match key="usb.product_id" int="0x040e">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
           <merge key="camera.access_method" type="string">libgphoto2</merge>
@@ -1389,6 +1550,20 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x05ca">
+        <match key="usb.product_id" int="0x032d">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x05ca">
+        <match key="usb.product_id" int="0x032f">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x05ca">
         <match key="usb.product_id" int="0x2202">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -1431,6 +1606,13 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x05ca">
+        <match key="usb.product_id" int="0x220c">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x05ca">
         <match key="usb.product_id" int="0x220d">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -1445,12 +1627,40 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x05ca">
+        <match key="usb.product_id" int="0x220f">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x05ca">
         <match key="usb.product_id" int="0x2212">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
           <merge key="camera.access_method" type="string">libgphoto2</merge>
         </match>
       </match>
+      <match key="usb.vendor_id" int="0x05ca">
+        <match key="usb.product_id" int="0x2213">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x05ca">
+        <match key="usb.product_id" int="0x2214">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x05ca">
+        <match key="usb.product_id" int="0x2216">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
       <match key="usb.vendor_id" int="0x05da">
         <match key="usb.product_id" int="0x1006">
           <merge key="info.category" type="string">camera</merge>
@@ -1522,6 +1732,13 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x0797">
+        <match key="usb.product_id" int="0x8001">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x0797">
         <match key="usb.product_id" int="0x801a">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -1668,6 +1885,20 @@
           <merge key="camera.access_method" type="string">libgphoto2</merge>
         </match>
       </match>
+      <match key="usb.vendor_id" int="0x0c45">
+        <match key="usb.product_id" int="0x8000">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x0c45">
+        <match key="usb.product_id" int="0x800a">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
       <match key="usb.vendor_id" int="0x0c77">
         <match key="usb.product_id" int="0x1001">
           <merge key="info.category" type="string">camera</merge>
@@ -1766,6 +1997,13 @@
           <merge key="camera.access_method" type="string">libgphoto2</merge>
         </match>
       </match>
+      <match key="usb.vendor_id" int="0x1004">
+        <match key="usb.product_id" int="0x6005">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
       <match key="usb.vendor_id" int="0x1132">
         <match key="usb.product_id" int="0x4332">
           <merge key="info.category" type="string">camera</merge>
@@ -1830,6 +2068,13 @@
         </match>
       </match>
       <match key="usb.vendor_id" int="0x2770">
+        <match key="usb.product_id" int="0x905c">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x2770">
         <match key="usb.product_id" int="0x9120">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
@@ -1845,6 +2090,34 @@
       </match>
       <match key="usb.vendor_id" int="0x2770">
         <match key="usb.product_id" int="0x9153">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x4102">
+        <match key="usb.product_id" int="0x1113">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x4102">
+        <match key="usb.product_id" int="0x1117">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x4102">
+        <match key="usb.product_id" int="0x1118">
+          <merge key="info.category" type="string">camera</merge>
+	  <append key="info.capabilities" type="strlist">camera</append>
+          <merge key="camera.access_method" type="string">libgphoto2</merge>
+        </match>
+      </match>
+      <match key="usb.vendor_id" int="0x4102">
+        <match key="usb.product_id" int="0x1119">
           <merge key="info.category" type="string">camera</merge>
 	  <append key="info.capabilities" type="strlist">camera</append>
           <merge key="camera.access_method" type="string">libgphoto2</merge>

================================================================
Index: SOURCES/hal-libgphoto_udev.rules
diff -u SOURCES/hal-libgphoto_udev.rules:1.1 SOURCES/hal-libgphoto_udev.rules:1.1.4.1
--- SOURCES/hal-libgphoto_udev.rules:1.1	Tue Jan 10 23:57:48 2006
+++ SOURCES/hal-libgphoto_udev.rules	Mon May 15 00:38:03 2006
@@ -26,6 +26,10 @@
 SYSFS{idVendor}=="0553", SYSFS{idProduct}=="0202", GROUP="usb", MODE="0660"
 # Argus DC-1510
 SYSFS{idVendor}=="2770", SYSFS{idProduct}=="9120", GROUP="usb", MODE="0660"
+# Argus DC-1610
+SYSFS{idVendor}=="093a", SYSFS{idProduct}=="010f", GROUP="usb", MODE="0660"
+# Argus DC-1620
+SYSFS{idVendor}=="093a", SYSFS{idProduct}=="010f", GROUP="usb", MODE="0660"
 # Argus DC-1730
 SYSFS{idVendor}=="2770", SYSFS{idProduct}=="913c", GROUP="usb", MODE="0660"
 # Argus DC-2200
@@ -58,10 +62,14 @@
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30b4", GROUP="usb", MODE="0660"
 # Canon Digital IXUS 500 (PTP mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30b4", GROUP="usb", MODE="0660"
+# Canon Digital IXUS 55 (PTP mode)
+SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30ff", GROUP="usb", MODE="0660"
 # Canon Digital IXUS 700 (normal mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30f2", GROUP="usb", MODE="0660"
 # Canon Digital IXUS 700 (PTP mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30f2", GROUP="usb", MODE="0660"
+# Canon Digital IXUS 750 (PTP mode)
+SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="3116", GROUP="usb", MODE="0660"
 # Canon Digital IXUS i (normal mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="309b", GROUP="usb", MODE="0660"
 # Canon Digital IXUS i (PTP mode)
@@ -126,7 +134,7 @@
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30b4", GROUP="usb", MODE="0660"
 # Canon IXY Digital 55 (normal mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30c1", GROUP="usb", MODE="0660"
-# Canon IXY Digital 60 (normal mode)
+# Canon IXY Digital 600 (normal mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30f2", GROUP="usb", MODE="0660"
 # Canon IXY Digital L2 (normal mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30c4", GROUP="usb", MODE="0660"
@@ -188,6 +196,8 @@
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30b7", GROUP="usb", MODE="0660"
 # Canon PowerShot A400 (PTP mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30b7", GROUP="usb", MODE="0660"
+# Canon PowerShot A410 (PTP mode)
+SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30f9", GROUP="usb", MODE="0660"
 # Canon PowerShot A510 (normal mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30c2", GROUP="usb", MODE="0660"
 # Canon PowerShot A510 (PTP mode)
@@ -198,6 +208,12 @@
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="3074", GROUP="usb", MODE="0660"
 # Canon PowerShot A60 (PTP)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="3074", GROUP="usb", MODE="0660"
+# Canon PowerShot A610 (normal mode)
+SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30fd", GROUP="usb", MODE="0660"
+# Canon PowerShot A610 (PTP mode)
+SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30fd", GROUP="usb", MODE="0660"
+# Canon PowerShot A620 (PTP mode)
+SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30fc", GROUP="usb", MODE="0660"
 # Canon PowerShot A70
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="3073", GROUP="usb", MODE="0660"
 # Canon PowerShot A70 (PTP)
@@ -238,8 +254,6 @@
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="309b", GROUP="usb", MODE="0660"
 # Canon PowerShot Pro90 IS
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="3049", GROUP="usb", MODE="0660"
-# Canon PowerShot S1 IS (normal mode)
-SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="309c", GROUP="usb", MODE="0660"
 # Canon PowerShot S1 IS (PTP mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="309c", GROUP="usb", MODE="0660"
 # Canon PowerShot S10
@@ -308,6 +322,8 @@
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30c0", GROUP="usb", MODE="0660"
 # Canon PowerShot SD400 (normal mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30c1", GROUP="usb", MODE="0660"
+# Canon PowerShot SD450 (PTP mode)
+SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30ff", GROUP="usb", MODE="0660"
 # Canon PowerShot SD500 (normal mode)
 SYSFS{idVendor}=="04a9", SYSFS{idProduct}=="30f2", GROUP="usb", MODE="0660"
 # Canon PowerShot SD500 (PTP mode)
@@ -322,12 +338,16 @@
 SYSFS{idVendor}=="055f", SYSFS{idProduct}=="c200", GROUP="usb", MODE="0660"
 # Che-ez Snap
 SYSFS{idVendor}=="2770", SYSFS{idProduct}=="9120", GROUP="usb", MODE="0660"
+# Che-Ez Snap SNAP-U
+SYSFS{idVendor}=="2770", SYSFS{idProduct}=="905c", GROUP="usb", MODE="0660"
 # Che-ez! Babe
 SYSFS{idVendor}=="0553", SYSFS{idProduct}=="0202", GROUP="usb", MODE="0660"
 # Che-ez! Splash
 SYSFS{idVendor}=="0553", SYSFS{idProduct}=="1002", GROUP="usb", MODE="0660"
 # Che-ez! SPYZ
 SYSFS{idVendor}=="0553", SYSFS{idProduct}=="0202", GROUP="usb", MODE="0660"
+# Clever CAM 360
+SYSFS{idVendor}=="0797", SYSFS{idProduct}=="8001", GROUP="usb", MODE="0660"
 # Concord Eye-Q Duo
 SYSFS{idVendor}=="2770", SYSFS{idProduct}=="9120", GROUP="usb", MODE="0660"
 # Concord Eye-Q Easy
@@ -356,6 +376,12 @@
 SYSFS{idVendor}=="0d64", SYSFS{idProduct}=="1021", GROUP="usb", MODE="0660"
 # DC-N130t
 SYSFS{idVendor}=="2770", SYSFS{idProduct}=="9120", GROUP="usb", MODE="0660"
+# DC31VC
+SYSFS{idVendor}=="0c45", SYSFS{idProduct}=="8000", GROUP="usb", MODE="0660"
+# Digigr8
+SYSFS{idVendor}=="2770", SYSFS{idProduct}=="905c", GROUP="usb", MODE="0660"
+# Digital camera, CD302N
+SYSFS{idVendor}=="093a", SYSFS{idProduct}=="010e", GROUP="usb", MODE="0660"
 # DigitalDream Enigma1.3
 SYSFS{idVendor}=="05da", SYSFS{idProduct}=="1018", GROUP="usb", MODE="0660"
 # DigitalDream l'elegante
@@ -406,6 +432,8 @@
 SYSFS{idVendor}=="0553", SYSFS{idProduct}=="0202", GROUP="usb", MODE="0660"
 # HP PhotoSmart 120 (PTP mode)
 SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="6502", GROUP="usb", MODE="0660"
+# HP PhotoSmart 215
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="6202", GROUP="usb", MODE="0660"
 # HP PhotoSmart 318 (PTP mode)
 SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="6302", GROUP="usb", MODE="0660"
 # HP PhotoSmart 320 (PTP mode)
@@ -438,10 +466,16 @@
 SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="4502", GROUP="usb", MODE="0660"
 # HP PhotoSmart C500
 SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="4102", GROUP="usb", MODE="0660"
+# HP PhotoSmart M23 (PTP mode)
+SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7b02", GROUP="usb", MODE="0660"
 # HP PhotoSmart M307 (PTP mode)
 SYSFS{idVendor}=="03f0", SYSFS{idProduct}=="7302", GROUP="usb", MODE="0660"
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/hal-libgphoto2.fdi?r1=1.1&r2=1.1.4.1&f=u
    http://cvs.pld-linux.org/SOURCES/hal-libgphoto_udev.rules?r1=1.1&r2=1.1.4.1&f=u
    http://cvs.pld-linux.org/SOURCES/hald.sysconfig?r1=1.2&r2=1.2.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/haldaemon.init?r1=1.5&r2=1.5.4.1&f=u



More information about the pld-cvs-commit mailing list