refresh d/p/0170-typo.patch; Add .gitignore

1 files changed, 31 insertions, 0 deletions

diff --git a/debian/patches/0170-typo.patch b/debian/patches/0170-typo.patch
index 8864cd7..f84270a 100644
--- a/debian/patches/0170-typo.patch
+++ b/debian/patches/0170-typo.patch
@@ -30,6 +30,15 @@ Index: trunk/src/xsane.c
    {"print-filenames", no_argument, 0, 'p'},
    {"force-filename", required_argument, 0, 'N'},
    {0, }
+@@ -2324,7 +2324,7 @@ static RETSIGTYPE xsane_sigchld_handler(
+     pid = waitpid(childprocess->pid, &status, WNOHANG);
+     if ( (WIFEXITED(status)) && (pid == childprocess->pid) )
+     {
+-      DBG(DBG_info, "deleteing pid %d from list\n", childprocess->pid);
++      DBG(DBG_info, "deleting pid %d from list\n", childprocess->pid);
+ 
+       nextprocess = childprocess->next;
+       free(childprocess); /* free memory of element */
 @@ -5787,7 +5787,7 @@ static int xsane_init(int argc, char **a
             xsane.main_window_fixed = 1;
           break;
@@ -39,3 +48,25 @@ Index: trunk/src/xsane.c
             xsane.main_window_fixed = 0;
           break;
  
+Index: trunk/src/xsane-preview.c
+===================================================================
+--- trunk.orig/src/xsane-preview.c
++++ trunk/src/xsane-preview.c
+@@ -7575,7 +7575,7 @@ void preview_display_valid(Preview *p)
+   }
+   else if ((xsane.medium_changed) || (xsane.xsane_channels != p->preview_channels) || (p->invalid) ) /* preview is not valid */
+   {
+-    DBG(DBG_info, "preview not vaild\n");
++    DBG(DBG_info, "preview not valid\n");
+ 
+     gtk_widget_show(p->invalid_pixmap);
+     gtk_widget_hide(p->scanning_pixmap);
+@@ -7593,7 +7593,7 @@ void preview_display_valid(Preview *p)
+   }
+   else /* preview is valid */
+   {
+-    DBG(DBG_info, "preview vaild\n");
++    DBG(DBG_info, "preview valid\n");
+ 
+     gtk_widget_show(p->valid_pixmap);
+     gtk_widget_hide(p->scanning_pixmap);