Spelling error

4 files changed, 177 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 1f257eb..9dd8311 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ sane-backends (1.1.1-1) UNRELEASED; urgency=medium
       + 0600-scanimage_manpage.patch
     - Refresh patches:
       + 0605-fix_groff-warnings.patch
+      + 0100-source_spelling.patch
+  * Remove *.lintian-overrides.
   * Add home dir for user/group saned.
 
  -- Jörg Frings-Fürst <debian@jff.email>  Tue, 05 Oct 2021 11:56:18 +0200
diff --git a/debian/libsane-common.lintian-overrides b/debian/libsane-common.lintian-overrides
deleted file mode 100644
index cf00b5d..0000000
--- a/debian/libsane-common.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# doc/gt68xx/gt68xx.CHANGES:442:- Added "afe" option for gt68xx.conf for selecting default afe values.
-#
-libsane-common: typo-in-manual-page usr/share/man/man5/sane-gt68xx.5.gz afe safe
diff --git a/debian/libsane1.lintian-overrides b/debian/libsane1.lintian-overrides
deleted file mode 100644
index e97ea9a..0000000
--- a/debian/libsane1.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# doc/gt68xx/gt68xx.CHANGES:442:- Added "afe" option for gt68xx.conf for selecting default afe values.
-#
-libsane1: spelling-error-in-binary usr/lib/*/sane/libsane-artec_eplus48u.so.1.1.1 afe safe
-libsane1: spelling-error-in-binary usr/lib/*/sane/libsane-canon_dr.so.1.1.1 afe safe
-libsane1: spelling-error-in-binary usr/lib/*/sane/libsane-gt68xx.so.1.1.1 afe safe
-
diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index eec6798..6bf41f1 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -17,3 +17,178 @@ Index: trunk/backend/epsonds-jpeg.c
  
  		// abandon unncessary data
  		if ((JDIMENSION)sum < jpeg_cinfo.output_height)
+Index: trunk/frontend/jpegtopdf.c
+===================================================================
+--- trunk.orig/frontend/jpegtopdf.c
++++ trunk/frontend/jpegtopdf.c
+@@ -285,7 +285,7 @@ SANE_Int sane_pdf_start_doc( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -326,7 +326,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -346,7 +346,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 			goto EXIT;
+ 		}
+ 		if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-			fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++			fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 			goto EXIT;
+ 		}
+ 
+@@ -360,7 +360,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -376,7 +376,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -386,7 +386,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( _get_current_time( &tm, &sign_c, &tz_h, &tz_m ) == SANE_ERR ) {
+-		fprintf ( stderr, " Error is occured in _get_current_time.\n" );
++		fprintf ( stderr, " Error is occurred in _get_current_time.\n" );
+ 		goto EXIT;
+ 	}
+ 	/* Dates format */
+@@ -404,7 +404,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -420,7 +420,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -434,7 +434,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 	w_count += SANE_PDF_FIRST_PAGE_ID - 1;
+@@ -450,7 +450,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 				goto EXIT;
+ 			}
+ 			if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-				fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++				fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 				goto EXIT;
+ 			}
+ 			w_count ++;
+@@ -472,7 +472,7 @@ SANE_Int sane_pdf_end_doc( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -568,7 +568,7 @@ SANE_Int sane_pdf_start_page(
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -586,7 +586,7 @@ SANE_Int sane_pdf_start_page(
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 	/* write Contents(2) */
+@@ -598,7 +598,7 @@ SANE_Int sane_pdf_start_page(
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -609,7 +609,7 @@ SANE_Int sane_pdf_start_page(
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -627,7 +627,7 @@ SANE_Int sane_pdf_start_page(
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -648,7 +648,7 @@ SANE_Int sane_pdf_start_page(
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -680,7 +680,7 @@ SANE_Int sane_pdf_end_page( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+ 
+@@ -698,7 +698,7 @@ SANE_Int sane_pdf_end_page( void *pw )
+ 		goto EXIT;
+ 	}
+ 	if ( ( ldata = re_write_if_fail( pwork->fd, str, len ) ) < 0 ) {
+-		fprintf ( stderr, " Error is occured in re_write_if_fail.\n" );
++		fprintf ( stderr, " Error is occurred in re_write_if_fail.\n" );
+ 		goto EXIT;
+ 	}
+