rpms/sane-backends/FC-5 sane-backends-1.0.17-newmodels.patch, NONE, 1.1 sane-backends.spec, 1.59, 1.60

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/sane-backends/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19494

Modified Files:
	sane-backends.spec 
Added Files:
	sane-backends-1.0.17-newmodels.patch 
Log Message:
add support for Canon Lide 60 scanner (#189726)


sane-backends-1.0.17-newmodels.patch:
 libsane.usermap |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE sane-backends-1.0.17-newmodels.patch ---
--- sane-backends-1.0.17/tools/hotplug/libsane.usermap.newmodels	2005-12-06 16:12:36.000000000 +0100
+++ sane-backends-1.0.17/tools/hotplug/libsane.usermap	2006-04-25 13:49:57.000000000 +0200
@@ -225,6 +225,8 @@
 libusbscanner             0x0003      0x04a9   0x2213    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Canon Inc.|CanoScan 3000
 libusbscanner             0x0003      0x04a9   0x2215    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
+# Canon Inc.|LIDE 60
+libusbscanner             0x0003      0x04a9   0x221c    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Canon Inc.|LIDE 25
 libusbscanner             0x0003      0x04a9   0x2220    0x0000       0x0000       0x00         0x00            0x00            0x00            0x00               0x00               0x00000000
 # Canon Inc.|FS4000US


Index: sane-backends.spec
===================================================================
RCS file: /cvs/dist/rpms/sane-backends/FC-5/sane-backends.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- sane-backends.spec	5 Apr 2006 08:34:27 -0000	1.59
+++ sane-backends.spec	25 Apr 2006 13:20:52 -0000	1.60
@@ -4,14 +4,15 @@
 Summary: Scanner access software
 Name: sane-backends
 Version: 1.0.17
-Release: 5.fc5.8
+Release: 5.fc5.9
 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs)
 Group: System Environment/Libraries
 Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1: sane.png
 Patch1: sane-backends-1.0.11-rpath.patch
-Patch3: sane-backends-1.0.12-badcode.patch
-Patch5: sane-backends-multilib.patch
+Patch2: sane-backends-1.0.12-badcode.patch
+Patch3: sane-backends-multilib.patch
+Patch4: sane-backends-1.0.17-newmodels.patch
 URL: http://www.sane-project.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
 BuildRequires: tetex-latex libusb-devel libieee1284-devel libjpeg-devel
@@ -65,8 +66,9 @@
 %setup -q
 
 %patch1 -p1 -b .rpath
-%patch3 -p1 -b .badcode
-%patch5 -p1 -b .multilib
+%patch2 -p1 -b .badcode
+%patch3 -p1 -b .multilib
+%patch4 -p1 -b .newmodels
 
 # Fix bug #62847.
 perl -pi -e 's,/dev/usbscanner0?,/dev/usb/scanner0,' backend/*.conf
@@ -155,7 +157,10 @@
 %{_docdir}/%{name}-%{version}/sane.ps
 
 %changelog
-* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-5.fc5.8
+* Tue Apr 25 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-5.fc5.9
+- add support for Canon Lide 60 scanner (#189726)
+
+* Wed Apr 05 2006 Nils Philippsen <nphilipp at redhat.com> 1.0.17-8
 - don't use automake
 
 * Tue Apr 04 2006 Nils Philippsen <nphilipp at redhat.com>