From 36b49d77c9e6a36b8fd291a8f3af3a953e249971 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 3 Nov 2010 17:58:21 +0100
Subject: [PATCH] xerox_mfp: correct color mode malfunction (#614949)

---
 ...backends-1.0.21-xerox-mfp-color-mode.patch | 34 +++++++++++++++++++
 sane-backends.spec                            |  6 ++++
 2 files changed, 40 insertions(+)
 create mode 100644 sane-backends-1.0.21-xerox-mfp-color-mode.patch

diff --git a/sane-backends-1.0.21-xerox-mfp-color-mode.patch b/sane-backends-1.0.21-xerox-mfp-color-mode.patch
new file mode 100644
index 0000000..5c39097
--- /dev/null
+++ b/sane-backends-1.0.21-xerox-mfp-color-mode.patch
@@ -0,0 +1,34 @@
+From 609312a68d12033ba4c9da4638b16e664f2efe28 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Wed, 3 Nov 2010 15:46:08 +0100
+Subject: [PATCH] patch: xerox-mfp-color-mode
+
+Squashed commit of the following:
+
+commit 7962d7e7757e2b7b7ef64e17ee921af2f8df193d
+Author: Alex Belkin <abc@telekom.ru>
+Date:   Mon May 3 04:28:47 2010 +0400
+
+    Corrected color mode malfunction.
+
+    Bug was introduced by mass change to SANE_VALUE macro, (commit ff048f41760c74e67dfea36a079c71fdb72bbf4c).
+    (cherry picked from commit 043cc4b1651fe602f1b7fb58e6592bd3bef0f4ac)
+---
+ backend/xerox_mfp.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
+index cda6e82..e6ede0d 100644
+--- a/backend/xerox_mfp.c
++++ b/backend/xerox_mfp.c
+@@ -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
+-- 
+1.7.3.2
+
diff --git a/sane-backends.spec b/sane-backends.spec
index f55120d..738d78b 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -18,6 +18,7 @@ Patch4: sane-backends-1.0.21-man-encoding.patch
 Patch5: sane-backends-1.0.21-epson-expression800.patch
 Patch6: sane-backends-1.0.20-lockdir.patch
 Patch7: sane-backends-1.0.21-docs-utf8.patch
+Patch8: sane-backends-1.0.21-xerox-mfp-color-mode.patch
 # may need rebuilding if one of the above changes:
 Patch100: sane-backends-1.0.21-automake.patch
 URL: http://www.sane-project.org
@@ -87,6 +88,8 @@ want to access digital cameras.
 %patch5 -p1 -b .epson-expression800
 %patch6 -p1 -b .lockdir
 %patch7 -p1 -b .docs-utf8
+%patch8 -p1 -b .xerox-mfp-color-mode
+
 %patch100 -p1 -b .automake
 
 %build
@@ -162,6 +165,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/sane-backends.pc
 
 %changelog
+* Wed Nov 03 2010 Nils Philippsen <nils@redhat.com>
+- xerox_mfp: correct color mode malfunction (#614949)
+
 * Fri Jun 25 2010 Nils Philippsen <nils@redhat.com> - 1.0.21-3
 - build with -fno-strict-aliasing
 - use PIC/PIE because SANE-enabled software is likely to deal with data coming