From dd7bdf8fda53aae8af02a7fbd813a670bd7776f4942a65a1a7bfb5ca9ff4bd55 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 14 Jun 2007 14:10:08 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=5

---
 create_hal_global_fdi_for_scanners | 6 +++---
 sane-backends.changes              | 6 ++++++
 sane-backends.spec                 | 7 ++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/create_hal_global_fdi_for_scanners b/create_hal_global_fdi_for_scanners
index 2c85538..07d572d 100644
--- a/create_hal_global_fdi_for_scanners
+++ b/create_hal_global_fdi_for_scanners
@@ -63,9 +63,9 @@ echo
 # Output model specific USB scanner entries:
 exec <$TMP_DATA
 while read VENDOR PRODUCT
-do echo '    <match key="info.category" string="usbraw">'
-   echo "      <match key=\"@info.parent:usb_device.vendor_id\" int=\"$VENDOR\">"
-   echo "        <match key=\"@info.parent:usb_device.product_id\" int=\"$PRODUCT\">"
+do echo '    <match key="info.bus" string="usb_device">'
+   echo "      <match key=\"usb_device.vendor_id\" int=\"$VENDOR\">"
+   echo "        <match key=\"usb_device.product_id\" int=\"$PRODUCT\">"
    echo '          <append key="info.capabilities" type="strlist">scanner</append>'
    echo '        </match>'
    echo '      </match>'
diff --git a/sane-backends.changes b/sane-backends.changes
index 6ecf26c..e541983 100644
--- a/sane-backends.changes
+++ b/sane-backends.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 13 11:50:30 CEST 2007 - jsmeix@suse.de
+
+- Adapted create_hal_global_fdi_for_scanners according to the
+  currently newest changes in HAL (see Suse Bugzilla bug 250659).
+
 -------------------------------------------------------------------
 Wed Jun  6 15:25:26 CEST 2007 - dmueller@suse.de
 
diff --git a/sane-backends.spec b/sane-backends.spec
index b69dff1..261e08e 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -17,7 +17,7 @@ Group:          Hardware/Scanner
 Autoreqprov:    on
 Summary:        SANE (Scanner Access Now Easy) scanner drivers
 Version:        1.0.18
-Release:        36
+Release:        41
 URL:            http://www.sane-project.org/
 # URL for Source0: http://alioth.debian.org/download.php/1669/sane-backends-1.0.18.tar.gz
 Source0:        sane-backends-%{version}.tar.bz2
@@ -73,6 +73,7 @@ Patch6:         fix-ambiguous-post-pre-increment.patch
 Patch100:       canon-backend-autoprobing.patch
 # Patch101 disables the special resmgr support in SANE (resmgr works now via ACLs):
 Patch101:       disable-resmgr-support.patch
+# Patch102 builds libsane-* modules as libtool modules:
 Patch102:       module-build.diff
 # Install into this non-root directory (required when norootforbuild is used):
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -214,6 +215,7 @@ mv po/sane-backends.no.po po/sane-backends.nb.po
 %patch100
 # Patch101 disables the special resmgr support in SANE (resmgr works now via ACLs):
 %patch101
+# Patch102 builds libsane-* modules as libtool modules:
 %patch102
 # Source100... is SUSE specific stuff:
 # Replace hpoj.desc descriptions-external file by our enhanced version:
@@ -343,6 +345,9 @@ exit 0
 %doc %{_mandir}/man8/saned.8.gz
 
 %changelog
+* Wed Jun 13 2007 - jsmeix@suse.de
+- Adapted create_hal_global_fdi_for_scanners according to the
+  currently newest changes in HAL (see Suse Bugzilla bug 250659).
 * Wed Jun 06 2007 - dmueller@suse.de
 - build modules as libtool modules
 * Sat Apr 21 2007 - aj@suse.de