← Back to branch summary

~ubuntu-branches/ubuntu/saucy/hplip/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/hpaio-option-duplex.diff

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-26 11:20:39 UTC
  • mfrom: (1.5.6) (31.1.3 precise)
  • Revision ID: package-import@ubuntu.com-20120526112039-bevxczegxnbyr5m7
Tags: 3.12.4-1
http://bugs.debian.org/667828
http://bugs.debian.org/583273
http://bugs.debian.org/666544
* New upstream release
* Switch to source/format 3.0 (quilt) - drop dpatch
* Refreshed debian/patches
* dh_autoreconf debian/autogen.sh & set local-options single-debian-patch
* Update to debian/compat -> 9
* Fix "hardened build flags" patch from Moritz - thanks (Closes: #667828)
* Fix "duplex descriptor uninitialized" patch from Matej (Closes: #583273)
* Fix "please migrate to kde-runtime" patch from Pino (Closes: #666544)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/hpaio-option-duplex.diff
 
1
--- hplip-3.12.2/scan/sane/hpaio.c~     2012-02-01 11:52:35.000000000 +0000
 
2
+++ hplip-3.12.2/scan/sane/hpaio.c      2012-05-17 10:07:20.000000000 +0100
 
3
@@ -1342,9 +1342,8 @@
 
4
     hpaio->option[OPTION_ADF_MODE].constraint_type = SANE_CONSTRAINT_STRING_LIST;
 
5
     hpaio->option[OPTION_ADF_MODE].constraint.string_list = hpaio->adfModeList;
 
6
 
 
7
-    // Duplex scanning is supported
 
8
-    if (hpaio->supportsDuplex  == 1)
 
9
-    {
 
10
+    // hpaioUpdateDescriptors will leave this active or inactive depending
 
11
+    // on whether duplex is supported
 
12
        hpaio->option[OPTION_DUPLEX].name = STR_NAME_DUPLEX;
 
13
        hpaio->option[OPTION_DUPLEX].title = STR_TITLE_DUPLEX;
 
14
        hpaio->option[OPTION_DUPLEX].desc = STR_DESC_DUPLEX;
 
15
@@ -1355,7 +1354,7 @@
 
16
                                        SANE_CAP_SOFT_DETECT |
 
17
                                        SANE_CAP_ADVANCED;
 
18
        hpaio->option[OPTION_DUPLEX].constraint_type = SANE_CONSTRAINT_NONE;
 
19
-    }
 
20
+
 
21
     hpaio->option[GROUP_GEOMETRY].title = STR_TITLE_GEOMETRY;
 
22
     hpaio->option[GROUP_GEOMETRY].type = SANE_TYPE_GROUP;
 
23
     hpaio->option[GROUP_GEOMETRY].cap = SANE_CAP_ADVANCED;