From ffc9bdece4ee265c672729fe7e6ea2e455efa0b039036b4a0323851332a3dbd0 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 21 Apr 2008 00:32:22 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sane-backends?expand=0&rev=19 --- create_sane-backends-autoconfig.rules | 5 +++-- sane-backends.changes | 9 +++++++++ sane-backends.spec | 12 +++++++++--- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/create_sane-backends-autoconfig.rules b/create_sane-backends-autoconfig.rules index 179204e..13abb6a 100644 --- a/create_sane-backends-autoconfig.rules +++ b/create_sane-backends-autoconfig.rules @@ -19,8 +19,9 @@ TMP_DATA=$(mktemp /tmp/$MY_NAME.XXXXXX) || { echo "Error: Failed to make a tempo # 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 @@ TMP_DATA=$(mktemp /tmp/$MY_NAME.XXXXXX) || { echo "Error: Failed to make a tempo # 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: diff --git a/sane-backends.changes b/sane-backends.changes index 4481596..e52019e 100644 --- a/sane-backends.changes +++ b/sane-backends.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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". + ------------------------------------------------------------------- Fri Apr 11 14:40:50 CEST 2008 - jsmeix@suse.de diff --git a/sane-backends.spec b/sane-backends.spec index c068aac..f198d74 100644 --- a/sane-backends.spec +++ b/sane-backends.spec @@ -18,7 +18,7 @@ Group: Hardware/Scanner 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 @@ install -m644 tools/udev/libsane.rules %{buildroot}%{_sysconfdir}/udev/rules.d/5 # Modify the generated tools/hal/libsane.fdi file as follows: # Add a generic entry for SCSI scanners: sed -i -e '//a\n \n 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 @@ exit 0 %{_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