Author: jsmeix Date: Tue Apr 29 12:07:08 2008 New Revision: 47151 URL: http://svn.opensuse.org/viewcvs/yast?rev=47151&view=rev Log: - V 2.16.8 - Skipped "SCSI via USB" scanners in autodetect_scanners (see Novell/Suse Bugzilla bnc#382744). Modified: trunk/scanner/VERSION trunk/scanner/package/yast2-scanner.changes trunk/scanner/tools/autodetect_scanners Modified: trunk/scanner/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/VERSION?rev=47151&r1=47150&r2=47151&view=diff ============================================================================== --- trunk/scanner/VERSION (original) +++ trunk/scanner/VERSION Tue Apr 29 12:07:08 2008 @@ -1 +1 @@ -2.16.7 +2.16.8 Modified: trunk/scanner/package/yast2-scanner.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/package/yast2-scanner.changes?rev=47151&r1=47150&r2=47151&view=diff ============================================================================== --- trunk/scanner/package/yast2-scanner.changes (original) +++ trunk/scanner/package/yast2-scanner.changes Tue Apr 29 12:07:08 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Apr 29 11:52:18 CEST 2008 - jsmeix@suse.de + +- V 2.16.8 +- Skipped "SCSI via USB" scanners in autodetect_scanners + (see Novell/Suse Bugzilla bnc#382744). + +------------------------------------------------------------------- Tue Apr 22 15:27:55 CEST 2008 - jsmeix@suse.de - V 2.16.7 Modified: trunk/scanner/tools/autodetect_scanners URL: http://svn.opensuse.org/viewcvs/yast/trunk/scanner/tools/autodetect_scanners?rev=47151&r1=47150&r2=47151&view=diff ============================================================================== --- trunk/scanner/tools/autodetect_scanners (original) +++ trunk/scanner/tools/autodetect_scanners Tue Apr 29 12:07:08 2008 @@ -102,6 +102,21 @@ USB_VENDOR_ID=$( echo $DESCRIPTION | sed -n -e 's/^.*vendor=\(0x[0-9A-Fa-f][0-9A-Fa-f]*\).*$/\1/p' | tr '[:upper:]' '[:lower:]' ) USB_PRODUCT_ID=$( echo $DESCRIPTION | sed -n -e 's/^.*product=\(0x[0-9A-Fa-f][0-9A-Fa-f]*\).*$/\1/p' | tr '[:upper:]' '[:lower:]' ) fi + # Skip "SCSI via USB" scanners: + # There is a small number of USB scanners which are not talked to via libusb. + # They talk an unusual protocol which is a derivative of usb storage. + # User space should treat them as SCSI scanners. + # See the Novell/Suse Bugzilla bug + # https://bugzilla.novell.com/show_bug.cgi?id=382744 + [ "0x04ce:0x0300" = "$USB_VENDOR_ID:$USB_PRODUCT_ID" ] && continue + [ "0x05da:0x0094" = "$USB_VENDOR_ID:$USB_PRODUCT_ID" ] && continue + [ "0x05da:0x0099" = "$USB_VENDOR_ID:$USB_PRODUCT_ID" ] && continue + [ "0x05da:0x009a" = "$USB_VENDOR_ID:$USB_PRODUCT_ID" ] && continue + [ "0x05da:0x00a0" = "$USB_VENDOR_ID:$USB_PRODUCT_ID" ] && continue + [ "0x05da:0x00a3" = "$USB_VENDOR_ID:$USB_PRODUCT_ID" ] && continue + [ "0x05da:0x80a3" = "$USB_VENDOR_ID:$USB_PRODUCT_ID" ] && continue + [ "0x05da:0x80ac" = "$USB_VENDOR_ID:$USB_PRODUCT_ID" ] && continue + [ "0x05da:0x00b6" = "$USB_VENDOR_ID:$USB_PRODUCT_ID" ] && continue if [ "$CONNECTION" = "SCSI" ] then # For SCSI: Simply use the first word as manufacturer name. # This is a keep-it-simple attempt because a few SCSI scanners -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org