commit 91cbd80ad6f86af2d5696caeab2be0c404c4663c
Author: Nils Philippsen <nils@redhat.com>
Date:   Thu Oct 22 14:29:41 2009 +0200

    patch: udev
    
    Squashed commit of the following:
    
    commit e385558cf214d263af93147995f1f8b729d2dabe
    Author: Nils Philippsen <nils@redhat.com>
    Date:   Thu Oct 22 14:19:53 2009 +0200
    
        fix device file ownership and mode
    
    commit fe874d6f9873598e8bcd9201508bc2c89365e821
    Author: Nils Philippsen <nils@redhat.com>
    Date:   Thu Oct 22 11:16:16 2009 +0200
    
        adapt generated udev rules for Fedora

diff --git a/tools/sane-desc.c b/tools/sane-desc.c
index c317700..07f3a2b 100644
--- a/tools/sane-desc.c
+++ b/tools/sane-desc.c
@@ -56,9 +56,9 @@
 #define COLOR_NEW          "\"#F00000\""
 #define COLOR_UNKNOWN      "\"#000000\""
 
-#define DEVMODE  "0664"
+#define DEVMODE  "0644"
 #define DEVOWNER "root"
-#define DEVGROUP "scanner"
+#define DEVGROUP "root"
 
 #ifndef PATH_MAX
 # define PATH_MAX 1024
@@ -3475,8 +3475,8 @@ print_udev (void)
 	    }
 	}
       printf ("\n");
-      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
-	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVGROUP);
+      printf ("ATTR{idVendor}==\"%s\", ATTR{idProduct}==\"%s\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
+	      usbid->usb_vendor_id + 2,  usbid->usb_product_id + 2, DEVMODE, DEVOWNER, DEVGROUP);
       usbid = usbid->next;
     }
 
@@ -3488,7 +3488,8 @@ print_udev (void)
   printf ("SUBSYSTEMS!=\"scsi\", GOTO=\"libsane_scsi_rules_end\"\n\n");
   printf ("LABEL=\"libsane_scsi_rules_begin\"\n");
   printf ("# Generic: SCSI device type 6 indicates a scanner\n");
-  printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"6\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
+  printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"6\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
+          DEVMODE, DEVOWNER, DEVGROUP);
   printf ("# Some scanners advertise themselves as SCSI device type 3\n");
 
   while (scsiid)
@@ -3521,8 +3522,8 @@ print_udev (void)
 	    }
         }
       printf ("\n");
-      printf ("KERNEL==\"sg[0-9]*\", NAME=\"%%k\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", GROUP=\"%s\"\n",
-	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVGROUP);
+      printf ("KERNEL==\"sg[0-9]*\", ATTRS{type}==\"3\", ATTRS{vendor}==\"%s\", ATTRS{model}==\"%s\", MODE=\"%s\", OWNER=\"%s\", GROUP=\"%s\", ENV{libsane_matched}=\"yes\"\n",
+	      scsiid->scsi_vendor_id, scsiid->scsi_product_id, DEVMODE, DEVOWNER, DEVGROUP);
       scsiid = scsiid->next;
     }
   printf ("LABEL=\"libsane_scsi_rules_end\"\n\n");