refresh d/p/0100-source_spelling.patch

3 files changed, 83 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 9e53ed2..0e80c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,7 @@ sane-backends (1.0.25-3) unstable; urgency=medium
     - Bump version to 4 (no changes required).
   * debian/control:
     - Bump Standards-Version to 3.9.8 (no changes required).
-    - Change Vcs-* to secure uri.
+    - Change Vcs-Browser to secure uri.
   * Add year 2016 to debian/* at debian/copyright.
   * New debian/patches/0135-saned-remotescanners.patch to report
     network-attached devices (Closes: #821255).
@@ -30,7 +30,7 @@ sane-backends (1.0.25-3) unstable; urgency=medium
     Thanks to Chris Lamb <lamby@debian.org>.
   * Remove unused lintian overrides.
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 18 Jun 2016 05:47:21 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 22 Aug 2016 04:51:15 +0200
 
 sane-backends (1.0.25-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 678b583..79d00c6 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends:
  xutils-dev
 Testsuite: autopkgtest
 Homepage: http://www.sane-project.org
-Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/sane-backends.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/sane-backends.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/sane-backends.git
 
 Package: sane-utils
diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index 295df1d..61afc85 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -1,6 +1,6 @@
 Description: Correct source typos
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Last-Update: 2016-08-21
+Last-Update: 2016-10-14
 ----
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/backend/hp-scl.c
@@ -262,6 +262,15 @@ Index: trunk/backend/umax.c
    DBG_inq_nz(" - linked commands\n",  get_inquiry_scsi_linked(inquiry_block));
    DBG_inq_nz(" - (reserved)\n",       get_inquiry_scsi_R(inquiry_block));
    DBG_inq_nz(" - command queueing\n", get_inquiry_scsi_cmdqueue(inquiry_block));
+@@ -526,7 +526,7 @@ static void umax_print_inquiry(Umax_Devi
+   DBG_inq_nz(" + ADF: no paper\n",			get_inquiry_ADF_no_paper(inquiry_block));
+   DBG_inq_nz(" + ADF: cover open\n",			get_inquiry_ADF_cover_open(inquiry_block));
+   DBG_inq_nz(" + ADF: paper jam\n",			get_inquiry_ADF_paper_jam(inquiry_block));
+-  DBG_inq_nz(" - unknwon flag; 0x63 bit 3\n",		get_inquiry_0x63_bit3(inquiry_block));
++  DBG_inq_nz(" - unknown flag; 0x63 bit 3\n",		get_inquiry_0x63_bit3(inquiry_block));
+   DBG_inq_nz(" - unknown lfag: 0x63 bit 4\n",		get_inquiry_0x63_bit4(inquiry_block));
+   DBG_inq_nz(" - lens calib in doc pos\n",		get_inquiry_lens_cal_in_doc_pos(inquiry_block));
+   DBG_inq_nz(" - manual focus\n",			get_inquiry_manual_focus(inquiry_block));
 @@ -7624,7 +7624,7 @@ SANE_Status sane_start(SANE_Handle handl
      /* of the x-origin defined by the scanner`s inquiry */
      if (scanner->device->dor != 0) /* dor mode active */
@@ -297,6 +306,24 @@ Index: trunk/backend/umax_pp_low.c
        file = open (devices[i], O_RDWR);
        if (file < 0)
  	{
+@@ -1095,7 +1095,7 @@ sanei_umax_pp_initPort (int port, char *
+ 		  if (rc)
+ 		    {
+ 		      DBG (16,
+-			   "umax_pp: ppdev couldn't negociate mode IEEE1284_MODE_EPP for '%s' (ignored)\n",
++			   "umax_pp: ppdev couldn't negotiate mode IEEE1284_MODE_EPP for '%s' (ignored)\n",
+ 			   name);
+ 		    }
+ 		  if (ioctl (fd, PPSETMODE, &mode))
+@@ -1121,7 +1121,7 @@ sanei_umax_pp_initPort (int port, char *
+ 		  if (rc)
+ 		    {
+ 		      DBG (16,
+-			   "umax_pp: ppdev couldn't negociate mode IEEE1284_MODE_ECP for '%s' (ignored)\n",
++			   "umax_pp: ppdev couldn't negotiate mode IEEE1284_MODE_ECP for '%s' (ignored)\n",
+ 			   name);
+ 		    }
+ 		  if (ioctl (fd, PPSETMODE, &mode))
 Index: trunk/backend/apple.c
 ===================================================================
 --- trunk.orig/backend/apple.c
@@ -319,3 +346,55 @@ Index: trunk/backend/apple.c
  	  s->AbortedByUser = SANE_FALSE;
  	  sanei_scsi_cmd (s->fd, test_unit_ready,
  				sizeof (test_unit_ready), 0, 0);
+Index: trunk/backend/pixma_bjnp.c
+===================================================================
+--- trunk.orig/backend/pixma_bjnp.c
++++ trunk/backend/pixma_bjnp.c
+@@ -1666,7 +1666,7 @@ bjnp_allocate_device (SANE_String_Const
+     {
+       PDBG (bjnp_dbg
+ 	    (LOG_CRIT,
+-	     "bjnp_allocate_device: ERROR - URI may not contain userid, password or aguments: %s\n",
++	     "bjnp_allocate_device: ERROR - URI may not contain userid, password or arguments: %s\n",
+ 	     devname));
+ 
+       return BJNP_STATUS_INVAL;
+Index: trunk/backend/bh.h
+===================================================================
+--- trunk.orig/backend/bh.h
++++ trunk/backend/bh.h
+@@ -652,7 +652,7 @@ _4btol(SANE_Byte *bytes)
+ 
+ #define SANE_NAME_BARCODE_HMIN "barcode-hmin"
+ #define SANE_TITLE_BARCODE_HMIN "Barcode Minimum Height"
+-#define SANE_DESC_BARCODE_HMIN "Sets the Barcode Minimun Height (larger values increase recognition speed)"
++#define SANE_DESC_BARCODE_HMIN "Sets the Barcode Minimum Height (larger values increase recognition speed)"
+ 
+ #define SANE_NAME_BARCODE_SEARCH_MODE "barcode-search-mode"
+ #define SANE_TITLE_BARCODE_SEARCH_MODE "Barcode Search Mode"
+Index: trunk/backend/hs2p-saneopts.h
+===================================================================
+--- trunk.orig/backend/hs2p-saneopts.h
++++ trunk/backend/hs2p-saneopts.h
+@@ -110,7 +110,7 @@
+ 
+ #define SANE_NAME_BARCODE_HMIN "barcode-hmin"
+ #define SANE_TITLE_BARCODE_HMIN "Barcode Minimum Height"
+-#define SANE_DESC_BARCODE_HMIN "Sets the Barcode Minimun Height (larger values increase recognition speed)"
++#define SANE_DESC_BARCODE_HMIN "Sets the Barcode Minimum Height (larger values increase recognition speed)"
+ 
+ #define SANE_NAME_BARCODE_SEARCH_MODE "barcode-search-mode"
+ #define SANE_TITLE_BARCODE_SEARCH_MODE "Barcode Search Mode"
+Index: trunk/tools/sane-find-scanner.c
+===================================================================
+--- trunk.orig/tools/sane-find-scanner.c
++++ trunk/tools/sane-find-scanner.c
+@@ -2074,7 +2074,7 @@ main (int argc, char **argv)
+       if (!check_mustek_pp_device() && verbose > 0)
+         printf ("\n  # No Mustek parallel port scanners found. If you expected"
+                 " something\n  # different, make sure the scanner is correctly"
+-	        " connected to your computer\n  # and you have apropriate"
++	        " connected to your computer\n  # and you have appropriate"
+ 	        " access rights.\n");
+     }
+   else if (verbose > 0)