Yesterday's patch was broken

Package-Manager: portage-2.0.51.22-r2

diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog
index 8d1a6eedc2e4e9320536764606f6da1c03e00e46..a53248e26150abb84164b0882aefed54d0d0a60a 100644 (file)
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.83 2005/11/03 19:25:16 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.84 2005/11/04 14:58:08 phosphan Exp $
+
+  04 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> files/sm3600usb.patch:
+  Yesterday's patch was broken
 
   03 Nov 2005; Patrick Kursawe <phosphan@gentoo.org> +files/sm3600usb.patch,
   sane-backends-1.0.16-r4.ebuild:

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index c5c5efa7bc86d70e7ede2fe14766dd2885990c18..1f7f465aa5eddda12701f2ce45a00734d0ca01ba 100644 (file)
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -6,7 +6,7 @@ MD5 4c8053c87e31c8209998ba49c07d60a5 sane-backends-1.0.13-r3.ebuild 1717
 MD5 61d573be9593ba3be2da335586ac7eb2 sane-backends-1.0.16-r1.ebuild 3743
 MD5 54cad14b24bc825f61130e50ea2238f8 sane-backends-1.0.16-r3.ebuild 4300
 MD5 e73a3bf54c049342701898a62ea3b301 sane-backends-1.0.15-r1.ebuild 2674
-MD5 76490e6523bef75b9e13a15352a2a5e4 ChangeLog 14482
+MD5 183b4508c1533a469deba3d4359dec58 ChangeLog 14590
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 d04dce955a1bf3c5436bc517f2e2070c sane-backends-1.0.15-r3.ebuild 3973
 MD5 365f695ec2c079ac06dd5bbf495f87ce files/linux_sg3_err.h 4894
@@ -26,4 +26,4 @@ MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r3 151
 MD5 d5d1e4a4c8d3839c16329c105f2580d3 files/digest-sane-backends-1.0.16-r4 151
 MD5 0bc1f6b8682b5585c8e87a325f983ade files/lide25.patch 5565
 MD5 83640d1e7caa2aa50c676d40b64866c7 files/digest-sane-backends-1.0.15 157
-MD5 3652ef56daf0fb012f665c1de7a5a3f9 files/sm3600usb.patch 7324
+MD5 0d7d02f55a848d8e6a19a3aef9e058cd files/sm3600usb.patch 8210

diff --git a/media-gfx/sane-backends/files/sm3600usb.patch b/media-gfx/sane-backends/files/sm3600usb.patch
index 52909c42b1f5c481778e06128653d9b838045a63..6871e21d4ba808ecd9c3d538fa6a92f0e87b2036 100644 (file)
--- a/media-gfx/sane-backends/files/sm3600usb.patch
+++ b/media-gfx/sane-backends/files/sm3600usb.patch
@@ -1,3 +1,9 @@
+Index: sm3600.c
+===================================================================
+RCS file: /cvsroot/sane/sane-backends/backend/sm3600.c,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
 --- backend/sm3600.c   3 Jul 2005 13:35:48 -0000       1.13
 +++ backend/sm3600.c   16 Aug 2005 19:50:34 -0000      1.14
 @@ -55,24 +55,25 @@
@@ -182,6 +188,12 @@
      }
    ResetCalibration(this); /* release calibration data */
    /* unlink active device entry */
+Index: sm3600.h
+===================================================================
+RCS file: /cvsroot/sane/sane-backends/backend/sm3600.h,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -r1.10 -r1.11
 --- backend/sm3600.h   30 Apr 2004 21:02:04 -0000      1.10
 +++ backend/sm3600.h   16 Aug 2005 19:50:34 -0000      1.11
 @@ -190,7 +190,7 @@
@@ -193,6 +205,12 @@
    FILE              *fhLog;
    FILE              *fhScan;
    int                ichPageBuffer; /* write position in full page buffer */
+Index: sm3600-scanusb.c
+===================================================================
+RCS file: /cvsroot/sane/sane-backends/backend/sm3600-scanusb.c,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -r1.11 -r1.12
 --- backend/sm3600-scanusb.c   15 Apr 2004 21:06:58 -0000      1.11
 +++ backend/sm3600-scanusb.c   16 Aug 2005 19:50:34 -0000      1.12
 @@ -43,7 +43,7 @@
@@ -274,6 +292,12 @@
      }
    dprintf(DEBUG_COMM,"writing %d bytes\n",cchRead);
    
+Index: sm3600-scanutil.c
+===================================================================
+RCS file: /cvsroot/sane/sane-backends/backend/sm3600-scanutil.c,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -r1.11 -r1.12
 --- backend/sm3600-scanutil.c  15 Apr 2004 21:06:58 -0000      1.11
 +++ backend/sm3600-scanutil.c  16 Aug 2005 19:50:34 -0000      1.12
 @@ -43,10 +43,11 @@