Accepting request 55343 from home:jsmeix:branches:graphics

Fixed bnc#658017 (xerox_mfp works only black and white)
-This line, and those below, will be ignored--

OBS-URL: https://build.opensuse.org/request/show/55343
OBS-URL: https://build.opensuse.org/package/show/graphics/sane-backends?expand=0&rev=33

fix-xerox_mfp-color-mode.patch

@@ -0,0 +1,10 @@
+--- backend/xerox_mfp.c.orig	2010-04-05 15:18:05.000000000 +0200
++++ backend/xerox_mfp.c	2010-12-09 11:13:16.000000000 +0100
+@@ -386,6 +386,7 @@ static int doc_source_to_code[] = {
+ 
+ static SANE_String_Const scan_modes[] = {
+   SANE_VALUE_SCAN_MODE_LINEART,
++  SANE_VALUE_SCAN_MODE_HALFTONE,
+   SANE_VALUE_SCAN_MODE_GRAY,
+   SANE_VALUE_SCAN_MODE_COLOR,
+   NULL

sane-backends.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Dec  9 11:48:58 CET 2010 - jsmeix@suse.de
+
+- fix-xerox_mfp-color-mode.patch adds SANE_VALUE_SCAN_MODE_HALFTONE
+  in xerox_mfp.c to fix a regression in sane-backends-1.0.21
+  where the xerox_mfp works only in grayscale mode
+  (see openSUSE/Novell Bugzilla bnc#658017).
+- Updated models.dat to the one from the current hplip-3.10.9.
+
 -------------------------------------------------------------------
 Wed Sep 22 14:08:26 CEST 2010 - jsmeix@suse.de
 

sane-backends.spec

@@ -47,7 +47,7 @@ Source102:      sane.reg
 # Source104 was our hpaio.desc file which was derived from scan/sane/hpaio.desc from the hplip sources
 # but as scan/sane/hpaio.desc was completely messed up Source104 is now dropped and we
 # create our hpaio.desc file directly from the models.dat file of HPLIP via Source109 and Source110.
-# Original iscan descriptions-external file for the epkowa backend (provided by the package iscan-free).
+# Source105 is the original iscan descriptions-external file for the epkowa backend.
 # This file is based on a copy of doc/epkowa.desc in the sources of our iscan-free package.
 # Meanwhile there is a newer epkowa.desc in the sources of this sane-backends package.
 # Only the missing models from the newer epkowa.desc which require proprietary software
@@ -129,6 +129,10 @@ Patch14:        sane-backends-1.0.21-i18n.patch
 # wherever the create_range function is called
 # see https://alioth.debian.org/tracker/index.php?func=detail&aid=312492&group_id=30186&atid=410366
 Patch15:        fix-genesys-create_range-type.patch
+# Patch16 fix-xerox_mfp-color-mode.patch adds SANE_VALUE_SCAN_MODE_HALFTONE in xerox_mfp.c
+# to fix a regression in sane-backends-1.0.21 where the xerox_mfp works only in grayscale mode
+# see https://bugzilla.novell.com/show_bug.cgi?id=658017
+Patch16:        fix-xerox_mfp-color-mode.patch
 # Patch100... is SUSE specific stuff:
 # Patch100 lets the "canon" backend do scanner auto-recognition:
 Patch100:       canon-backend-autoprobing.patch
@@ -344,6 +348,8 @@ Authors:
 %patch10
 # Patch15 lets in genesys.c the create_range function be of type 'SANE_Range *':
 %patch15
+# Patch16 adds SANE_VALUE_SCAN_MODE_HALFTONE in xerox_mfp.c:
+%patch16
 # Patch100... is SUSE specific stuff:
 # Patch100 lets the "canon" backend do scanner auto-recognition:
 %patch100