|
 |
3bb0906 |
commit b4b171c4918d39c38d03bafe98bc52684e7927e1
|
|
|
0618c23 |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
3bb0906 |
Date: Mon Jun 22 18:25:01 2009 +0200
|
|
|
0618c23 |
|
|
|
0618c23 |
patch: hal
|
|
|
0618c23 |
|
|
|
0618c23 |
Squashed commit of the following:
|
|
|
0618c23 |
|
|
|
3bb0906 |
commit 5a4809b0c721ac14b8e56064ee3df573e75e0b67
|
|
|
3bb0906 |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
3bb0906 |
Date: Mon Jun 22 18:23:27 2009 +0200
|
|
|
3bb0906 |
|
|
|
3bb0906 |
separate HAL information and policy
|
|
|
3bb0906 |
|
|
|
0618c23 |
commit a50c619ddbb869612e99a9457b1f39492f34b141
|
|
|
0618c23 |
Author: Nils Philippsen <nils@redhat.com>
|
|
|
0618c23 |
Date: Tue Jun 16 15:21:59 2009 +0200
|
|
|
0618c23 |
|
|
|
0618c23 |
adapt HAL fdi files for Fedora
|
|
|
0618c23 |
|
|
|
0618c23 |
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
|
|
0618c23 |
index bd6dd9d..bb26fcb 100644
|
|
|
0618c23 |
--- a/tools/Makefile.am
|
|
|
0618c23 |
+++ b/tools/Makefile.am
|
|
|
0618c23 |
@@ -79,7 +79,7 @@ udev/libsane.rules: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard
|
|
|
0618c23 |
-d 0 > $@
|
|
|
0618c23 |
|
|
|
0618c23 |
hal/libsane.fdi: $(wildcard ${top_srcdir}/doc/descriptions/*.desc) $(wildcard ${top_srcdir}/doc/descriptions-external/*.desc) sane-desc
|
|
|
0618c23 |
- @./sane-desc -m hal -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
|
|
|
0618c23 |
+ @./sane-desc -m hal-new -s ${top_srcdir}/doc/descriptions:${top_srcdir}/doc/descriptions-external \
|
|
|
0618c23 |
-d 0 > $@
|
|
|
0618c23 |
|
|
|
0618c23 |
sane-backends.pc: $(top_builddir)/config.status
|
|
|
3bb0906 |
diff --git a/tools/hal/libsane-policy.fdi b/tools/hal/libsane-policy.fdi
|
|
|
3bb0906 |
new file mode 100644
|
|
|
3bb0906 |
index 0000000..2ac8211
|
|
|
3bb0906 |
--- /dev/null
|
|
|
3bb0906 |
+++ b/tools/hal/libsane-policy.fdi
|
|
|
3bb0906 |
@@ -0,0 +1,11 @@
|
|
|
3bb0906 |
+
|
|
|
3bb0906 |
+<deviceinfo version="0.2">
|
|
|
3bb0906 |
+ <device>
|
|
|
3bb0906 |
+ <match key="info.subsystem" string="usb">
|
|
|
3bb0906 |
+
|
|
|
3bb0906 |
+ <match key="info.capabilities" contains="scanner">
|
|
|
3bb0906 |
+ <append key="info.callouts.add" type="strlist">hal-usb-scanner-add</append>
|
|
|
3bb0906 |
+ </match>
|
|
|
3bb0906 |
+ </match>
|
|
|
3bb0906 |
+ </device>
|
|
|
3bb0906 |
+</deviceinfo>
|
|
|
0618c23 |
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
|
|
|
3bb0906 |
index 600ab03..c317700 100644
|
|
|
0618c23 |
--- a/tools/sane-desc.c
|
|
|
0618c23 |
+++ b/tools/sane-desc.c
|
|
|
0618c23 |
@@ -3667,7 +3667,6 @@ print_hal (int new)
|
|
|
0618c23 |
printf (" -->\n");
|
|
|
0618c23 |
printf (" <match key=\"usb.product_id\" int=\"%s\">\n", usbid->usb_product_id);
|
|
|
0618c23 |
printf (" <append key=\"info.capabilities\" type=\"strlist\">scanner</append>\n");
|
|
|
0618c23 |
- printf (" <merge key=\"scanner.access_method\" type=\"string\">proprietary</merge>\n");
|
|
|
0618c23 |
printf (" </match>\n");
|
|
|
0618c23 |
|
|
|
0618c23 |
usbid = usbid->next;
|