[sane-backends] add USB id for Epson Stylus SX125 (#703529)

[Nils Philippsen]

commit 8841d4fd2b0dcfa4fbe4b833fb421d5bb33e85cf
Author: Nils Philippsen <nils at redhat.com>
Date:   Fri Sep 16 14:42:50 2011 +0200

    add USB id for Epson Stylus SX125 (#703529)

 sane-backends-1.0.22-epson-stylus-sx125.patch |   49 +++++++++++++++++++++++++
 sane-backends.spec                            |    4 ++
 2 files changed, 53 insertions(+), 0 deletions(-)
---
diff --git a/sane-backends-1.0.22-epson-stylus-sx125.patch b/sane-backends-1.0.22-epson-stylus-sx125.patch
new file mode 100644
index 0000000..68ea3d4
--- /dev/null
+++ b/sane-backends-1.0.22-epson-stylus-sx125.patch
@@ -0,0 +1,49 @@
+From 8a662d1b7949cf4aba35ae39b404ce06141fea51 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils at redhat.com>
+Date: Fri, 16 Sep 2011 13:18:10 +0200
+Subject: [PATCH] patch: epson-stylus-sx125
+
+Squashed commit of the following:
+
+commit 77cf6ab6058cdb539c8c6bb8cd447a1233a4e7f6
+Author: Nils Philippsen <nils at redhat.com>
+Date:   Fri Sep 16 13:12:30 2011 +0200
+
+    epson2: add USB id for Epson Stylus SX125
+---
+ backend/epson_usb.c          |    1 +
+ doc/descriptions/epson2.desc |    6 ++++++
+ 2 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/backend/epson_usb.c b/backend/epson_usb.c
+index be80326..848ef63 100644
+--- a/backend/epson_usb.c
++++ b/backend/epson_usb.c
+@@ -81,6 +81,7 @@ SANE_Word sanei_epson_usb_product_ids[] = {
+   0x851, /* Stylus NX410 Series, Stylus SX410 Series, Stylus TX410 Series */
+   0x854, /* ME OFFICE 650FN Series, Stylus Office BX310FN Series, Stylus Office TX510FN Series, WorkForce 310 Series */
+   0x856, /* PX-502A, Stylus NX510 Series, Stylus SX510W Series, Stylus TX550W Series */
++  0x85c, /* Stylus SX125 */
+   0				/* last entry - this is used for devices that are specified 
+ 				   in the config file as "usb <vendor> <product>" */
+ };
+diff --git a/doc/descriptions/epson2.desc b/doc/descriptions/epson2.desc
+index da3bdd9..8451afa 100644
+--- a/doc/descriptions/epson2.desc
++++ b/doc/descriptions/epson2.desc
+@@ -1875,6 +1875,12 @@
+ :status     :good
+ :comment    "all-in-one<br>overseas version of the PX-402A"
+ 
++:model      "Stylus SX125"
++:interface  "USB"
++:usbid      "0x04b8" "0x085c"
++:status     :untested
++:comment    "all-in-one"
++
+ :model      "Stylus SX200"
+ :interface  "USB"
+ :usbid      "0x04b8" "0x0849"
+-- 
+1.7.6.1
+
diff --git a/sane-backends.spec b/sane-backends.spec
index 5c8f7a7..7bc3fdb 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -25,6 +25,8 @@ Patch5: sane-backends-1.0.21-SCX4500W.patch
 Patch6: sane-backends-1.0.22-v4l.patch
 # backported from upstream 5ea227caeacd504b64eef301e83fa63e0a25b3f7
 Patch7: sane-backends-1.0.22-xerox_mfp-fix-usb-devices.patch
+# backported from upstream 058f423a302e12196028f218dcb2eca7cc8a250a
+Patch8: sane-backends-1.0.22-epson-stylus-sx125.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
 BuildRequires: tetex-latex
@@ -108,6 +110,7 @@ This package contains backend drivers to access digital cameras through SANE.
 %patch5 -p1 -b .SCX4500W
 %patch6 -p1 -b .v4l
 %patch7 -p1 -b .xerox_mfp-fix-usb-devices
+%patch8 -p1 -b .epson-stylus-sx125
 
 %build
 # use PIC/PIE because SANE-enabled software is likely to deal with data coming
@@ -189,6 +192,7 @@ rm -rf %{buildroot}
 %changelog
 * Fri Sep 16 2011 Nils Philippsen <nils at redhat.com> - 1.0.22-4
 - multilib: always use pkg-config in sane-config (#707910)
+- add USB id for Epson Stylus SX125 (#703529)
 
 * Thu Sep 15 2011 Nils Philippsen <nils at redhat.com> - 1.0.22-4
 - allow installing the libraries without the drivers (#736310): split off