summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAlessio Treglia <quadrispro@ubuntu.com>2010-05-13 20:19:21 +0200
committerAlessio Treglia <quadrispro@ubuntu.com>2010-05-13 20:19:21 +0200
commit1b1b5ac8cee90e9a9d3463deb236725e1839f8c7 (patch)
tree9768f3d5a7e3ff9094910c3d19af7f1dc0fc1ae2 /debian
parent7f9ebd076a83aaf63891d63bcb29b4f358f1df2f (diff)
All patches have been applied upstream.
Diffstat (limited to 'debian')
-rw-r--r--debian/patches/10-set_supported_flags.patch26
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 27 deletions
diff --git a/debian/patches/10-set_supported_flags.patch b/debian/patches/10-set_supported_flags.patch
deleted file mode 100644
index d086e78..0000000
--- a/debian/patches/10-set_supported_flags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Origin:
- http://bazaar.launchpad.net/~robert-ancell/simple-scan/trunk/revision/394
-Bug: https://bugs.launchpad.net/566759
-Applied-Upstream: commit: 394
-Description: Set "duplex" and "batch-scan" flags if supported by driver.
----
- src/scanner.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
---- simple-scan.orig/src/scanner.c
-+++ simple-scan/src/scanner.c
-@@ -1054,6 +1054,14 @@ do_get_option (Scanner *scanner)
- break;
- }
- }
-+ else if (strcmp (option->name, "duplex") == 0) {
-+ if (option->type == SANE_TYPE_BOOL)
-+ set_bool_option (scanner->priv->handle, option, option_index, job->type == SCAN_ADF_BOTH, NULL);
-+ }
-+ else if (strcmp (option->name, "batch-scan") == 0) {
-+ if (option->type == SANE_TYPE_BOOL)
-+ set_bool_option (scanner->priv->handle, option, option_index, job->type != SCAN_SINGLE, NULL);
-+ }
- else if (strcmp (option->name, SANE_NAME_BIT_DEPTH) == 0) {
- if (job->depth > 0)
- set_int_option (scanner->priv->handle, option, option_index, job->depth, NULL);
diff --git a/debian/patches/series b/debian/patches/series
index 95fa8fe..b7db254 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
# Empty
-10-set_supported_flags.patch