← Back to branch summary

~ubuntu-branches/debian/jessie/sane-backends/jessie

« back to all changes in this revision

Viewing changes to backend/plustek.c

  • Committer: Package Import Robot
  • Author(s): Markus Koschany
  • Date: 2013-07-04 17:41:47 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130704174147-tl5tzd8bwvmctka2
Tags: 1.0.23-1
http://bugs.debian.org/681079
http://bugs.debian.org/687137
* QA upload.
* New upstream release.
* This package has been orphaned. Set maintainer to the Debian QA Group.
* Bump compat level to 9 (was 5) and require debhelper >= 9.
* debian/control:
  - sane-utils: Inherit Section: graphics from source package sane-backends.
  - Remove versioned dependencies. They are trivially satisfied.
* Drop the following patches. They are merged upstream now.
  - fix_v4l_build.patch
  - hurd_path_max_fix.patch
  - sane_desc_udev+acl.patch
  - scanimage_man_batch_start.patch
  - udev_usb_suspend.patch
  - xerox_mfp_add_scx_4623fw.patch
  - xerox_mfp_fix_usb_device.patch
* Drop disable_rpath.patch because the RPATH is already removed by chrpath
  in debian/rules.
* Rebase and refresh all other patches against the new upstream relase.
* debian/rules:
  - Simplify debian/rules by using dh sequencer.
  - Build with --parallel and with autotools_dev.
  - Enable all hardening build flags.
  - Install umax_pp with sane-utils.install.
* Build-Depend on libtiff5-dev. Thanks to Michael Terry for the patch.
  (Closes: #681079)
* Build-Depend on libusb-1.0-0-dev and enable libusb1.0 support in
  debian/rules. Thanks to Martin Pitt for the report and Whoopie for the
  patch. (Closes: #687137)

Show diffs side-by-side

added added

removed removed

Lines of Context:
backend/plustek.c
83
83
 * - 0.51 - added fine calibration caching
84
84
 *        - removed #define _PLUSTEK_USB
85
85
 * - 0.52 - added skipDarkStrip and OPT_LOFF4DARK to frontend options
 
86
 *        - fixed batch scanning
86
87
 *.
87
88
 * <hr>
88
89
 * This file is part of the SANE package.
158
159
#include "../include/sane/sanei.h"
159
160
#include "../include/sane/saneopts.h"
160
161
 
161
 
#define BACKEND_VERSION "0.52-9"
 
162
#define BACKEND_VERSION "0.52-10"
162
163
 
163
164
#define BACKEND_NAME    plustek
164
165
#include "../include/sane/sanei_access.h"
2706
2707
                                (unsigned long)(s->params.lines * s->params.bytes_per_line)) {
2707
2708
                                sanei_thread_waitpid( s->reader_pid, 0 );
2708
2709
                                s->reader_pid = -1;
 
2710
                                s->scanning = SANE_FALSE;
2709
2711
                                drvclose( s->hw );
2710
2712
                                return close_pipe(s);
2711
2713
                        }
2734
2736
                        return s->exit_code;
2735
2737
                }
2736
2738
                s->reader_pid = -1;
 
2739
                s->scanning = SANE_FALSE;
2737
2740
                return close_pipe(s);
2738
2741
        }
2739
2742
        return SANE_STATUS_GOOD;