From 267f9007f6f0142853ba5f99f3f72a58f8fb857f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 8 Sep 2018 19:05:34 +0200 Subject: Rename patches and remove not used debian/patches/scanadf-sigchld.diff --- debian/changelog | 1 + debian/patches/0100-xcam.c_dead_code.patch | 25 ++++++++ debian/patches/0105-scanadf_options_fix.patch | 42 +++++++++++++ debian/patches/0110-cap_always_settable.patch | 17 ++++++ debian/patches/0115-xcam_off_by_one.patch | 15 +++++ debian/patches/0120-word_list_fix.patch | 38 ++++++++++++ debian/patches/0125-scanadf-SIGCHLD.patch | 19 ++++++ debian/patches/0130-gimp_init.patch | 30 +++++++++ .../patches/0135-xscanimage_c-out-of-bounds.patch | 18 ++++++ debian/patches/01_xcam.c_dead_code.patch | 25 -------- debian/patches/02_xcam_man_typo.patch | 35 ----------- debian/patches/03_scanadf_options_fix.patch | 42 ------------- debian/patches/04_cap_always_settable.patch | 17 ------ debian/patches/05_xcam_off_by_one.patch | 15 ----- debian/patches/0600-xcam_man_typo.patch | 35 +++++++++++ debian/patches/0605-manpages-typo.patch | 71 ++++++++++++++++++++++ debian/patches/06_word_list_fix.patch | 38 ------------ .../patches/100_xscanimage_c-out-of-bounds.patch | 18 ------ debian/patches/20_scanadf-SIGCHLD.patch | 19 ------ debian/patches/25_manpages-typo.patch | 71 ---------------------- debian/patches/30_gimp_init.patch | 30 --------- debian/patches/scanadf-sigchld.diff | 11 ---- debian/patches/series | 20 +++--- 23 files changed, 321 insertions(+), 331 deletions(-) create mode 100644 debian/patches/0100-xcam.c_dead_code.patch create mode 100644 debian/patches/0105-scanadf_options_fix.patch create mode 100644 debian/patches/0110-cap_always_settable.patch create mode 100644 debian/patches/0115-xcam_off_by_one.patch create mode 100644 debian/patches/0120-word_list_fix.patch create mode 100644 debian/patches/0125-scanadf-SIGCHLD.patch create mode 100644 debian/patches/0130-gimp_init.patch create mode 100644 debian/patches/0135-xscanimage_c-out-of-bounds.patch delete mode 100644 debian/patches/01_xcam.c_dead_code.patch delete mode 100644 debian/patches/02_xcam_man_typo.patch delete mode 100644 debian/patches/03_scanadf_options_fix.patch delete mode 100644 debian/patches/04_cap_always_settable.patch delete mode 100644 debian/patches/05_xcam_off_by_one.patch create mode 100644 debian/patches/0600-xcam_man_typo.patch create mode 100644 debian/patches/0605-manpages-typo.patch delete mode 100644 debian/patches/06_word_list_fix.patch delete mode 100644 debian/patches/100_xscanimage_c-out-of-bounds.patch delete mode 100644 debian/patches/20_scanadf-SIGCHLD.patch delete mode 100644 debian/patches/25_manpages-typo.patch delete mode 100644 debian/patches/30_gimp_init.patch delete mode 100644 debian/patches/scanadf-sigchld.diff diff --git a/debian/changelog b/debian/changelog index f4cecea..fa9827c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium - Remove usr/share/sane. * debian/sane.install: - Remove usr/share/sane/* and usr/bin/*. + * Rename patches and remove not used debian/patches/scanadf-sigchld.diff. * Change to my new email address. * Migrate to debhelper 11: - Change debian/compat to 11. diff --git a/debian/patches/0100-xcam.c_dead_code.patch b/debian/patches/0100-xcam.c_dead_code.patch new file mode 100644 index 0000000..f90bc6b --- /dev/null +++ b/debian/patches/0100-xcam.c_dead_code.patch @@ -0,0 +1,25 @@ +Author: +Description: Remove dead code in src/xcam.c::load_defaults() +Index: trunk/src/xcam.c +=================================================================== +--- trunk.orig/src/xcam.c ++++ trunk/src/xcam.c +@@ -536,16 +536,14 @@ static void + load_defaults (int silent) + { + char filename[PATH_MAX]; +- int fd; + + DBG (DBG_debug, "xcam, load_defaults: enter\n"); + if (make_default_filename (sizeof (filename), filename, dialog->dev_name) + < 0) + return; +- if (fd < 0) +- return; ++ + load_settings (filename, silent); +- sanei_load_values (fd, dialog->dev); ++ + DBG (DBG_debug, "xcam, load_defaults: exit\n"); + } + diff --git a/debian/patches/0105-scanadf_options_fix.patch b/debian/patches/0105-scanadf_options_fix.patch new file mode 100644 index 0000000..8c1b0c7 --- /dev/null +++ b/debian/patches/0105-scanadf_options_fix.patch @@ -0,0 +1,42 @@ +Author: +Description: Get option descriptor 0 before getting the value for option 0. +Index: trunk/src/scanadf.c +=================================================================== +--- trunk.orig/src/scanadf.c ++++ trunk/src/scanadf.c +@@ -550,15 +550,33 @@ fetch_options (SANE_Device * device) + const SANE_Option_Descriptor * opt; + SANE_Int num_dev_options; + int i, option_count; ++ SANE_Status status; + + /* and now build the full table of long options: */ + +- sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); ++ opt = sane_get_option_descriptor (device, 0); ++ if (opt == NULL) ++ { ++ fprintf (stderr, "Could not get option descriptor for option 0\n"); ++ exit (1); ++ } ++ ++ status = sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); ++ if (status != SANE_STATUS_GOOD) ++ { ++ fprintf (stderr, "Could not get value for option 0: %s\n", sane_strstatus (status)); ++ exit (1); ++ } + + option_count = 0; +- for (i = 0; i < num_dev_options; ++i) ++ for (i = 1; i < num_dev_options; ++i) + { + opt = sane_get_option_descriptor (device, i); ++ if (opt == NULL) ++ { ++ fprintf (stderr, "Could not get option descriptor for option %d\n", i); ++ exit (1); ++ } + + if (!SANE_OPTION_IS_SETTABLE (opt->cap)) + continue; diff --git a/debian/patches/0110-cap_always_settable.patch b/debian/patches/0110-cap_always_settable.patch new file mode 100644 index 0000000..aef60f1 --- /dev/null +++ b/debian/patches/0110-cap_always_settable.patch @@ -0,0 +1,17 @@ +Author: +Description: Remove check for SANE_CAP_ALWAYS_SETTABLE; the flag is not part +of the standard and has been removed upstream in SANE 1.0.20. +Index: trunk/src/gtkglue.c +=================================================================== +--- trunk.orig/src/gtkglue.c ++++ trunk/src/gtkglue.c +@@ -1476,8 +1476,7 @@ gsg_set_sensitivity (GSGDialog * dialog, + || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget) + continue; + +- if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE)) +- gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); ++ gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); + } + } + diff --git a/debian/patches/0115-xcam_off_by_one.patch b/debian/patches/0115-xcam_off_by_one.patch new file mode 100644 index 0000000..0b91cc4 --- /dev/null +++ b/debian/patches/0115-xcam_off_by_one.patch @@ -0,0 +1,15 @@ +Author: +Description: Fix an off-by-one. +Index: trunk/src/xcam.c +=================================================================== +--- trunk.orig/src/xcam.c ++++ trunk/src/xcam.c +@@ -1287,7 +1287,7 @@ save_frame_button (GtkWidget * widget, g + + /* test for pnm formats */ + strncpy (testfilename, preferences.filename, sizeof (testfilename)); +- testfilename[sizeof (testfilename)] = 0; ++ testfilename[sizeof (testfilename) - 1] = 0; + g_strreverse (testfilename); + if (!((!strncmp (testfilename, "mnp.", 4)) || + (!strncmp (testfilename, "mgp.", 4)) || diff --git a/debian/patches/0120-word_list_fix.patch b/debian/patches/0120-word_list_fix.patch new file mode 100644 index 0000000..683e745 --- /dev/null +++ b/debian/patches/0120-word_list_fix.patch @@ -0,0 +1,38 @@ +Author: +Description: Fix word list handling when current value is not part of the list. +Index: trunk/src/gtkglue.c +=================================================================== +--- trunk.orig/src/gtkglue.c ++++ trunk/src/gtkglue.c +@@ -913,6 +913,7 @@ panel_build (GSGDialog * dialog) + char **str_list; + int i, j; + int num_vector_opts = 0, *vector_opts; ++ SANE_Bool val_in_list; + + main_hbox = gtk_hbox_new (FALSE, 2); + +@@ -1073,13 +1074,23 @@ panel_build (GSGDialog * dialog) + case SANE_CONSTRAINT_WORD_LIST: + /* use a "list-selection" widget */ + num_words = opt->constraint.word_list[0]; ++ if (num_words == 0) ++ { ++ fprintf (stderr, "panel_build: empty word list!\n"); ++ break; ++ } ++ val_in_list = SANE_FALSE; + str_list = malloc ((num_words + 1) * sizeof (str_list[0])); + for (j = 0; j < num_words; ++j) + { ++ if (opt->constraint.word_list[j + 1] == val) ++ val_in_list = SANE_TRUE; + sprintf (str, "%d", opt->constraint.word_list[j + 1]); + str_list[j] = strdup (str); + } + str_list[j] = 0; ++ if (!val_in_list) ++ val = opt->constraint.word_list[1]; + sprintf (str, "%d", val); + option_menu_new (parent, title, str_list, str, elem, + dialog->tooltips, opt->desc, diff --git a/debian/patches/0125-scanadf-SIGCHLD.patch b/debian/patches/0125-scanadf-SIGCHLD.patch new file mode 100644 index 0000000..ab91534 --- /dev/null +++ b/debian/patches/0125-scanadf-SIGCHLD.patch @@ -0,0 +1,19 @@ +Description: Sets SIGCHLD to SIG_DFL before execle(). +Author: Jakub Wilk +Origin: http://www.opengroup.org/onlinepubs/009695399/functions/exec.html +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596232 +Last-Update: 2014-12-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/scanadf.c +=================================================================== +--- trunk.orig/src/scanadf.c ++++ trunk/src/scanadf.c +@@ -1213,6 +1213,7 @@ scan_it_raw (const char *fname, SANE_Boo + + case 0: + /* in child process */ ++ signal(SIGCHLD, SIG_DFL); + sprintf(cmd, "%s '%s'", script, fname); + /* system(cmd); */ + execle(script, script, fname, NULL, environ); diff --git a/debian/patches/0130-gimp_init.patch b/debian/patches/0130-gimp_init.patch new file mode 100644 index 0000000..08c81f1 --- /dev/null +++ b/debian/patches/0130-gimp_init.patch @@ -0,0 +1,30 @@ +Description: Enable GIMP interface +Author: Jörg Frings-Fürst +Bug: https://alioth.debian.org/tracker/index.php?func=detail&aid=313616&group_id=30186&atid=410366 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682540 +Forwarded: https://alioth.debian.org/tracker/index.php?func=detail&aid=313616&group_id=30186&atid=410366 +Last-Update: 2015-05-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/xscanimage.c +=================================================================== +--- trunk.orig/src/xscanimage.c ++++ trunk/src/xscanimage.c +@@ -320,7 +320,7 @@ query (void) + "Andy Beck, Tristan Tarrant, and David Mosberger", + "8th June 1997", + "/File/Acquire/xscanimage/Device dialog...", +- "RGB, GRAY", ++ 0, + GIMP_EXTENSION, + nargs, nreturn_vals, args, return_vals); + +@@ -365,7 +365,7 @@ query (void) + "interface.", + "Andy Beck, Tristan Tarrant, and David Mosberger", + "Andy Beck, Tristan Tarrant, and David Mosberger", +- "8th June 1997", mpath, "RGB, GRAY", GIMP_EXTENSION, ++ "8th June 1997", mpath, 0, GIMP_EXTENSION, + nargs, nreturn_vals, args, return_vals); + } + sane_exit (); diff --git a/debian/patches/0135-xscanimage_c-out-of-bounds.patch b/debian/patches/0135-xscanimage_c-out-of-bounds.patch new file mode 100644 index 0000000..2249f5a --- /dev/null +++ b/debian/patches/0135-xscanimage_c-out-of-bounds.patch @@ -0,0 +1,18 @@ +Description: Correct out-of-bounds +Author: Jörg Frings-Fürst +Last-Update: 2014-12-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/xscanimage.c +=================================================================== +--- trunk.orig/src/xscanimage.c ++++ trunk/src/xscanimage.c +@@ -1284,7 +1284,7 @@ scan_dialog (GtkWidget * widget, gpointe + { /* We are running in standalone mode */ + /* test for pnm formats */ + strncpy (testfilename, preferences.filename, sizeof (testfilename)); +- testfilename[sizeof (testfilename)] = 0; ++ testfilename[sizeof (testfilename) - 1] = 0; + g_strreverse (testfilename); + if (!((!strncmp (testfilename, "mnp.", 4)) || + (!strncmp (testfilename, "mgp.", 4)) || diff --git a/debian/patches/01_xcam.c_dead_code.patch b/debian/patches/01_xcam.c_dead_code.patch deleted file mode 100644 index f90bc6b..0000000 --- a/debian/patches/01_xcam.c_dead_code.patch +++ /dev/null @@ -1,25 +0,0 @@ -Author: -Description: Remove dead code in src/xcam.c::load_defaults() -Index: trunk/src/xcam.c -=================================================================== ---- trunk.orig/src/xcam.c -+++ trunk/src/xcam.c -@@ -536,16 +536,14 @@ static void - load_defaults (int silent) - { - char filename[PATH_MAX]; -- int fd; - - DBG (DBG_debug, "xcam, load_defaults: enter\n"); - if (make_default_filename (sizeof (filename), filename, dialog->dev_name) - < 0) - return; -- if (fd < 0) -- return; -+ - load_settings (filename, silent); -- sanei_load_values (fd, dialog->dev); -+ - DBG (DBG_debug, "xcam, load_defaults: exit\n"); - } - diff --git a/debian/patches/02_xcam_man_typo.patch b/debian/patches/02_xcam_man_typo.patch deleted file mode 100644 index 2421dc8..0000000 --- a/debian/patches/02_xcam_man_typo.patch +++ /dev/null @@ -1,35 +0,0 @@ -Author: -Description: Fix various typos in xcam.man. -Index: trunk/doc/xcam.man -=================================================================== ---- trunk.orig/doc/xcam.man -+++ trunk/doc/xcam.man -@@ -1,4 +1,4 @@ --.TH xcam 1 "11 April 2005" -+.TH xcam 1 "19 February 2008" - .IX xcam - .SH NAME - xcam - a graphical camera frontend for SANE -@@ -12,7 +12,7 @@ xcam - a graphical camera frontend for S - .B xcam - provides a graphical user-interface to control an image - acquisition device such as a flatbed scanner or a camera. It allows --scanning invidual images and can be invoked directly from the command-line. -+scanning individual images and can be invoked directly from the command-line. - - .B xcam - acts as a stand-alone program that saves acquired images in a suitable -@@ -43,12 +43,11 @@ will output its version number. - .PP - The - .B --help (-h) --.B xcam - flag prints a short summary of options. - .PP - .TP - .B SANE_DEBUG_XCAM --This environment variable controls the debug level xscanimage. Higher -+This environment variable controls the debug level of xcam. Higher - debug levels increase the verbosity of the output. - - Value Descsription diff --git a/debian/patches/03_scanadf_options_fix.patch b/debian/patches/03_scanadf_options_fix.patch deleted file mode 100644 index 8c1b0c7..0000000 --- a/debian/patches/03_scanadf_options_fix.patch +++ /dev/null @@ -1,42 +0,0 @@ -Author: -Description: Get option descriptor 0 before getting the value for option 0. -Index: trunk/src/scanadf.c -=================================================================== ---- trunk.orig/src/scanadf.c -+++ trunk/src/scanadf.c -@@ -550,15 +550,33 @@ fetch_options (SANE_Device * device) - const SANE_Option_Descriptor * opt; - SANE_Int num_dev_options; - int i, option_count; -+ SANE_Status status; - - /* and now build the full table of long options: */ - -- sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); -+ opt = sane_get_option_descriptor (device, 0); -+ if (opt == NULL) -+ { -+ fprintf (stderr, "Could not get option descriptor for option 0\n"); -+ exit (1); -+ } -+ -+ status = sane_control_option (device, 0, SANE_ACTION_GET_VALUE, &num_dev_options, 0); -+ if (status != SANE_STATUS_GOOD) -+ { -+ fprintf (stderr, "Could not get value for option 0: %s\n", sane_strstatus (status)); -+ exit (1); -+ } - - option_count = 0; -- for (i = 0; i < num_dev_options; ++i) -+ for (i = 1; i < num_dev_options; ++i) - { - opt = sane_get_option_descriptor (device, i); -+ if (opt == NULL) -+ { -+ fprintf (stderr, "Could not get option descriptor for option %d\n", i); -+ exit (1); -+ } - - if (!SANE_OPTION_IS_SETTABLE (opt->cap)) - continue; diff --git a/debian/patches/04_cap_always_settable.patch b/debian/patches/04_cap_always_settable.patch deleted file mode 100644 index aef60f1..0000000 --- a/debian/patches/04_cap_always_settable.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: -Description: Remove check for SANE_CAP_ALWAYS_SETTABLE; the flag is not part -of the standard and has been removed upstream in SANE 1.0.20. -Index: trunk/src/gtkglue.c -=================================================================== ---- trunk.orig/src/gtkglue.c -+++ trunk/src/gtkglue.c -@@ -1476,8 +1476,7 @@ gsg_set_sensitivity (GSGDialog * dialog, - || opt->type == SANE_TYPE_GROUP || !dialog->element[i].widget) - continue; - -- if (!(opt->cap & SANE_CAP_ALWAYS_SETTABLE)) -- gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); -+ gtk_widget_set_sensitive (dialog->element[i].widget, sensitive); - } - } - diff --git a/debian/patches/05_xcam_off_by_one.patch b/debian/patches/05_xcam_off_by_one.patch deleted file mode 100644 index 0b91cc4..0000000 --- a/debian/patches/05_xcam_off_by_one.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: -Description: Fix an off-by-one. -Index: trunk/src/xcam.c -=================================================================== ---- trunk.orig/src/xcam.c -+++ trunk/src/xcam.c -@@ -1287,7 +1287,7 @@ save_frame_button (GtkWidget * widget, g - - /* test for pnm formats */ - strncpy (testfilename, preferences.filename, sizeof (testfilename)); -- testfilename[sizeof (testfilename)] = 0; -+ testfilename[sizeof (testfilename) - 1] = 0; - g_strreverse (testfilename); - if (!((!strncmp (testfilename, "mnp.", 4)) || - (!strncmp (testfilename, "mgp.", 4)) || diff --git a/debian/patches/0600-xcam_man_typo.patch b/debian/patches/0600-xcam_man_typo.patch new file mode 100644 index 0000000..2421dc8 --- /dev/null +++ b/debian/patches/0600-xcam_man_typo.patch @@ -0,0 +1,35 @@ +Author: +Description: Fix various typos in xcam.man. +Index: trunk/doc/xcam.man +=================================================================== +--- trunk.orig/doc/xcam.man ++++ trunk/doc/xcam.man +@@ -1,4 +1,4 @@ +-.TH xcam 1 "11 April 2005" ++.TH xcam 1 "19 February 2008" + .IX xcam + .SH NAME + xcam - a graphical camera frontend for SANE +@@ -12,7 +12,7 @@ xcam - a graphical camera frontend for S + .B xcam + provides a graphical user-interface to control an image + acquisition device such as a flatbed scanner or a camera. It allows +-scanning invidual images and can be invoked directly from the command-line. ++scanning individual images and can be invoked directly from the command-line. + + .B xcam + acts as a stand-alone program that saves acquired images in a suitable +@@ -43,12 +43,11 @@ will output its version number. + .PP + The + .B --help (-h) +-.B xcam + flag prints a short summary of options. + .PP + .TP + .B SANE_DEBUG_XCAM +-This environment variable controls the debug level xscanimage. Higher ++This environment variable controls the debug level of xcam. Higher + debug levels increase the verbosity of the output. + + Value Descsription diff --git a/debian/patches/0605-manpages-typo.patch b/debian/patches/0605-manpages-typo.patch new file mode 100644 index 0000000..2bc246b --- /dev/null +++ b/debian/patches/0605-manpages-typo.patch @@ -0,0 +1,71 @@ +Description: Correct typos in manpages +Author: Jörg Frings-Fürst +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612686 +Last-Update: 2014-12-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/scanadf.man +=================================================================== +--- trunk.orig/doc/scanadf.man ++++ trunk/doc/scanadf.man +@@ -162,7 +162,7 @@ information about the parameters of the + + .PP + If the +-.B --scipt-wait ++.B --script-wait + option is given, scanadf will wait until all scan-scripts have been finished before + exiting. That will be useful if scanadf is used in conjunction with tools to modify + the scanned images. +@@ -210,7 +210,7 @@ invoke + via a command-line of the form: + .PP + .RS +-scanadf --help --device ++scanadf \-\-help \-\-device + .I dev + .RE + .PP +@@ -256,12 +256,12 @@ work at this time are: + .br + .B sane-hp + - Hewlett Packard scanners. A patch to the sane-hp backend +-is necessary. The --scantype=ADF option must be specified (earlier +-versions of the backend used the --scan-from-adf option, instead). ++is necessary. The \-\-scantype=ADF option must be specified (earlier ++versions of the backend used the \-\-scan-from-adf option, instead). + .br + .B sane-umax + - UMAX scanners. Support exists in build 12 and later. +-The --source="Automatic Document Feeder" option must be specified. ++The \-\-source="Automatic Document Feeder" option must be specified. + .br + .RE + +Index: trunk/doc/xscanimage.man +=================================================================== +--- trunk.orig/doc/xscanimage.man ++++ trunk/doc/xscanimage.man +@@ -15,7 +15,7 @@ xscanimage \- scan an image + .B xscanimage + provides a graphical user-interface to control an image + acquisition device such as a flatbed scanner or a camera. It allows +-previewing and scanning invidual images and can be invoked either ++previewing and scanning individual images and can be invoked either + directly from the command-line or through The GIMP image manipulation + program. In the former case, + .B xscanimage +@@ -45,11 +45,11 @@ simply copy it to one of the + plug-ins directories. If you want to conserve disk-space, you can + create a symlink instead. For example, for gimp-1.0.x the command + .PP +-ln -s @BINDIR@/xscanimage ~/.gimp/plug-ins/ ++ln \-s @BINDIR@/xscanimage ~/.gimp/plug-ins/ + .PP + and for gimp-1.2.x the command + .PP +-ln -s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/ ++ln \-s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/ + .PP + adds a symlink for the + .B xscanimage diff --git a/debian/patches/06_word_list_fix.patch b/debian/patches/06_word_list_fix.patch deleted file mode 100644 index 683e745..0000000 --- a/debian/patches/06_word_list_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -Author: -Description: Fix word list handling when current value is not part of the list. -Index: trunk/src/gtkglue.c -=================================================================== ---- trunk.orig/src/gtkglue.c -+++ trunk/src/gtkglue.c -@@ -913,6 +913,7 @@ panel_build (GSGDialog * dialog) - char **str_list; - int i, j; - int num_vector_opts = 0, *vector_opts; -+ SANE_Bool val_in_list; - - main_hbox = gtk_hbox_new (FALSE, 2); - -@@ -1073,13 +1074,23 @@ panel_build (GSGDialog * dialog) - case SANE_CONSTRAINT_WORD_LIST: - /* use a "list-selection" widget */ - num_words = opt->constraint.word_list[0]; -+ if (num_words == 0) -+ { -+ fprintf (stderr, "panel_build: empty word list!\n"); -+ break; -+ } -+ val_in_list = SANE_FALSE; - str_list = malloc ((num_words + 1) * sizeof (str_list[0])); - for (j = 0; j < num_words; ++j) - { -+ if (opt->constraint.word_list[j + 1] == val) -+ val_in_list = SANE_TRUE; - sprintf (str, "%d", opt->constraint.word_list[j + 1]); - str_list[j] = strdup (str); - } - str_list[j] = 0; -+ if (!val_in_list) -+ val = opt->constraint.word_list[1]; - sprintf (str, "%d", val); - option_menu_new (parent, title, str_list, str, elem, - dialog->tooltips, opt->desc, diff --git a/debian/patches/100_xscanimage_c-out-of-bounds.patch b/debian/patches/100_xscanimage_c-out-of-bounds.patch deleted file mode 100644 index 2249f5a..0000000 --- a/debian/patches/100_xscanimage_c-out-of-bounds.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Correct out-of-bounds -Author: Jörg Frings-Fürst -Last-Update: 2014-12-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/xscanimage.c -=================================================================== ---- trunk.orig/src/xscanimage.c -+++ trunk/src/xscanimage.c -@@ -1284,7 +1284,7 @@ scan_dialog (GtkWidget * widget, gpointe - { /* We are running in standalone mode */ - /* test for pnm formats */ - strncpy (testfilename, preferences.filename, sizeof (testfilename)); -- testfilename[sizeof (testfilename)] = 0; -+ testfilename[sizeof (testfilename) - 1] = 0; - g_strreverse (testfilename); - if (!((!strncmp (testfilename, "mnp.", 4)) || - (!strncmp (testfilename, "mgp.", 4)) || diff --git a/debian/patches/20_scanadf-SIGCHLD.patch b/debian/patches/20_scanadf-SIGCHLD.patch deleted file mode 100644 index ab91534..0000000 --- a/debian/patches/20_scanadf-SIGCHLD.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Sets SIGCHLD to SIG_DFL before execle(). -Author: Jakub Wilk -Origin: http://www.opengroup.org/onlinepubs/009695399/functions/exec.html -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=596232 -Last-Update: 2014-12-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/scanadf.c -=================================================================== ---- trunk.orig/src/scanadf.c -+++ trunk/src/scanadf.c -@@ -1213,6 +1213,7 @@ scan_it_raw (const char *fname, SANE_Boo - - case 0: - /* in child process */ -+ signal(SIGCHLD, SIG_DFL); - sprintf(cmd, "%s '%s'", script, fname); - /* system(cmd); */ - execle(script, script, fname, NULL, environ); diff --git a/debian/patches/25_manpages-typo.patch b/debian/patches/25_manpages-typo.patch deleted file mode 100644 index 2bc246b..0000000 --- a/debian/patches/25_manpages-typo.patch +++ /dev/null @@ -1,71 +0,0 @@ -Description: Correct typos in manpages -Author: Jörg Frings-Fürst -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=612686 -Last-Update: 2014-12-03 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/doc/scanadf.man -=================================================================== ---- trunk.orig/doc/scanadf.man -+++ trunk/doc/scanadf.man -@@ -162,7 +162,7 @@ information about the parameters of the - - .PP - If the --.B --scipt-wait -+.B --script-wait - option is given, scanadf will wait until all scan-scripts have been finished before - exiting. That will be useful if scanadf is used in conjunction with tools to modify - the scanned images. -@@ -210,7 +210,7 @@ invoke - via a command-line of the form: - .PP - .RS --scanadf --help --device -+scanadf \-\-help \-\-device - .I dev - .RE - .PP -@@ -256,12 +256,12 @@ work at this time are: - .br - .B sane-hp - - Hewlett Packard scanners. A patch to the sane-hp backend --is necessary. The --scantype=ADF option must be specified (earlier --versions of the backend used the --scan-from-adf option, instead). -+is necessary. The \-\-scantype=ADF option must be specified (earlier -+versions of the backend used the \-\-scan-from-adf option, instead). - .br - .B sane-umax - - UMAX scanners. Support exists in build 12 and later. --The --source="Automatic Document Feeder" option must be specified. -+The \-\-source="Automatic Document Feeder" option must be specified. - .br - .RE - -Index: trunk/doc/xscanimage.man -=================================================================== ---- trunk.orig/doc/xscanimage.man -+++ trunk/doc/xscanimage.man -@@ -15,7 +15,7 @@ xscanimage \- scan an image - .B xscanimage - provides a graphical user-interface to control an image - acquisition device such as a flatbed scanner or a camera. It allows --previewing and scanning invidual images and can be invoked either -+previewing and scanning individual images and can be invoked either - directly from the command-line or through The GIMP image manipulation - program. In the former case, - .B xscanimage -@@ -45,11 +45,11 @@ simply copy it to one of the - plug-ins directories. If you want to conserve disk-space, you can - create a symlink instead. For example, for gimp-1.0.x the command - .PP --ln -s @BINDIR@/xscanimage ~/.gimp/plug-ins/ -+ln \-s @BINDIR@/xscanimage ~/.gimp/plug-ins/ - .PP - and for gimp-1.2.x the command - .PP --ln -s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/ -+ln \-s @BINDIR@/xscanimage ~/.gimp-1.2/plug-ins/ - .PP - adds a symlink for the - .B xscanimage diff --git a/debian/patches/30_gimp_init.patch b/debian/patches/30_gimp_init.patch deleted file mode 100644 index 08c81f1..0000000 --- a/debian/patches/30_gimp_init.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Enable GIMP interface -Author: Jörg Frings-Fürst -Bug: https://alioth.debian.org/tracker/index.php?func=detail&aid=313616&group_id=30186&atid=410366 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682540 -Forwarded: https://alioth.debian.org/tracker/index.php?func=detail&aid=313616&group_id=30186&atid=410366 -Last-Update: 2015-05-09 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/src/xscanimage.c -=================================================================== ---- trunk.orig/src/xscanimage.c -+++ trunk/src/xscanimage.c -@@ -320,7 +320,7 @@ query (void) - "Andy Beck, Tristan Tarrant, and David Mosberger", - "8th June 1997", - "/File/Acquire/xscanimage/Device dialog...", -- "RGB, GRAY", -+ 0, - GIMP_EXTENSION, - nargs, nreturn_vals, args, return_vals); - -@@ -365,7 +365,7 @@ query (void) - "interface.", - "Andy Beck, Tristan Tarrant, and David Mosberger", - "Andy Beck, Tristan Tarrant, and David Mosberger", -- "8th June 1997", mpath, "RGB, GRAY", GIMP_EXTENSION, -+ "8th June 1997", mpath, 0, GIMP_EXTENSION, - nargs, nreturn_vals, args, return_vals); - } - sane_exit (); diff --git a/debian/patches/scanadf-sigchld.diff b/debian/patches/scanadf-sigchld.diff deleted file mode 100644 index fe84f08..0000000 --- a/debian/patches/scanadf-sigchld.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/src/scanadf.c b/src/scanadf.c ---- a/src/scanadf.c -+++ b/src/scanadf.c -@@ -1195,6 +1195,7 @@ - - case 0: - /* in child process */ -+ signal(SIGCHLD, SIG_DFL); - sprintf(cmd, "%s '%s'", script, fname); - /* system(cmd); */ - execle(script, script, fname, NULL, environ); diff --git a/debian/patches/series b/debian/patches/series index bb24e0e..64afa25 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,11 @@ 0001-fix_missing_sane-config.patch -30_gimp_init.patch -25_manpages-typo.patch -01_xcam.c_dead_code.patch -02_xcam_man_typo.patch -03_scanadf_options_fix.patch -04_cap_always_settable.patch -05_xcam_off_by_one.patch -06_word_list_fix.patch -20_scanadf-SIGCHLD.patch -100_xscanimage_c-out-of-bounds.patch +0100-xcam.c_dead_code.patch +0105-scanadf_options_fix.patch +0110-cap_always_settable.patch +0115-xcam_off_by_one.patch +0120-word_list_fix.patch +0125-scanadf-SIGCHLD.patch +0130-gimp_init.patch +0135-xscanimage_c-out-of-bounds.patch +0600-xcam_man_typo.patch +0605-manpages-typo.patch -- cgit v1.2.3