diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-03 13:31:58 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-03 13:31:58 +0200 |
| commit | 521b8f45cae77097f271082503f2da3c83cc09d9 (patch) | |
| tree | ddb174c0491b6d9120b29c0c565a1172ab9c2895 | |
| parent | 74ef40575976e5010dde2381d44df42bafd1ae3d (diff) | |
refresh d/p/0170-typo.patch; Add .gitignore
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/0170-typo.patch | 31 |
3 files changed, 36 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6c270cd --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.bzr +.bzrignore +.pc
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 1511132..46812e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,9 +12,10 @@ xsane (0.999-4) UNRELEASED; urgency=medium * Prevent autoconf FTBFS: - debian/rules: Change from autotools_dev to autoreconf. - debian/control: Remove Build-Depends autotools-dev and add dh_autoreconf. - - New patches/0005-m4.patch to add missing tags. + - New debian/patches/0005-m4.patch to add missing tags. * debian/watch: - Bump Version to 4 (no changes required). + * Refresh debian/patches/0170-typo.patch. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 09 Apr 2016 00:12:46 +0200 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); |