summaryrefslogtreecommitdiff
path: root/debian/patches/03_scanadf_options_fix.dpatch
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-12-02 20:19:01 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-12-02 20:19:01 +0100
commitb542c2254f2533b0838c36ae5da7679d0bd5fb7b (patch)
tree74b25b2f470ea025591197168ebbb6ed7b6a32d8 /debian/patches/03_scanadf_options_fix.dpatch
parent7d8191b83e163d76bb05e13b373638e4eeb7da95 (diff)
parent4bc4b41457cf5caca82a936deffeb7874dddd446 (diff)
Merge tag 'upstream/1.0.14'
Upstream version 1.0.14
Diffstat (limited to 'debian/patches/03_scanadf_options_fix.dpatch')
-rw-r--r--debian/patches/03_scanadf_options_fix.dpatch46
1 files changed, 0 insertions, 46 deletions
diff --git a/debian/patches/03_scanadf_options_fix.dpatch b/debian/patches/03_scanadf_options_fix.dpatch
deleted file mode 100644
index 4c1b8cb..0000000
--- a/debian/patches/03_scanadf_options_fix.dpatch
+++ /dev/null
@@ -1,46 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_scanadf_options_fix.dpatch by <jblache@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Get option descriptor 0 before getting the value for option 0.
-
-@DPATCH@
-diff -urNad sane-frontends-1.0.14~/src/scanadf.c sane-frontends-1.0.14/src/scanadf.c
---- sane-frontends-1.0.14~/src/scanadf.c 2005-09-18 13:51:00.000000000 +0200
-+++ sane-frontends-1.0.14/src/scanadf.c 2008-08-05 12:00:14.826083326 +0200
-@@ -550,15 +550,33 @@
- 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;