rpms/sane-backends
7
0
Fork 0
Code Issues Pull Requests Releases Activity

add HAL policy for SCSI scanners

Browse Source
This commit is contained in:
Nils Philippsen 2008-02-13 09:20:14 +00:00
parent 6e05df1a17
commit c11668f700
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sane-backends-1.0.19-policykit.patch
View File

@ -1,6 +1,6 @@
diff -up sane-backends-20080206/tools/sane-desc.c.policykit sane-backends-20080206/tools/sane-desc.c diff -up sane-backends-1.0.19/tools/sane-desc.c.policykit sane-backends-1.0.19/tools/sane-desc.c
--- sane-backends-20080206/tools/sane-desc.c.policykit 2007-07-29 20:39:54.000000000 +0200 --- sane-backends-1.0.19/tools/sane-desc.c.policykit 2007-07-29 20:39:54.000000000 +0200
+++ sane-backends-20080206/tools/sane-desc.c 2008-02-07 10:41:07.000000000 +0100 +++ sane-backends-1.0.19/tools/sane-desc.c 2008-02-13 10:18:23.000000000 +0100
@@ -3226,7 +3226,7 @@ print_udev (void) @@ -3226,7 +3226,7 @@ print_udev (void)
} }
} }
@ -10,16 +10,27 @@ diff -up sane-backends-20080206/tools/sane-desc.c.policykit sane-backends-200802
usbid->usb_vendor_id + 2, usbid->usb_product_id + 2); usbid->usb_vendor_id + 2, usbid->usb_product_id + 2);
usbid = usbid->next; usbid = usbid->next;
} }
@@ -3279,7 +3279,7 @@ print_hal (void) @@ -3278,8 +3278,17 @@ print_hal (void)
usbid_type *usbid = create_usbids_table ();
printf ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"); printf ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
printf ("<deviceinfo version=\"0.2\">\n"); printf ("<deviceinfo version=\"0.2\">\n");
printf (" <device>\n"); - printf (" <device>\n");
- printf (" <match key=\"info.bus\" string=\"usb\">\n"); - printf (" <match key=\"info.bus\" string=\"usb\">\n");
+ printf (" <device>\n\n");
+ printf (" <!-- SCSI scanners -->\n");
+ printf (" <match key=\"@info.parent:scsi.type\" string=\"scanner\">\n");
+ printf (" <match key=\"info.category\" string=\"scsi_generic\">\n");
+ printf (" <append key=\"info.capabilities\" type=\"strlist\">access_control</append>\n");
+ printf (" <merge key=\"access_control.file\" type=\"copy_property\">linux.device_file</merge>\n");
+ printf (" <merge key=\"access_control.type\" type=\"string\">scanner</merge>\n");
+ printf (" </match>\n");
+ printf (" </match>\n\n");
+ printf (" <!-- USB scanners -->\n");
+ printf (" <match key=\"info.bus\" string=\"usb_device\">\n"); + printf (" <match key=\"info.bus\" string=\"usb_device\">\n");
while (usbid) while (usbid)
{ {
manufacturer_model_type * name = usbid->name; manufacturer_model_type * name = usbid->name;
@@ -3295,10 +3295,12 @@ print_hal (void) @@ -3295,10 +3304,12 @@ print_hal (void)
i++; i++;
} }
printf (" -->\n"); printf (" -->\n");

5
sane-backends.spec
View File

@ -22,7 +22,7 @@
Summary: Scanner access software Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.0.19 Version: 1.0.19
Release: 2%{?dist} Release: 3%{?dist}
License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
@ -235,6 +235,9 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/sane-backends.pc %{_libdir}/pkgconfig/sane-backends.pc
%changelog %changelog
* Wed Feb 13 2008 Nils Philippsen <nphilipp@redhat.com> - 1.0.19-3
- add HAL policy for SCSI scanners
* Tue Feb 12 2008 Nils Philippsen <nphilipp@redhat.com> - 1.0.19-2 * Tue Feb 12 2008 Nils Philippsen <nphilipp@redhat.com> - 1.0.19-2
- add files missing from CVS to make autoconf work - add files missing from CVS to make autoconf work