OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=29

sane-backends.changes

@@ -1,5 +1,13 @@
 -------------------------------------------------------------------
-Fri Jan 16 10:43:32 CET 2009 - jsmeix@suse.de
+Fri Jan 23 10:40:21 CET 2009 - jsmeix@suse.de
+
+- Do no longer add a generic entry for SCSI scanners
+  to the HAL fdi file 70-scanner.fdi because this
+  is now provided by the hal package itself
+  (see Novell/Suse Bugzilla bnc#462639 comment #29).
+
+-------------------------------------------------------------------
+Fri Jan 16 12:26:55 CET 2009 - jsmeix@suse.de
 
 - Avoid to suppress falsely found as "unsupported" models
   in 55-libsane.rules and in 70-scanner.fdi

sane-backends.spec

@@ -25,7 +25,7 @@ Group:          Hardware/Scanner
 AutoReqProv:    on
 Summary:        SANE (Scanner Access Now Easy) Scanner Drivers
 Version:        1.0.19
-Release:        100
+Release:        102
 Url:            http://www.sane-project.org/
 # URL for Source0: http://alioth.debian.org/frs/download.php/2318/sane-backends-1.0.19.tar.gz
 Source0:        sane-backends-%{version}.tar.bz2
@@ -498,7 +498,7 @@ sed -i -e 's/^ENV{DEVTYPE}/# ENV{DEVTYPE}/' tools/udev/libsane.rules
 # but works "good" with the "snapscan" backend
 # see https://bugzilla.novell.com/show_bug.cgi?id=439193#c6
 cat /dev/null >unsupportedUSBIDs
-for USBID in $( grep '||[^|]*|0x[0-9A-Fa-f][0-9A-Fa-f]*:0x[0-9A-Fa-f][0-9A-Fa-f]*|unsupported' scanner.database | cut -s -d '|' -f 7 | sort -f -u )
+for USBID in $( grep '||[^|]*|0x[0-9A-Fa-f][0-9A-Fa-f]*:0x[0-9A-Fa-f][0-9A-Fa-f]*|unsupported|' scanner.database | cut -s -d '|' -f 7 | sort -f -u )
 do grep -o "|$USBID|.*|" scanner.database | egrep -q 'complete|good|basic|minimal|untested' || echo $USBID >>unsupportedUSBIDs
 done
 # Ignore case when using sed to avoid possible problems
@@ -510,8 +510,6 @@ done
 install -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/55-libsane.rules
 # Regarding HAL:
 # Modify the generated tools/hal/libsane.fdi file as follows:
-# Add a generic entry for SCSI scanners:
-sed -i -e '/<device>/a<match key="info.category" string="scsi_generic">\n  <match key="@info.parent:scsi.type" string="scanner">\n    <append key="info.capabilities" type="strlist">scanner<\/append>\n  <\/match>\n<\/match>' tools/hal/libsane.fdi
 # Remove 'key="scanner.access_method"' lines.
 sed -i -e '/key="scanner.access_method"/d' tools/hal/libsane.fdi
 # There is a small number of USB scanners which are not talked to via libusb.
@@ -625,6 +623,11 @@ exit 0
 %{_sysconfdir}/udev/rules.d/56-sane-backends-autoconfig.rules
 
 %changelog
+* Fri Jan 23 2009 jsmeix@suse.de
+- Do no longer add a generic entry for SCSI scanners
+  to the HAL fdi file 70-scanner.fdi because this
+  is now provided by the hal package itself
+  (see Novell/Suse Bugzilla bnc#462639 comment #29).
 * Fri Jan 16 2009 jsmeix@suse.de
 - Avoid to suppress falsely found as "unsupported" models
   in 55-libsane.rules and in 70-scanner.fdi