Hello community, here is the log from the commit of package sane-backends checked in at Mon Apr 21 02:32:20 CEST 2008. -------- --- sane-backends/sane-backends.changes 2008-04-11 14:44:33.000000000 +0200 +++ sane-backends/sane-backends.changes 2008-04-17 13:13:08.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Apr 17 12:24:22 CEST 2008 - jsmeix@suse.de + +- Use info.subsystem instead of the deprecated info.bus + for the HAL 70-scanner.fdi file. +- Changed create_sane-backends-autoconfig.rules to ignore + the INTERFACE field because it could be empty or arbitrary + stuff like "Parport USB" or "SCSI USB IEEE-1394". + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sane-backends.spec ++++++ --- /var/tmp/diff_new_pack.xh9796/_old 2008-04-21 02:31:55.000000000 +0200 +++ /var/tmp/diff_new_pack.xh9796/_new 2008-04-21 02:31:55.000000000 +0200 @@ -18,7 +18,7 @@ AutoReqProv: on Summary: SANE (Scanner Access Now Easy) Scanner Drivers Version: 1.0.19 -Release: 26 +Release: 31 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 @@ -422,12 +422,12 @@ # 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 -# Replace 'key="info.bus" string="usb"' by 'key="info.bus" string="usb_device"', +# Replace 'key="info.bus" string="usb"' by 'key="info.subsystem" string="usb_device"', # and replace 'key="usb.vendor_id"' by 'key="usb_device.vendor_id"', # and replace 'key="usb.product_id"' by 'key="usb_device.product_id"', # see the Novell/Suse Bugzilla bug # https://bugzilla.novell.com/show_bug.cgi?id=250659 -sed -i -e '/key="info.bus"/s/string="usb"/string="usb_device"/' tools/hal/libsane.fdi +sed -i -e 's/key="info.bus" string="usb"/key="info.subsystem" string="usb_device"/' tools/hal/libsane.fdi sed -i -e 's/key="usb.vendor_id"/key="usb_device.vendor_id"/' tools/hal/libsane.fdi sed -i -e 's/key="usb.product_id"/key="usb_device.product_id"/' tools/hal/libsane.fdi # Remove 'key="scanner.access_method"' lines. @@ -534,6 +534,12 @@ %{_sysconfdir}/udev/rules.d/56-sane-backends-autoconfig.rules %changelog +* Thu Apr 17 2008 jsmeix@suse.de +- Use info.subsystem instead of the deprecated info.bus + for the HAL 70-scanner.fdi file. +- Changed create_sane-backends-autoconfig.rules to ignore + the INTERFACE field because it could be empty or arbitrary + stuff like "Parport USB" or "SCSI USB IEEE-1394". * Fri Apr 11 2008 jsmeix@suse.de - Updated epkowa.desc from the current Iscan version 2.10.0.1. - Replaced hpaio.desc which is currently messed up in HPLIP ++++++ create_sane-backends-autoconfig.rules ++++++ --- sane-backends/create_sane-backends-autoconfig.rules 2008-03-13 13:11:07.000000000 +0100 +++ sane-backends/create_sane-backends-autoconfig.rules 2008-04-17 13:13:39.000000000 +0200 @@ -19,8 +19,9 @@ # Extract only those USB scanners # which are supported by the packages "sane-backends", "iscan-free", or "hplip" # (i.e. not by the proprietary 32-bit-only i386-only "iscan" package) -# and where the USB-ID is known # and which do not require firmware upload (i.e. FIRMWARE field is empty) +# (the INTERFACE field does not matter because it could be empty or stuff like "Parport USB" or "SCSI USB IEEE-1394") +# and where the USB-ID is known (i.e. '0x[0-9A-Fa-f][0-9A-Fa-f]*:0x[0-9A-Fa-f][0-9A-Fa-f]*') # and where the support status is "complete" or "good" (i.e. skip "basic", "minimal", "untested", "unsupported") # and keep only the fields of interest (i.e. BACKEND and USBID) # and keep only unique lines (there are many duplicates among the fields of interest) @@ -29,7 +30,7 @@ # because otherwise a scanner will show up multiple times in scanning frontends # (once for each activated driver which works for this model) # and finally set the usual input field separator ' ' (there are no blanks in BACKEND or USB-ID): -bash create_scanner_database ASCII | egrep '^sane-backends|^iscan-free|^hplip' | grep '||USB|0x[0-9A-Fa-f][0-9A-Fa-f]*:0x[0-9A-Fa-f][0-9A-Fa-f]*|' | cut -s -d '|' -f 2,7,8 | egrep 'complete$|good$' | cut -s -d '|' -f 1,2 | sort -u | sort -t '|' -k 2 | tr '|' ' ' >$TMP_DATA +bash create_scanner_database ASCII | egrep '^sane-backends|^iscan-free|^hplip' | grep '||[^|]*|0x[0-9A-Fa-f][0-9A-Fa-f]*:0x[0-9A-Fa-f][0-9A-Fa-f]*|' | cut -s -d '|' -f 2,7,8 | egrep 'complete$|good$' | cut -s -d '|' -f 1,2 | sort -u | sort -t '|' -k 2 | tr '|' ' ' >$TMP_DATA # Output: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org