← Back to branch summary

~ubuntu-branches/ubuntu/trusty/argyll/trusty-proposed

« back to all changes in this revision

Viewing changes to spectro/ss_imp.h

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2014-02-12 00:35:39 UTC
  • mfrom: (13.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20140212003539-24tautzlitsiz61w
Tags: 1.5.1-5ubuntu1
https://launchpad.net/bugs/1275572
* Merge from Debian unstable. (LP: #1275572) Remaining changes:
  - debian/control:
    + Build-depend on libtiff-dev rather than libtiff4-dev.
  - debian/control, debian/patches/06_fix_udev_rule.patch:
    + Fix udev rules to actually work; ENV{ACL_MANAGE} has
      stopped working ages ago, and with logind it's now the
      "uaccess" tag. Dropping also consolekit from Recommends.
  - debian/patches/drop-usb-db.patch:
    + Use hwdb builtin, instead of the obsolete usb-db
      in the udev rules.
* debian/patches/05_ftbfs-underlinkage.diff:
  - Dropped change, no needed anymore.
* Refresh the patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
spectro/ss_imp.h
10
10
 * Author: Graeme W. Gill
11
11
 * Date:   13/7/2005
12
12
 *
13
 
 * Copyright 2005 - 2007 Graeme W. Gill
 
13
 * Copyright 2005 - 2013 Graeme W. Gill
14
14
 * All rights reserved.
15
15
 *
16
16
 * This material is licenced under the GNU GENERAL PUBLIC LICENSE Version 2 or later :-
261
261
 
262
262
        /* Add our own communication errors here too. */
263
263
        ss_et_SerialFail         = 0xF0,
264
 
        ss_et_UserAbort          = 0xF1,
265
 
        ss_et_UserTerm           = 0xF2,
266
 
        ss_et_UserTrig           = 0xF3,
267
 
        ss_et_UserCmnd           = 0xF4,
268
264
        ss_et_SendBufferFull     = 0xF5,
269
265
        ss_et_RecBufferEmpty     = 0xF6,
270
266
        ss_et_BadAnsFormat       = 0xF7,