fix Lexmark X1100 (#753489)

This commit is contained in:
Nils Philippsen 2012-01-04 11:01:51 +01:00
parent ac31964e0a
commit 593290e743
2 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From d273b1d34fe3fe7407457499aa1c0bafacae7e7e Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 4 Jan 2012 10:49:02 +0100
Subject: [PATCH] patch: Lexmark-X1100
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Squashed commit of the following:
commit 62bef64fb903a94711eb160d38eaed03ad4b27cc
Author: Stéphane Voltz <stef.dev@free.fr>
Date: Thu Jun 9 22:22:57 2011 +0200
X1100 device regression fix
(cherry picked from commit cef28b4d46a0faa4d4acb60d815ac9a49036ba85)
Conflicts:
ChangeLog
---
backend/lexmark_models.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/backend/lexmark_models.c b/backend/lexmark_models.c
index 0a6d300..7819a8d 100644
--- a/backend/lexmark_models.c
+++ b/backend/lexmark_models.c
@@ -50,6 +50,7 @@ static Lexmark_Model model_list[] = {
"Lexmark X1100", /* name */
"Lexmark", /* vendor */
"X1100/rev. B2", /* model */
+ X1100_MOTOR,
/* X1100 series has 2 sensors */
X1100_B2_SENSOR,
1235, /* first x-coordinate of Home Point */
--
1.7.7.5

View File

@ -8,7 +8,7 @@
Summary: Scanner access software Summary: Scanner access software
Name: sane-backends Name: sane-backends
Version: 1.0.22 Version: 1.0.22
Release: 7%{?dist} Release: 8%{?dist}
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions # lib/ is LGPLv2+, backends are GPLv2+ with exceptions
# Tools are GPLv2+, docs are public domain # Tools are GPLv2+, docs are public domain
# see LICENSE for details # see LICENSE for details
@ -36,6 +36,8 @@ Patch7: sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch
Patch8: sane-backends-1.0.22-epson-stylus-sx125.patch Patch8: sane-backends-1.0.22-epson-stylus-sx125.patch
# submitted upstream: c648a4411e5eacf19da2de726dac06ec07dae302 # submitted upstream: c648a4411e5eacf19da2de726dac06ec07dae302
Patch9: sane-backends-1.0.22-av220-gray-modes.patch Patch9: sane-backends-1.0.22-av220-gray-modes.patch
# backported from upstream: cef28b4d46a0faa4d4acb60d815ac9a49036ba85
Patch10: sane-backends-1.0.22-Lexmark-X1100.patch
URL: http://www.sane-project.org URL: http://www.sane-project.org
BuildRequires: tetex-latex BuildRequires: tetex-latex
@ -125,6 +127,7 @@ This package contains backend drivers to access digital cameras through SANE.
%patch7 -p1 -b .xerox_mfp-fix-usb-devices %patch7 -p1 -b .xerox_mfp-fix-usb-devices
%patch8 -p1 -b .epson-stylus-sx125 %patch8 -p1 -b .epson-stylus-sx125
%patch9 -p1 -b .av220-gray-modes %patch9 -p1 -b .av220-gray-modes
%patch10 -p1 -b .Lexmark-X1100
%build %build
# use PIC/PIE because SANE-enabled software is likely to deal with data coming # use PIC/PIE because SANE-enabled software is likely to deal with data coming
@ -200,6 +203,9 @@ install -m 0644 tools/sane-backends.pc %{buildroot}%{_libdir}/pkgconfig/
%{_libdir}/sane/*gphoto2.so.* %{_libdir}/sane/*gphoto2.so.*
%changelog %changelog
* Wed Jan 04 2012 Nils Philippsen <nils@redhat.com> - 1.0.22-8
- fix Lexmark X1100 (#753489)
* Mon Nov 28 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.0.22-7 * Mon Nov 28 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.0.22-7
- libs shouldn't depends on base package. Properly fix #736310 - libs shouldn't depends on base package. Properly fix #736310
- base package should obsolete -docs as it provides them not -libs - base package should obsolete -docs as it provides them not -libs