state from 2014-09-07 13:30 MESZ

79 files changed, 2671 insertions, 1137 deletions

diff --git a/debian/argyll-doc.doc-base b/debian/argyll-doc.doc-base
new file mode 100644
index 0000000..962b063
--- /dev/null
+++ b/debian/argyll-doc.doc-base
@@ -0,0 +1,7 @@
+Document: argyll
+Title: Argyll Documentation
+Section: Graphics
+
+Format: HTML
+Index: /usr/share/doc/argyll-doc/ArgyllDoc.html
+Files: /usr/share/doc/argyll-doc/*.html
diff --git a/debian/argyll-doc.docs b/debian/argyll-doc.docs
new file mode 100644
index 0000000..30d29de
--- /dev/null
+++ b/debian/argyll-doc.docs
@@ -0,0 +1 @@
+doc/*
diff --git a/debian/argyll-ref.install b/debian/argyll-ref.install
new file mode 100644
index 0000000..beefdac
--- /dev/null
+++ b/debian/argyll-ref.install
@@ -0,0 +1 @@
+usr/share/color/argyll/ref
diff --git a/debian/argyll.examples b/debian/argyll.examples
index 7f1dbaa..e6e5f44 100644
--- a/debian/argyll.examples
+++ b/debian/argyll.examples
@@ -1 +1 @@
-firmware-package-builder/spyder2.tar.gz
+#firmware-package-builder/spyder2.tar.gz
diff --git a/debian/argyll.install b/debian/argyll.install
index 4bb69a1..0b1afee 100644
--- a/debian/argyll.install
+++ b/debian/argyll.install
@@ -1,50 +1,3 @@
 usb/55-Argyll.rules lib/udev/rules.d/
 usb/Argyll.usermap etc/hotplug/usb
-usr/bin/applycal
-usr/bin/average
-usr/bin/cb2ti3
-usr/bin/cctiff
-usr/bin/ccttest
-usr/bin/ccxxmake
-usr/bin/chartread
-usr/bin/collink
-usr/bin/colprof
-usr/bin/dispcal
-usr/bin/dispread
-usr/bin/dispwin
-usr/bin/extracticc
-usr/bin/extractttag
-usr/bin/fakeCMY
-usr/bin/fakeread
-usr/bin/greytiff
-usr/bin/iccgamut
-usr/bin/illumread
-usr/bin/invprofcheck
-usr/bin/kodak2ti3
-usr/bin/mppcheck
-usr/bin/mpplu
-usr/bin/mppprof
-usr/bin/pathplot
-usr/bin/printcal
-usr/bin/printtarg
-usr/bin/profcheck
-usr/bin/refine
-usr/bin/revfix
-usr/bin/scanin
-usr/bin/simpprof
-usr/bin/spec2cie
-usr/bin/specplot
-usr/bin/splitti3
-usr/bin/spotread
-usr/bin/synthcal
-usr/bin/synthread
-usr/bin/targen
-usr/bin/tiffgamut
-usr/bin/txt2ti3
-usr/bin/verify
-usr/bin/viewgam
-usr/bin/xicclu
-usr/lib/*/argyll/*
-usr/share/color/argyll/ref/*
-usr/share/doc/argyll/*
-usr/bin/oeminst
+usr/bin/*
diff --git a/debian/argyll.manpages b/debian/argyll.manpages
index 59f586e..13cdaf4 100644
--- a/debian/argyll.manpages
+++ b/debian/argyll.manpages
@@ -1,45 +1 @@
-debian/applycal.1
-debian/average.1
-debian/cb2ti3.1
-debian/cctiff.1
-debian/ccttest.1
-debian/ccxxmake.1
-debian/chartread.1
-debian/collink.1
-debian/colprof.1
-debian/dispcal.1
-debian/dispread.1
-debian/dispwin.1
-debian/extracticc.1
-debian/extractttag.1
-debian/fakeCMY.1
-debian/fakeread.1
-debian/greytiff.1
-debian/iccgamut.1
-debian/illumread.1
-debian/invprofcheck.1
-debian/kodak2ti3.1
-debian/mppcheck.1
-debian/mpplu.1
-debian/mppprof.1
-debian/oeminst.1
-debian/pathplot.1
-debian/printcal.1
-debian/printtarg.1
-debian/profcheck.1
-debian/refine.1
-debian/revfix.1
-debian/scanin.1
-debian/simpprof.1
-debian/spec2cie.1
-debian/specplot.1
-debian/splitti3.1
-debian/spotread.1
-debian/synthcal.1
-debian/synthread.1
-debian/targen.1
-debian/tiffgamut.1
-debian/txt2ti3.1
-debian/verify.1
-debian/viewgam.1
-debian/xicclu.1
+debian/man/*.1
diff --git a/debian/ccttest.1 b/debian/ccttest.1
deleted file mode 100644
index 749f61c..0000000
--- a/debian/ccttest.1
+++ /dev/null
@@ -1,19 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH PLOT "1" "August 2013" "Plot spectrum and calculate CCT and VCT" "User Commands"
-.SH NAME
-Plot \- Plot spectrum and calculate CCT and VCT.
-.SH DESCRIPTION
-Plot spectrum and calculate CCT and VCT
-Author: Graeme W. Gill
-usage: ccttest [infile.sp]
-.TP
-[infile.sp]
-spectrum to plot
-default is all built in illuminants
-.PP
-Author: Graeme W. Gill
-usage: ccttest [infile.sp]
-.TP
-[infile.sp]
-spectrum to plot
-default is all built in illuminants
diff --git a/debian/changelog b/debian/changelog
index 80983b1..d99cb72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+argyll (1.6.3-1) UNRELEASED; urgency=medium
+
+  * New Maintainer (Closes: #720178).
+  * New upstream release (Closes: #742658).
+  * debian/rules:
+    - Add get-orig-source.
+    - Remove useless --with quilt from dh $@
+    - Enable hardening=+all
+    - Rewrite for use of upstream build system.
+  * debian/control:
+    - Set myself as maintainer.
+    - Update Build-Depends:
+      + Add dh-autoreconf for update Build Environment (Closes: #727517).
+    - For previously not existing Vcs
+      + Create a new git repository on alioth.
+      + Add the Fields Vcs-Browser and Vcs-Git.
+    - Change Priority from optional to extra.
+    - Remove useless packages:
+      + icc-utils
+        Now in argyll. Only dummy package.
+      + libicc2 & libicc-dev
+        Useless. Only linked to argyll & icc-utils.
+      + libimdi0 & libimdi-dev
+        Useless. Only linked to argyll & icc-utils.
+  * Add debian/source/options:
+    - Set compression to xz & compression-level to 9 to save space.
+  * debian/copyright:
+    - Add myself as Maintainer to /debian/*
+    - Reorder entries
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 01 Sep 2014 14:53:18 +0200
+
 argyll (1.5.1-8) unstable; urgency=medium
 
   * QA upload.
diff --git a/debian/control b/debian/control
index 4821b4c..d9e8a86 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,34 @@
 Source: argyll
 Section: graphics
-Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
-Homepage: http://www.argyllcms.com/
+Priority: extra
+Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9), libtiff-dev, libx11-dev, libxxf86vm-dev,
- x11proto-xf86vidmode-dev, libxinerama-dev, libxrandr-dev, x11proto-scrnsaver-dev,
- libxss-dev, libusbhid-dev [kfreebsd-any], autoconf, automake | automaken, libtool,
- quilt, libjpeg-dev, libusb-dev, dh-autoreconf
+Build-Depends:
+# autoconf,
+# automake | automaken,
+ debhelper (>= 9),
+ dh-autoreconf,
+ jam,
+ libjpeg-dev,
+ libtiff5-dev,
+ libtool,
+ libusb-dev,
+ libusbhid-dev [kfreebsd-any],
+ libx11-dev,
+ libxinerama-dev,
+ libxrandr-dev,
+ libxss-dev,
+ libxxf86vm-dev,
+# libyajl-dev,
+ x11proto-scrnsaver-dev,
+ x11proto-xf86vidmode-dev
+Homepage: http://www.argyllcms.com/
+Vcs-Git: git://anonscm.debian.org/collab-maint/argyll.git
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/argyll.git
 
 Package: argyll
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-ref
 Replaces: argyll-bin
 Recommends: libpam-systemd [linux-any], udev (>= 196) [linux-any]
 Suggests: colord, gir1.2-colordgtk-1.0
@@ -33,7 +50,6 @@ Description: Color Management System, calibrator and profiler
 Package: argyll-dbg
 Section: debug
 Architecture: any
-Priority: extra
 Depends: argyll (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for argyll
  Argyll is an experimental, open source, ICC compatible color management
@@ -43,72 +59,35 @@ Description: debugging symbols for argyll
  This package contains the debugging symbols for argyll, libicc and libimdi
  libraries
 
-Package: icc-utils
-Section: graphics
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks:   libicc2 (<< 2.12+argyll1.4.0-2)
-Replaces: libicc2 (<< 2.12+argyll1.4.0-2)
-Description: ICC profile I/O library
- The icclib is a set of routines which implement the reading and  
- writing of color profile files that conform to the International 
- Color Consortium (ICC) Profile Format Specification, Version 3.4.
- .
- This package contains two utilities :
+Package: argyll-ref
+Architecture: all
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Color Management System, calibrator and profiler (data files)
+ Argyll is an experimental, open source, ICC compatible color management
+ system. It supports accurate ICC profile creation for scanners, CMYK
+ printers, film recorders and calibration and profiling of displays.
  .
-  * iccdump : dump an ICC file in human readable form.
-  * icclu : translate colors through an ICC profile.
+ This package contains the data files for argyll.
 
-Package: libicc-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libicc2 (= ${binary:Version}), ${misc:Depends}
-Conflicts: argyll (<< 1.0.3+dfsg1-3)
-Description: Development files for the ICC profile I/O library
- The icclib is a set of routines which implement the reading and
- writing of color profile files that conform to the International
- Color Consortium (ICC) Profile Format Specification, Version 3.4.
+Package: argyll-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Color Management System, calibrator and profiler (documentation)
+ Argyll is an experimental, open source, ICC compatible color management
+ system. It supports accurate ICC profile creation for scanners, CMYK
+ printers, film recorders and calibration and profiling of displays.
  .
- This package is needed to compile programs against libicc2, as
- it only includes the header files and static libraries (optionally)
- needed for compiling.
+ This package contains the documentation for argyll.
 
-Package: libicc2
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: argyll
+Package: icc-utils
+Architecture: all
+Depends: argyll, ${misc:Depends}
+Breaks: libicc2 (<< 2.12+argyll1.4.0-2)
+Replaces: libicc2 (<< 2.12+argyll1.4.0-2)
 Description: ICC profile I/O library
  The icclib is a set of routines which implement the reading and
  writing of color profile files that conform to the International
  Color Consortium (ICC) Profile Format Specification, Version 3.4.
-
-Package: libimdi-dev
-Section: libdevel
-Architecture: any
-Multi-Arch: same
-Depends: libimdi0 (= ${binary:Version}), ${misc:Depends}
-Conflicts: argyll (<< 1.3.0-3)
-Description: Development files for the IMDI library
- The Interger Multi-Dimensional Interpolation routines provides a flexible
- and high performance system for applying color transforms to typical raster 
- pixel data.
  .
- This package is needed to compile programs against libimdi0, as
- it only includes the header files and static libraries (optionally)
- needed for compiling.
-
-Package: libimdi0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: argyll (<< 1.3.0-3)
-Description: Integer Multi-Dimensional Interpolation routines (IMDI) library
- The Interger Multi-Dimensional Interpolation routines provides a flexible
- and high performance system for applying color transforms to typical raster 
- pixel data.
+ This package is a dummy package. The iccdump & icclu are now in argyll.
diff --git a/debian/copyright b/debian/copyright
index 24f646f..18352f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,42 +1,243 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Name: ArgyllCMS
-Maintainer: Graeme W. Gill <Graeme@argyllcms.com>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ArgyllCMS
+Upstream-Contact:  Graeme W. Gill <Graeme@argyllcms.com>
 Source: http://www.argyllcms.com/
 
 Files: *
-Copyright: Copyright 1995-2010, Graeme W. Gill <Graeme@argyllcms.com>
+Copyright: 1995-2010 Graeme W. Gill <Graeme@argyllcms.com>
+License: AGPL-3
+
+Files:
+ icc/*
+ cgats/*
+ jcnf/*
+ ucmm/*
+Copyright: 1995-2011 Graeme W. Gill <Graeme@argyllcms.com>
+License: Expat
+
+Files: icc/iccV42.h
+Copyright: 1994-1998 SunSoft, Inc
+           1994-2014 Graeme W. Gill <Graeme@argyllcms.com>
+License: Expat
+
+Files: jcnf/yajl/*
+Copyright: 2007-2009 Lloyd Hilaiel
+License: BSD-3
+
+Files: jpg/*
+Copyright: 1991-2012 Thomas G. Lane
+           1991-2012 Guido Vollbeding
+License: other
+
+Files: jpg/ansi2knr.c
+Copyright: 1989-2000 Aladdin Enterprices
+License: GPL-1
+
+Files: usb/*
+Copyright: 2012      Graeme W. Gill <Graeme@argyllcms.com>
+License: Expat
+
+Files: usb/driver/*
+Copyright: 2002-2005 Stephan Meyer <ste_meyer@web.de>
+License: GPL-2 & LGPL-2
+ The library (DLL) is distributed under the terms of the GNU Lesser
+ General Public License (LGPL).
+ .
+ All other components (drivers, services, installer) are distributed
+ under the terms of the GNU General Public License (GPL).
+
+Files: usb/driver/ioctl.c
+Copyright: 2002-2005 Stephan Meyer <ste_meyer@web.de>
+           2010      Travis Robinson <libusbdotnet@gmail.com>
+License: GPL-2+
+
+Files: usb/driver/transfer.c
+Copyright: 2002-2005 Stephan Meyer <ste_meyer@web.de>
+           2010      Travis Robinson <libusbdotnet@gmail.com>
+License: GPL-3+
+
+Files: xicc/iccjpeg.*
+Copyright: 1998-2010 Marti Maria Saguer
+License: Expat
+
+Files: spectro/*
+Copyright: 1996-2011 Graeme W. Gill <Graeme@argyllcms.com>
+License: GPL-2+
+
+Files:
+ spectro/dispcal.c
+ spectro/dispsup.c
+ spectro/dispsup.h
+ spectro/dispwin.c
+ spectro/dispwin.h
+ spectro/average.c
+ spectro/synthcal.c
+ spectro/synthread.c
+ spectro/ccxxmake.c
+ spectro/fakeread.c
+ spectro/License.txt
+ spectro/chartread.c
+ spectro/dispread.c
+ spectro/illumread.c
+Copyright: 1996-2007 Graeme W. Gill <Graeme@argyllcms.com>
+License: AGPL-3
+
+Files: spectro/colorhug.*
+Copyright: 2006-2014 Graeme W. Gill <Graeme@argyllcms.com>
+           2011      Richaerd Hughes
+License: GPL-2+
+
+Files: spectro/mongoose.*
+Copyright: 2004-2012 Sergey Lyubka
+License: Expat
+
+Files: spectro/spec2cie.c
+Copyright: 2005      Gerhard Fuernkranz
+           2006-2007 Graeme W. Gill <Graeme@argyllcms.com>
+License: GPL-2+
+
+Files: h/sort.h
+Copyright: 1996-2010 Graeme W. Gill <Graeme@argyllcms.com>
+License: GPL-2+
+
+Files: tiff/*
+Copyright: 1988-1997 Sam Leffler
+           1991-1997 Silicon Graphics, Inc.
+License: Expat
+
+Files: tiff/contrib/addtiffo/*
+Copyright: 1999-2000 Frank Warmerdam <warmerdam@pobox.com>
+License: Expat
+
+Files: tiff/contrib/dbs/*
+Copyright: 1990-1991 Digital Equipment Corporation
+License: Expat
+
+Files: tiff/contrib/mfs/*
+Copyright: 1996      BancTec AB
+           1996      Mike Johnson
+License: Expat
+
+Files: tiff/contrib/pds/tif_pdsdir*
+Copyright: 1988-1996 Sam Leffler
+           1991-1996 Silicon Graphics, Inc.
+           1996      USAF Phillips Laboratory
+License: Expat
+
+Files: tiff/contrib/ras/*
+Copyright: 1990      Sun Microsystems, Inc.
+License: Expat
+
+Files: 
+ tiff/libtiff/mkg2states.h
+ tiff/libtiff/tif_fax3.*
+Copyright: 1991-1997 Sam Leffler
+           1991-1997 Silicon Graphics, Inc.
+           1990-1995 Frank D. Cringle
+License: Expat
+
+Files: tiff/libtiff/tif_luv.c
+Copyright: 1997      Greg Ward Larson
+           1997      Silicon Graphics, Inc.
+License: Expat
+
+Files: tiff/libtiff/tif_lzw.c
+Copyright: 1985-1986 The Regents of the University of California
+           1988-1997 Sam Leffler
+           1991-1997 Silicon Graphics, Inc.
+License: Expat
+
+Files: tiff/libtiff/tif_ojpeg.c
+Copyright:           Joris Van Damme <info@awaresystems.be>
+                     AWare Systems <http://www.awaresystems.be/>
+License: Expat
+
+Files: tiff/libtiff/tif_pixarlog.c
+Copyright: 1996-1997 Sam Leffler
+           1996      Pixar
+License: Expat
+
+Files: tiff/port/*
+Copyright: 1987-1994 The Regents of the University of California
+License: Expat
+
+Files: tiff/port/libport.h
+Copyright: 2009      Frank Warmerdam
+License: Expat
+
+Files: tiff/test/*
+Copyright: 2004      Andrey Kiselev <dron@ak4719.spb.edu>
+License: Expat
+
+Files: tiff/tools/tiffset.c
+Copyright: 2000      Frank Warmerdam
+License: Expat
+
+Files: tiff/tools/tiff2pdf.c
+Copyright: 2003      Ross Finlayson
+License: Expat
+
+Files: 
+ tiff/tools/bmp2tiff.c
+ tiff/tools/raw2tiff.c
+ tiff/tools/tiffgt.c 
+Copyright: 2002-2004, Andrey Kiselev <dron@ak4719.spb.edu>
+License: Expat
+
+Files: xicc/xspect.c
+Copyright: 2000-2006 Graeme W. Gill <Graeme@argyllcms.com>
+License: GPL-2+
+
+Files: doc/*
+Copyright: 1995-2010 Graeme W. Gill <Graeme@argyllcms.com>
+License: GFDL-1.3+
+
+Files: numlib/numsup.*
+Copyright: 1997-2010 Graeme W. Gill <Graeme@argyllcms.com>
+License: GPL-2+
+
+Files: rspl/rspl1.*
+Copyright: 1996-2010 Graeme W. Gill <Graeme@argyllcms.com>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2006-2008 Christian Marillat <marillat@debian.org>
+           2008-2010 Roland Mas <lolando@debian.org>
+           2014      Jörg Frings-Fürst <debian@jff-webhosting.net>
+License: GPL-3+
+
 License: AGPL-3
                      GNU AFFERO GENERAL PUBLIC LICENSE
                         Version 3, 19 November 2007
- 
+ .
   Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
   Everyone is permitted to copy and distribute verbatim copies
   of this license document, but changing it is not allowed.
- 
+ .
                              Preamble
- 
+ .
    The GNU Affero General Public License is a free, copyleft license for
  software and other kinds of works, specifically designed to ensure
  cooperation with the community in the case of network server software.
- 
+ .
    The licenses for most software and other practical works are designed
  to take away your freedom to share and change the works.  By contrast,
  our General Public Licenses are intended to guarantee your freedom to
  share and change all versions of a program--to make sure it remains free
  software for all its users.
- 
+ .
    When we speak of free software, we are referring to freedom, not
  price.  Our General Public Licenses are designed to make sure that you
  have the freedom to distribute copies of free software (and charge for
  them if you wish), that you receive source code or can get it if you
  want it, that you can change the software or use pieces of it in new
  free programs, and that you know you can do these things.
- 
+ .
    Developers that use our General Public Licenses protect your rights
  with two steps: (1) assert copyright on the software, and (2) offer
  you this License which gives you legal permission to copy, distribute
  and/or modify the software.
- 
+ .
    A secondary benefit of defending all users' freedom is that
  improvements made in alternate versions of the program, if they
  receive widespread use, become available for other developers to
@@ -46,7 +247,7 @@ License: AGPL-3
  The GNU General Public License permits making a modified version and
  letting the public access it on a server without ever releasing its
  source code to the public.
- 
+ .
    The GNU Affero General Public License is designed specifically to
  ensure that, in such cases, the modified source code becomes available
  to the community.  It requires the operator of a network server to
@@ -54,48 +255,48 @@ License: AGPL-3
  users of that server.  Therefore, public use of a modified version, on
  a publicly accessible server, gives the public access to the source
  code of the modified version.
- 
+ .
    An older license, called the Affero General Public License and
  published by Affero, was designed to accomplish similar goals.  This is
  a different license, not a version of the Affero GPL, but Affero has
  released a new version of the Affero GPL which permits relicensing under
  this license.
- 
+ .
    The precise terms and conditions for copying, distribution and
  modification follow.
- 
+ .
                         TERMS AND CONDITIONS
- 
+ .
    0. Definitions.
- 
+ .
    "This License" refers to version 3 of the GNU Affero General Public License.
- 
+ .
    "Copyright" also means copyright-like laws that apply to other kinds of
  works, such as semiconductor masks.
- 
+ .
    "The Program" refers to any copyrightable work licensed under this
  License.  Each licensee is addressed as "you".  "Licensees" and
  "recipients" may be individuals or organizations.
- 
+ .
    To "modify" a work means to copy from or adapt all or part of the work
  in a fashion requiring copyright permission, other than the making of an
  exact copy.  The resulting work is called a "modified version" of the
  earlier work or a work "based on" the earlier work.
- 
+ .
    A "covered work" means either the unmodified Program or a work based
  on the Program.
- 
+ .
    To "propagate" a work means to do anything with it that, without
  permission, would make you directly or secondarily liable for
  infringement under applicable copyright law, except executing it on a
  computer or modifying a private copy.  Propagation includes copying,
  distribution (with or without modification), making available to the
  public, and in some countries other activities as well.
- 
+ .
    To "convey" a work means any kind of propagation that enables other
  parties to make or receive copies.  Mere interaction with a user through
  a computer network, with no transfer of a copy, is not conveying.
- 
+ .
    An interactive user interface displays "Appropriate Legal Notices"
  to the extent that it includes a convenient and prominently visible
  feature that (1) displays an appropriate copyright notice, and (2)
@@ -104,18 +305,18 @@ License: AGPL-3
  work under this License, and how to view a copy of this License.  If
  the interface presents a list of user commands or options, such as a
  menu, a prominent item in the list meets this criterion.
- 
+ .
    1. Source Code.
- 
+ .
    The "source code" for a work means the preferred form of the work
  for making modifications to it.  "Object code" means any non-source
  form of a work.
- 
+ .
    A "Standard Interface" means an interface that either is an official
  standard defined by a recognized standards body, or, in the case of
  interfaces specified for a particular programming language, one that
  is widely used among developers working in that language.
- 
+ .
    The "System Libraries" of an executable work include anything, other
  than the work as a whole, that (a) is included in the normal form of
  packaging a Major Component, but which is not part of that Major
@@ -126,7 +327,7 @@ License: AGPL-3
  (kernel, window system, and so on) of the specific operating system
  (if any) on which the executable work runs, or a compiler used to
  produce the work, or an object code interpreter used to run it.
- 
+ .
    The "Corresponding Source" for a work in object code form means all
  the source code needed to generate, install, and (for an executable
  work) run the object code and to modify the work, including scripts to
@@ -139,16 +340,16 @@ License: AGPL-3
  linked subprograms that the work is specifically designed to require,
  such as by intimate data communication or control flow between those
  subprograms and other parts of the work.
- 
+ .
    The Corresponding Source need not include anything that users
  can regenerate automatically from other parts of the Corresponding
  Source.
- 
+ .
    The Corresponding Source for a work in source code form is that
  same work.
- 
+ .
    2. Basic Permissions.
- 
+ .
    All rights granted under this License are granted for the term of
  copyright on the Program, and are irrevocable provided the stated
  conditions are met.  This License explicitly affirms your unlimited
@@ -156,7 +357,7 @@ License: AGPL-3
  covered work is covered by this License only if the output, given its
  content, constitutes a covered work.  This License acknowledges your
  rights of fair use or other equivalent, as provided by copyright law.
- 
+ .
    You may make, run and propagate covered works that you do not
  convey, without conditions so long as your license otherwise remains
  in force.  You may convey covered works to others for the sole purpose
@@ -167,19 +368,19 @@ License: AGPL-3
  for you must do so exclusively on your behalf, under your direction
  and control, on terms that prohibit them from making any copies of
  your copyrighted material outside their relationship with you.
- 
+ .
    Conveying under any other circumstances is permitted solely under
  the conditions stated below.  Sublicensing is not allowed; section 10
  makes it unnecessary.
- 
+ .
    3. Protecting Users' Legal Rights From Anti-Circumvention Law.
- 
+ .
    No covered work shall be deemed part of an effective technological
  measure under any applicable law fulfilling obligations under article
  11 of the WIPO copyright treaty adopted on 20 December 1996, or
  similar laws prohibiting or restricting circumvention of such
  measures.
- 
+ .
    When you convey a covered work, you waive any legal power to forbid
  circumvention of technological measures to the extent such circumvention
  is effected by exercising rights under this License with respect to
@@ -187,9 +388,9 @@ License: AGPL-3
  modification of the work as a means of enforcing, against the work's
  users, your or third parties' legal rights to forbid circumvention of
  technological measures.
- 
+ .
    4. Conveying Verbatim Copies.
- 
+ .
    You may convey verbatim copies of the Program's source code as you
  receive it, in any medium, provided that you conspicuously and
  appropriately publish on each copy an appropriate copyright notice;
@@ -197,24 +398,24 @@ License: AGPL-3
  non-permissive terms added in accord with section 7 apply to the code;
  keep intact all notices of the absence of any warranty; and give all
  recipients a copy of this License along with the Program.
- 
+ .
    You may charge any price or no price for each copy that you convey,
  and you may offer support or warranty protection for a fee.
- 
+ .
    5. Conveying Modified Source Versions.
- 
+ .
    You may convey a work based on the Program, or the modifications to
  produce it from the Program, in the form of source code under the
  terms of section 4, provided that you also meet all of these conditions:
- 
+ .
      a) The work must carry prominent notices stating that you modified
      it, and giving a relevant date.
- 
+ .
      b) The work must carry prominent notices stating that it is
      released under this License and any conditions added under section
      7.  This requirement modifies the requirement in section 4 to
      "keep intact all notices".
- 
+ .
      c) You must license the entire work, as a whole, under this
      License to anyone who comes into possession of a copy.  This
      License will therefore apply, along with any applicable section 7
@@ -222,12 +423,12 @@ License: AGPL-3
      regardless of how they are packaged.  This License gives no
      permission to license the work in any other way, but it does not
      invalidate such permission if you have separately received it.
- 
+ .
      d) If the work has interactive user interfaces, each must display
      Appropriate Legal Notices; however, if the Program has interactive
      interfaces that do not display Appropriate Legal Notices, your
      work need not make them do so.
- 
+ .
    A compilation of a covered work with other separate and independent
  works, which are not by their nature extensions of the covered work,
  and which are not combined with it such as to form a larger program,
@@ -237,19 +438,19 @@ License: AGPL-3
  beyond what the individual works permit.  Inclusion of a covered work
  in an aggregate does not cause this License to apply to the other
  parts of the aggregate.
- 
+ .
    6. Conveying Non-Source Forms.
- 
+ .
    You may convey a covered work in object code form under the terms
  of sections 4 and 5, provided that you also convey the
  machine-readable Corresponding Source under the terms of this License,
  in one of these ways:
- 
+ .
      a) Convey the object code in, or embodied in, a physical product
      (including a physical distribution medium), accompanied by the
      Corresponding Source fixed on a durable physical medium
      customarily used for software interchange.
- 
+ .
      b) Convey the object code in, or embodied in, a physical product
      (including a physical distribution medium), accompanied by a
      written offer, valid for at least three years and valid for as
@@ -261,13 +462,13 @@ License: AGPL-3
      more than your reasonable cost of physically performing this
      conveying of source, or (2) access to copy the
      Corresponding Source from a network server at no charge.
- 
+ .
      c) Convey individual copies of the object code with a copy of the
      written offer to provide the Corresponding Source.  This
      alternative is allowed only occasionally and noncommercially, and
      only if you received the object code with such an offer, in accord
      with subsection 6b.
- 
+ .
      d) Convey the object code by offering access from a designated
      place (gratis or for a charge), and offer equivalent access to the
      Corresponding Source in the same way through the same place at no
@@ -280,16 +481,16 @@ License: AGPL-3
      Corresponding Source.  Regardless of what server hosts the
      Corresponding Source, you remain obligated to ensure that it is
      available for as long as needed to satisfy these requirements.
- 
+ .
      e) Convey the object code using peer-to-peer transmission, provided
      you inform other peers where the object code and Corresponding
      Source of the work are being offered to the general public at no
      charge under subsection 6d.
- 
+ .
    A separable portion of the object code, whose source code is excluded
  from the Corresponding Source as a System Library, need not be
  included in conveying the object code work.
- 
+ .
    A "User Product" is either (1) a "consumer product", which means any
  tangible personal property which is normally used for personal, family,
  or household purposes, or (2) anything designed or sold for incorporation
@@ -302,7 +503,7 @@ License: AGPL-3
  is a consumer product regardless of whether the product has substantial
  commercial, industrial or non-consumer uses, unless such uses represent
  the only significant mode of use of the product.
- 
+ .
    "Installation Information" for a User Product means any methods,
  procedures, authorization keys, or other information required to install
  and execute modified versions of a covered work in that User Product from
@@ -310,7 +511,7 @@ License: AGPL-3
  suffice to ensure that the continued functioning of the modified object
  code is in no case prevented or interfered with solely because
  modification has been made.
- 
+ .
    If you convey an object code work under this section in, or with, or
  specifically for use in, a User Product, and the conveying occurs as
  part of a transaction in which the right of possession and use of the
@@ -321,7 +522,7 @@ License: AGPL-3
  if neither you nor any third party retains the ability to install
  modified object code on the User Product (for example, the work has
  been installed in ROM).
- 
+ .
    The requirement to provide Installation Information does not include a
  requirement to continue to provide support service, warranty, or updates
  for a work that has been modified or installed by the recipient, or for
@@ -329,15 +530,15 @@ License: AGPL-3
  network may be denied when the modification itself materially and
  adversely affects the operation of the network or violates the rules and
  protocols for communication across the network.
- 
+ .
    Corresponding Source conveyed, and Installation Information provided,
  in accord with this section must be in a format that is publicly
  documented (and with an implementation available to the public in
  source code form), and must require no special password or key for
  unpacking, reading or copying.
- 
+ .
    7. Additional Terms.
- 
+ .
    "Additional permissions" are terms that supplement the terms of this
  License by making exceptions from one or more of its conditions.
  Additional permissions that are applicable to the entire Program shall
@@ -346,41 +547,41 @@ License: AGPL-3
  apply only to part of the Program, that part may be used separately
  under those permissions, but the entire Program remains governed by
  this License without regard to the additional permissions.
- 
+ .
    When you convey a copy of a covered work, you may at your option
  remove any additional permissions from that copy, or from any part of
  it.  (Additional permissions may be written to require their own
  removal in certain cases when you modify the work.)  You may place
  additional permissions on material, added by you to a covered work,
  for which you have or can give appropriate copyright permission.
- 
+ .
    Notwithstanding any other provision of this License, for material you
  add to a covered work, you may (if authorized by the copyright holders of
  that material) supplement the terms of this License with terms:
- 
+ .
      a) Disclaiming warranty or limiting liability differently from the
      terms of sections 15 and 16 of this License; or
- 
+ .
      b) Requiring preservation of specified reasonable legal notices or
      author attributions in that material or in the Appropriate Legal
      Notices displayed by works containing it; or
- 
+ .
      c) Prohibiting misrepresentation of the origin of that material, or
      requiring that modified versions of such material be marked in
      reasonable ways as different from the original version; or
- 
+ .
      d) Limiting the use for publicity purposes of names of licensors or
      authors of the material; or
- 
+ .
      e) Declining to grant rights under trademark law for use of some
      trade names, trademarks, or service marks; or
- 
+ .
      f) Requiring indemnification of licensors and authors of that
      material by anyone who conveys the material (or modified versions of
      it) with contractual assumptions of liability to the recipient, for
      any liability that these contractual assumptions directly impose on
      those licensors and authors.
- 
+ .
    All other non-permissive additional terms are considered "further
  restrictions" within the meaning of section 10.  If the Program as you
  received it, or any part of it, contains a notice stating that it is
@@ -390,46 +591,46 @@ License: AGPL-3
  License, you may add to a covered work material governed by the terms
  of that license document, provided that the further restriction does
  not survive such relicensing or conveying.
- 
+ .
    If you add terms to a covered work in accord with this section, you
  must place, in the relevant source files, a statement of the
  additional terms that apply to those files, or a notice indicating
  where to find the applicable terms.
- 
+ .
    Additional terms, permissive or non-permissive, may be stated in the
  form of a separately written license, or stated as exceptions;
  the above requirements apply either way.
- 
+ .
    8. Termination.
- 
+ .
    You may not propagate or modify a covered work except as expressly
  provided under this License.  Any attempt otherwise to propagate or
  modify it is void, and will automatically terminate your rights under
  this License (including any patent licenses granted under the third
  paragraph of section 11).
- 
+ .
    However, if you cease all violation of this License, then your
  license from a particular copyright holder is reinstated (a)
  provisionally, unless and until the copyright holder explicitly and
  finally terminates your license, and (b) permanently, if the copyright
  holder fails to notify you of the violation by some reasonable means
  prior to 60 days after the cessation.
- 
+ .
    Moreover, your license from a particular copyright holder is
  reinstated permanently if the copyright holder notifies you of the
  violation by some reasonable means, this is the first time you have
  received notice of violation of this License (for any work) from that
  copyright holder, and you cure the violation prior to 30 days after
  your receipt of the notice.
- 
+ .
    Termination of your rights under this section does not terminate the
  licenses of parties who have received copies or rights from you under
  this License.  If your rights have been terminated and not permanently
  reinstated, you do not qualify to receive new licenses for the same
  material under section 10.
- 
+ .
    9. Acceptance Not Required for Having Copies.
- 
+ .
    You are not required to accept this License in order to receive or
  run a copy of the Program.  Ancillary propagation of a covered work
  occurring solely as a consequence of using peer-to-peer transmission
@@ -438,14 +639,14 @@ License: AGPL-3
  modify any covered work.  These actions infringe copyright if you do
  not accept this License.  Therefore, by modifying or propagating a
  covered work, you indicate your acceptance of this License to do so.
- 
+ .
    10. Automatic Licensing of Downstream Recipients.
- 
+ .
    Each time you convey a covered work, the recipient automatically
  receives a license from the original licensors, to run, modify and
  propagate that work, subject to this License.  You are not responsible
  for enforcing compliance by third parties with this License.
- 
+ .
    An "entity transaction" is a transaction transferring control of an
  organization, or substantially all assets of one, or subdividing an
  organization, or merging organizations.  If propagation of a covered
@@ -455,7 +656,7 @@ License: AGPL-3
  give under the previous paragraph, plus a right to possession of the
  Corresponding Source of the work from the predecessor in interest, if
  the predecessor has it or can get it with reasonable efforts.
- 
+ .
    You may not impose any further restrictions on the exercise of the
  rights granted or affirmed under this License.  For example, you may
  not impose a license fee, royalty, or other charge for exercise of
@@ -463,13 +664,13 @@ License: AGPL-3
  (including a cross-claim or counterclaim in a lawsuit) alleging that
  any patent claim is infringed by making, using, selling, offering for
  sale, or importing the Program or any portion of it.
- 
+ .
    11. Patents.
- 
+ .
    A "contributor" is a copyright holder who authorizes use under this
  License of the Program or a work on which the Program is based.  The
  work thus licensed is called the contributor's "contributor version".
- 
+ .
    A contributor's "essential patent claims" are all patent claims
  owned or controlled by the contributor, whether already acquired or
  hereafter acquired, that would be infringed by some manner, permitted
@@ -479,19 +680,19 @@ License: AGPL-3
  purposes of this definition, "control" includes the right to grant
  patent sublicenses in a manner consistent with the requirements of
  this License.
- 
+ .
    Each contributor grants you a non-exclusive, worldwide, royalty-free
  patent license under the contributor's essential patent claims, to
  make, use, sell, offer for sale, import and otherwise run, modify and
  propagate the contents of its contributor version.
- 
+ .
    In the following three paragraphs, a "patent license" is any express
  agreement or commitment, however denominated, not to enforce a patent
  (such as an express permission to practice a patent or covenant not to
  sue for patent infringement).  To "grant" such a patent license to a
  party means to make such an agreement or commitment not to enforce a
  patent against the party.
- 
+ .
    If you convey a covered work, knowingly relying on a patent license,
  and the Corresponding Source of the work is not available for anyone
  to copy, free of charge and under the terms of this License, through a
@@ -505,7 +706,7 @@ License: AGPL-3
  covered work in a country, or your recipient's use of the covered work
  in a country, would infringe one or more identifiable patents in that
  country that you have reason to believe are valid.
- 
+ .
    If, pursuant to or in connection with a single transaction or
  arrangement, you convey, or propagate by procuring conveyance of, a
  covered work, and grant a patent license to some of the parties
@@ -513,7 +714,7 @@ License: AGPL-3
  or convey a specific copy of the covered work, then the patent license
  you grant is automatically extended to all recipients of the covered
  work and works based on it.
- 
+ .
    A patent license is "discriminatory" if it does not include within
  the scope of its coverage, prohibits the exercise of, or is
  conditioned on the non-exercise of one or more of the rights that are
@@ -528,13 +729,13 @@ License: AGPL-3
  for and in connection with specific products or compilations that
  contain the covered work, unless you entered into that arrangement,
  or that patent license was granted, prior to 28 March 2007.
- 
+ .
    Nothing in this License shall be construed as excluding or limiting
  any implied license or other defenses to infringement that may
  otherwise be available to you under applicable patent law.
- 
+ .
    12. No Surrender of Others' Freedom.
- 
+ .
    If conditions are imposed on you (whether by court order, agreement or
  otherwise) that contradict the conditions of this License, they do not
  excuse you from the conditions of this License.  If you cannot convey a
@@ -544,9 +745,9 @@ License: AGPL-3
  to collect a royalty for further conveying from those to whom you convey
  the Program, the only way you could satisfy both those terms and this
  License would be to refrain entirely from conveying the Program.
- 
+ .
    13. Remote Network Interaction; Use with the GNU General Public License.
- 
+ .
    Notwithstanding any other provision of this License, if you modify the
  Program, your modified version must prominently offer all users
  interacting with it remotely through a computer network (if your version
@@ -557,7 +758,7 @@ License: AGPL-3
  shall include the Corresponding Source for any work covered by version 3
  of the GNU General Public License that is incorporated pursuant to the
  following paragraph.
- 
+ .
    Notwithstanding any other provision of this License, you have
  permission to link or combine any covered work with a work licensed
  under version 3 of the GNU General Public License into a single
@@ -565,14 +766,14 @@ License: AGPL-3
  License will continue to apply to the part which is the covered work,
  but the work with which it is combined will remain governed by version
  3 of the GNU General Public License.
- 
+ .
    14. Revised Versions of this License.
- 
+ .
    The Free Software Foundation may publish revised and/or new versions of
  the GNU Affero General Public License from time to time.  Such new versions
  will be similar in spirit to the present version, but may differ in detail to
  address new problems or concerns.
- 
+ .
    Each version is given a distinguishing version number.  If the
  Program specifies that a certain numbered version of the GNU Affero General
  Public License "or any later version" applies to it, you have the
@@ -581,19 +782,19 @@ License: AGPL-3
  Foundation.  If the Program does not specify a version number of the
  GNU Affero General Public License, you may choose any version ever published
  by the Free Software Foundation.
- 
+ .
    If the Program specifies that a proxy can decide which future
  versions of the GNU Affero General Public License can be used, that proxy's
  public statement of acceptance of a version permanently authorizes you
  to choose that version for the Program.
- 
+ .
    Later license versions may give you additional or different
  permissions.  However, no additional obligations are imposed on any
  author or copyright holder as a result of your choosing to follow a
  later version.
- 
+ .
    15. Disclaimer of Warranty.
- 
+ .
    THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
  APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
  HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
@@ -602,9 +803,9 @@ License: AGPL-3
  PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
  IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
  ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- 
+ .
    16. Limitation of Liability.
- 
+ .
    IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
  THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
@@ -614,47 +815,47 @@ License: AGPL-3
  PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
  EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGES.
- 
+ .
    17. Interpretation of Sections 15 and 16.
- 
+ .
    If the disclaimer of warranty and limitation of liability provided
  above cannot be given local legal effect according to their terms,
  reviewing courts shall apply local law that most closely approximates
  an absolute waiver of all civil liability in connection with the
  Program, unless a warranty or assumption of liability accompanies a
  copy of the Program in return for a fee.
- 
+ .
                       END OF TERMS AND CONDITIONS
- 
+ .
              How to Apply These Terms to Your New Programs
- 
+ .
    If you develop a new program, and you want it to be of the greatest
  possible use to the public, the best way to achieve this is to make it
  free software which everyone can redistribute and change under these terms.
- 
+ .
    To do so, attach the following notices to the program.  It is safest
  to attach them to the start of each source file to most effectively
  state the exclusion of warranty; and each file should have at least
  the "copyright" line and a pointer to where the full notice is found.
- 
+ .
      <one line to give the program's name and a brief idea of what it does.>
      Copyright (C) <year>  <name of author>
- 
+ .
      This program is free software: you can redistribute it and/or modify
      it under the terms of the GNU Affero General Public License as published by
      the Free Software Foundation, either version 3 of the License, or
      (at your option) any later version.
- 
+ .
      This program is distributed in the hope that it will be useful,
      but WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      GNU Affero General Public License for more details.
- 
+ .
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
+ .
  Also add information on how to contact you by electronic and paper mail.
- 
+ .
    If your software can interact with users remotely through a computer
  network, you should also make sure that it provides a way for users to
  get its source.  For example, if your program is a web application, its
@@ -662,162 +863,175 @@ License: AGPL-3
  of the code.  There are many ways you could offer source, and different
  solutions will be better for different programs; see section 13 for the
  specific requirements.
- 
+ .
    You should also get your employer (if you work as a programmer) or school,
  if any, to sign a "copyright disclaimer" for the program, if necessary.
  For more information on this, and how to apply and follow the GNU AGPL, see
  <http://www.gnu.org/licenses/>.
 
-
-Files: icc/*, cgats/*, jcnf/*, ucmm/*
-Copyright: Copyright 1995-2011, Graeme W. Gill
-License: MIT/X11
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- 
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-Files: jcnf/yajl/*
-Copyright: Copyright 2007, Lloyd Hilaiel
 License: BSD-3
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without 
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, 
+    this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright notice, 
+    this list of conditions and the following disclaimer in the documentation 
+    and/or other materials provided with the distribution.
+ .
+ 3. Neither the name of the copyright holder nor the names of its contributors
+    may be used to endorse or promote products derived from this software 
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ POSSIBILITY OF SUCH DAMAGE.
 
-Files: libusb/*
-Copyright: Copyright 2000-2003, Johannes Erdfelt <johannes@erdfelt.com>
-Copyright: Copyright 2003, Brad Hards <bradh@frogmouth.net>
-Copyright: Copyright Thomas Sailer <sailer@ife.ee.ethz.ch>
-License: GPL-2+
-
-Files: libusb/usb.h.in
-Copyright: Copyright 2000-2003, Johannes Erdfelt <johannes@erdfelt.com>
-License: GPL-2+ | BSD-3
-
-Files: libusbw/*
-Copyright: Copyright 2000-2004, Johannes Erdfelt <johannes@erdfelt.com>
-Copyright: Copyright 2002-2005, Stephan Meyer <ste_meyer@web.de>
-Copyright: Copyright Thomas Sailer <sailer@ife.ee.ethz.ch>
-License: GPL-2 and LGPL-2
- The library (DLL) is distributed under the terms of the GNU Lesser
- General Public License (LGPL).
- 
- All other components (drivers, services, installer) are distributed
- under the terms of the GNU General Public License (GPL). 
-
-Files: libusb1/msvc/*
-Copyright: Copyright 2006, Alexander Chemeris
-License: BSD-2
-
-Files: libusb1/*
-Copyright: Copyright 2001, Johannes Erdfelt <johannes@erdfelt.com>
-Copyright: Copyright 2007-2009, Daniel Drake <dsd@gentoo.org>
-Copyright: Copyright 2008-2009, Nathan Hjelm <hjelmn@users.sourceforge.net>
-Copyright: Copyright 2009-2010, Pete Batard <pbatard@gmail.com>
-Copyright: Copyright 2010, Michael Plante <michael.plante@gmail.com>
-License: LGPL-2+
-
-Files: libusb1/os/driver/*
-Copyright: Copyright 2002-2005, Stephan Meyer <ste_meyer@web.de>
-License: GPL-2+
-
-Files: spectro/*
-Copyright: Copyright 1996-2011, Graeme W. Gill
-License: GPL-2+
-
-Files:
- spectro/dispcal.c
- spectro/dispsup.c
- spectro/dispsup.h
- spectro/dispwin.c
- spectro/dispwin.h
- spectro/average.c
- spectro/synthcal.c
- spectro/synthread.c
- spectro/ccxxmake.c
- spectro/fakeread.c
- spectro/License.txt
- spectro/chartread.c
- spectro/dispread.c
- spectro/illumread.c
-Copyright: Copyright 1996-2007, Graeme W. Gill
-License: AGPL-3
-
-Files: h/sort.h
-Copyright: Copyright 1996-2010, Graeme W. Gill
-License: GPL-2+
-
-Files: tiff/*
-Copyright: Copyright 1988-1997, Sam Leffler
-Copyright: Copyright 1991-1997, Silicon Graphics, Inc.
-License: MIT/X11
- Permission to use, copy, modify, distribute, and sell this software and 
- its documentation for any purpose is hereby granted without fee, provided
- that (i) the above copyright notices and this permission notice appear in
- all copies of the software and related documentation, and (ii) the names of
- Sam Leffler and Silicon Graphics may not be used in any advertising or
- publicity relating to the software without the specific, prior written
- permission of Sam Leffler and Silicon Graphics.
- 
- THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
- EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
- WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
- 
- IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
- ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
- OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
- LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
- OF THIS SOFTWARE.
-
-Files: tiff/contrib/addtiffo/*
-Copyright: Copyright 1999, Frank Warmerdam
-License: MIT/X11
- Same as above.
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
 
-Files: tiff/contrib/dbs/*
-Copyright: Copyright 1990, Digital Equipment Corporation
-License: MIT/X11
- Same as above.
+License: GFDL-1.3+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ .
+ On Debian systems, the complete text of the GNU Free Documentation License
+ version 1.3 can be found in "/usr/share/common-licenses/GFDL-1.3".
 
-Files: tiff/contrib/mfs/*
-Copyright: Copyright 1996 BancTec AB
-Copyright: Copyright 1996 Mike Johnson
-License: MIT/X11
- Same as above.
+License: GPL-1
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 1 of the License.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 1 can be found in the file
+ `/usr/share/common-licenses/GPL-1'.
 
-Files: tiff/contrib/ras/*
-Copyright: Copyright 1990, Sun Microsystems, Inc.
-License: MIT/X11
- Same as above.
-
-Files: xicc/xspect.c
-Copyright: Copyright 2000-2006, Graeme W. Gill
 License: GPL-2+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The complete text of the GNU General Public License
+ can be found in /usr/share/common-licenses/GPL-2 file.
 
-Files: doc/*
-Copyright: Copyright 1995-2010, Graeme W. Gill <Graeme@argyllcms.com>
-License: GFDL-1.3
-
-Files: numlib/numsup.*
-Copyright: Copyright 1997-2010, Graeme W. Gill
-License: GPL-2+
-
-Files: rspl/rspl1.*
-Copyright: 1996-2010, Graeme W. Gill
-License: GPL-2+
-
-Files: debian/*
-Copyright: Copyright 2006-2008, Christian Marillat <marillat@debian.org>
-Copyright: Copyright 2008-2010, Roland Mas <lolando@debian.org>
 License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: other
+ The authors make NO WARRANTY or representation, either express or implied,
+ with respect to this software, its quality, accuracy, merchantability, or
+ fitness for a particular purpose.  This software is provided "AS IS", and you,
+ its user, assume the entire risk as to its quality and accuracy.
+ .
+ This software is copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
+ All Rights Reserved except as specified below.
+ .
+ Permission is hereby granted to use, copy, modify, and distribute this
+ software (or portions thereof) for any purpose, without fee, subject to these
+ conditions:
+ (1) If any part of the source code for this software is distributed, then this
+ README file must be included, with this copyright and no-warranty notice
+ unaltered; and any additions, deletions, or changes to the original files
+ must be clearly indicated in accompanying documentation.
+ (2) If only executable code is distributed, then the accompanying
+ documentation must state that "this software is based in part on the work of
+ the Independent JPEG Group".
+ (3) Permission for use of this software is granted only if the user accepts
+ full responsibility for any undesirable consequences; the authors accept
+ NO LIABILITY for damages of any kind.
+ .
+ These conditions apply to any software derived from or based on the IJG code,
+ not just to the unmodified library.  If you use our work, you ought to
+ acknowledge us.
+ .
+ Permission is NOT granted for the use of any IJG author's name or company name
+ in advertising or publicity relating to this software or products derived from
+ it.  This software may be referred to only as "the Independent JPEG Group's
+ software".
+ .
+ We specifically permit and encourage the use of this software as the basis of
+ commercial products, provided that all warranty or liability claims are
+ assumed by the product vendor.
+ .
+ ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
+ sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
+ ansi2knr.c is NOT covered by the above copyright and conditions, but instead
+ by the usual distribution terms of the Free Software Foundation; principally,
+ that you must include source code if you redistribute it.  (See the file
+ ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
+ of any program generated from the IJG code, this does not limit you more than
+ the foregoing paragraphs do.
+ .
+ The Unix configuration script "configure" was produced with GNU Autoconf.
+ It is copyright by the Free Software Foundation but is freely distributable.
+ The same holds for its supporting scripts (config.guess, config.sub,
+ ltmain.sh).  Another support script, install-sh, is copyright by X Consortium
+ but is also freely distributable.
+ .
+ The IJG distribution formerly included code to read and write GIF files.
+ To avoid entanglement with the Unisys LZW patent, GIF reading support has
+ been removed altogether, and the GIF writer has been simplified to produce
+ "uncompressed GIFs".  This technique does not use the LZW algorithm; the
+ resulting GIF files are larger than usual, but are readable by all standard
+ GIF decoders.
+ .
+ We are required to state that
+    "The Graphics Interchange Format(c) is the Copyright property of
+    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
+    CompuServe Incorporated."
diff --git a/debian/fakeread.1 b/debian/fakeread.1
deleted file mode 100644
index 68d4211..0000000
--- a/debian/fakeread.1
+++ /dev/null
@@ -1,107 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH FAKE "1" "August 2013" "Fake test chart reader - lookup values in ICC/MPP profile, Version 1.5.1" "User Commands"
-.SH NAME
-Fake \- Fake test chart reader - lookup values in ICC/MPP profile.
-.SH DESCRIPTION
-Fake test chart reader \- lookup values in ICC/MPP profile, Version 1.5.1
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Too few arguments
-.PP
-usage: fakeread [\-v] [\-s] [separation.icm] profile.[icc|mpp|ti3] outfile
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-s\fR
-Lookup MPP spectral values
-.TP
-\fB\-p\fR
-Use separation profile
-.TP
-\fB\-l\fR
-Output Lab rather than XYZ
-.TP
-\fB\-k\fR file.cal
-Apply calibration (after sep.) and include in .ti3
-.TP
-\fB\-i\fR file.cal
-Include calibration in .ti3 (but don't apply it)
-.TP
-\fB\-r\fR level
-Add average random deviation of <level>% to input device values (after sep. & cal.)
-.TP
-\fB\-0\fR pow
-Apply power to input device chanel 0\-9 (after sep. cal. & rand)
-.TP
-\fB\-R\fR level
-Add average random deviation of <level>% to output PCS values
-.TP
-\fB\-u\fR
-Make random deviations have uniform distributions rather than normal
-.TP
-\fB\-S\fR seed
-Set random seed
-.TP
-\fB\-b\fR L,a,b
-Scale black point to target Lab value
-.TP
-\fB\-I\fR intent
-r = relative colorimetric, a = absolute (default)
-.TP
-[separation.icc]
-Device link separation profile
-.IP
-profile.[icc|mpp|ti3] ICC, MPP profile or TI3 to use
-outfile           Base name for input[ti1]/output[ti3] file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Too few arguments
-.PP
-usage: fakeread [\-v] [\-s] [separation.icm] profile.[icc|mpp|ti3] outfile
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-s\fR
-Lookup MPP spectral values
-.TP
-\fB\-p\fR
-Use separation profile
-.TP
-\fB\-l\fR
-Output Lab rather than XYZ
-.TP
-\fB\-k\fR file.cal
-Apply calibration (after sep.) and include in .ti3
-.TP
-\fB\-i\fR file.cal
-Include calibration in .ti3 (but don't apply it)
-.TP
-\fB\-r\fR level
-Add average random deviation of <level>% to input device values (after sep. & cal.)
-.TP
-\fB\-0\fR pow
-Apply power to input device chanel 0\-9 (after sep. cal. & rand)
-.TP
-\fB\-R\fR level
-Add average random deviation of <level>% to output PCS values
-.TP
-\fB\-u\fR
-Make random deviations have uniform distributions rather than normal
-.TP
-\fB\-S\fR seed
-Set random seed
-.TP
-\fB\-b\fR L,a,b
-Scale black point to target Lab value
-.TP
-\fB\-I\fR intent
-r = relative colorimetric, a = absolute (default)
-.TP
-[separation.icc]
-Device link separation profile
-.IP
-profile.[icc|mpp|ti3] ICC, MPP profile or TI3 to use
-outfile           Base name for input[ti1]/output[ti3] file
diff --git a/debian/icc-utils.install b/debian/icc-utils.install
deleted file mode 100644
index fc29bc0..0000000
--- a/debian/icc-utils.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/icclu
-usr/bin/iccdump
diff --git a/debian/icc-utils.manpages b/debian/icc-utils.manpages
deleted file mode 100644
index edf8334..0000000
--- a/debian/icc-utils.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/iccdump.1
-debian/icclu.1
diff --git a/debian/libicc-dev.install b/debian/libicc-dev.install
deleted file mode 100644
index bd6bae2..0000000
--- a/debian/libicc-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/icc.h
-usr/include/iccV42.h
-usr/lib/*/libicc.a
-usr/lib/*/libicc.so
diff --git a/debian/libicc2.install b/debian/libicc2.install
deleted file mode 100644
index 453ba88..0000000
--- a/debian/libicc2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libicc*.so.*
diff --git a/debian/libicc2.symbols b/debian/libicc2.symbols
deleted file mode 100644
index fa91e97..0000000
--- a/debian/libicc2.symbols
+++ /dev/null
@@ -1,103 +0,0 @@
-libicc.so.2 libicc2 #MINVER#
- icc_new_icmLuLut@Base 1.5.1
- icm1960UCS21964WUV@Base 1.5.1
- icm1960UCS2XYZ@Base 1.5.1
- icm1964WUV2XYZ@Base 1.5.1
- icm1976UCS2XYZ@Base 1.5.1
- icm2str@Base 1.5.1
- icmAdd3@Base 1.5.1
- icmAdd3x3@Base 1.5.1
- icmBlack@Base 1.5.1
- icmBlend3@Base 1.5.1
- icmCIE2K@Base 1.5.1
- icmCIE2Ksq@Base 1.5.1
- icmCIE94@Base 1.5.1
- icmCIE94sq@Base 1.5.1
- icmCSSig2chanNames@Base 1.5.1
- icmCSSig2nchan@Base 1.5.1
- icmChromAdaptMatrix@Base 1.5.1
- icmClamp3@Base 1.5.1
- icmClipLab@Base 1.5.1
- icmClipXYZ@Base 1.5.1
- icmCpy3x3@Base 1.5.1
- icmCpy3x4@Base 1.5.1
- icmCross3@Base 1.5.1
- icmD50@Base 1.5.1
- icmD50_100@Base 1.5.1
- icmD50_100_ary3@Base 1.5.1
- icmD50_ary3@Base 1.5.1
- icmD65@Base 1.5.1
- icmD65_100@Base 1.5.1
- icmD65_100_ary3@Base 1.5.1
- icmD65_ary3@Base 1.5.1
- icmDet3x3@Base 1.5.1
- icmDot3@Base 1.5.1
- icmInverse3x3@Base 1.5.1
- icmL2Y@Base 1.5.1
- icmLCh2Lab@Base 1.5.1
- icmLab2LCh@Base 1.5.1
- icmLab2XYZ@Base 1.5.1
- icmLabDE@Base 1.5.1
- icmLabDEsq@Base 1.5.1
- icmLineLineClosest@Base 1.5.1
- icmLuv2XYZ@Base 1.5.1
- icmMul3By3x4@Base 1.5.1
- icmMul3x3@Base 1.5.1
- icmMul3x3_2@Base 1.5.1
- icmMulBy2x2@Base 1.5.1
- icmMulBy3x3@Base 1.5.1
- icmNorm33@Base 1.5.1
- icmNorm33sq@Base 1.5.1
- icmNorm3@Base 1.5.1
- icmNorm3sq@Base 1.5.1
- icmNormalize33@Base 1.5.1
- icmNormalize3@Base 1.5.1
- icmPLab@Base 1.5.1
- icmPdv@Base 1.5.1
- icmPfv@Base 1.5.1
- icmPiv@Base 1.5.1
- icmPlaneDist3@Base 1.5.1
- icmPlaneEqn3@Base 1.5.1
- icmRGBprim2matrix@Base 1.5.1
- icmRotMat@Base 1.5.1
- icmScale33@Base 1.5.1
- icmScale3@Base 1.5.1
- icmScale3x3@Base 1.5.1
- icmSetMultiLutTables@Base 1.5.1
- icmSetUnity3x3@Base 1.5.1
- icmSub3@Base 1.5.1
- icmTensMul3@Base 1.5.1
- icmTranspose3x3@Base 1.5.1
- icmVecPlaneIsect@Base 1.5.1
- icmVecRotMat@Base 1.5.1
- icmXYZ21960UCS@Base 1.5.1
- icmXYZ21964WUV@Base 1.5.1
- icmXYZ21976UCS@Base 1.5.1
- icmXYZ2Lab@Base 1.5.1
- icmXYZ2Luv@Base 1.5.1
- icmXYZ2Yxy@Base 1.5.1
- icmXYZCIE2K@Base 1.5.1
- icmXYZCIE94@Base 1.5.1
- icmXYZLabDE@Base 1.5.1
- icmY2L@Base 1.5.1
- icmYxy2XYZ@Base 1.5.1
- new_icc@Base 1.5.1
- new_icc_a@Base 1.5.1
- new_icmAllocStd@Base 1.5.1
- new_icmFileMD5_a@Base 1.5.1
- new_icmFileMem@Base 1.5.1
- new_icmFileMem_a@Base 1.5.1
- new_icmFileMem_ad@Base 1.5.1
- new_icmFileMem_d@Base 1.5.1
- new_icmFileStd_fp@Base 1.5.1
- new_icmFileStd_fp_a@Base 1.5.1
- new_icmFileStd_name@Base 1.5.1
- new_icmFileStd_name_a@Base 1.5.1
- new_icmMD5@Base 1.5.1
- psh_inc@Base 1.5.1
- psh_init@Base 1.5.1
- psh_reset@Base 1.5.1
- read_Primitive@Base 1.5.1
- str2tag@Base 1.5.1
- tag2str@Base 1.5.1
- write_Primitive@Base 1.5.1
diff --git a/debian/libimdi-dev.install b/debian/libimdi-dev.install
deleted file mode 100644
index 88d4ce7..0000000
--- a/debian/libimdi-dev.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/include/imdi_arch.h
-usr/include/imdi_gen.h
-usr/include/imdi.h
-usr/include/imdi_tab.h
-usr/include/imdi_utl.h
-usr/include/refi.h
-usr/lib/*/libimdi.a
-usr/lib/*/libimdi.so
diff --git a/debian/libimdi0.install b/debian/libimdi0.install
deleted file mode 100644
index 58a0992..0000000
--- a/debian/libimdi0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libimdi*.so.*
diff --git a/debian/libimdi0.symbols b/debian/libimdi0.symbols
deleted file mode 100644
index 1f00372..0000000
--- a/debian/libimdi0.symbols
+++ /dev/null
@@ -1,16 +0,0 @@
-libimdi.so.0 libimdi0 #MINVER#
- (regex)"^imdi_k\d+@Base$" 1.5.1
- (regex)"^imdi_k\d+_gentab@Base$" 1.5.1
- imdi_tab@Base 1.5.1
- imdi_tab_free@Base 1.5.1
- in_adj@Base 1.5.1
- ktable@Base 1.5.1
- new_imdi@Base 1.5.1
- no_kfuncs@Base 1.5.1
- write_default@Base 1.5.1
- write_entry@Base 1.5.1
- write_uchar@Base 1.5.1
- write_uint@Base 1.5.1
- write_ulong@Base 1.5.1
- write_ulonglong@Base 1.5.1
- write_ushort@Base 1.5.1
diff --git a/debian/applycal.1 b/debian/man/applycal.1
index 12aef3f..c512245 100644
--- a/debian/applycal.1
+++ b/debian/man/applycal.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH APPLY "1" "August 2013" "Apply device calibration to an ICC profile, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH APPLY "1" "September 2014" "Apply device calibration to an ICC profile, Version 1.6.3" "User Commands"
 .SH NAME
 Apply \- Apply device calibration to an ICC profile.
 .SH DESCRIPTION
-Apply device calibration to an ICC profile, Version 1.5.1
+Apply device calibration to an ICC profile, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 .IP
 Diagnostic: Too few arguments
diff --git a/debian/average.1 b/debian/man/average.1
index 38b43c3..73fe678 100644
--- a/debian/average.1
+++ b/debian/man/average.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH AVERAGE "1" "August 2013" "Average or merge values in .ti3 like files, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH AVERAGE "1" "September 2014" "Average or merge values in .ti3 like files, Version 1.6.3" "User Commands"
 .SH NAME
 Average \- Average or merge values in .ti3 like files.
 .SH DESCRIPTION
-Average or merge values in .ti3 like files, Version 1.5.1
+Average or merge values in .ti3 like files, Version 1.6.3
 .IP
 Diagnostic: Too few arguments (1, minimum is 2)
 .PP
diff --git a/debian/cb2ti3.1 b/debian/man/cb2ti3.1
index 93b39d4..16681cb 100644
--- a/debian/cb2ti3.1
+++ b/debian/man/cb2ti3.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CONVERT "1" "August 2013" "Convert Colorblind raw device profile data to Argyll data, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CONVERT "1" "September 2014" "Convert Colorblind raw device profile data to Argyll data, Version 1.6.3" "User Commands"
 .SH NAME
 Convert \- Convert Colorblind raw device profile data to Argyll data.
 .SH DESCRIPTION
-Convert Colorblind raw device profile data to Argyll data, Version 1.5.1
+Convert Colorblind raw device profile data to Argyll data, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: cb2ti3 [\-v] [\-l limit] infile outfile
 .TP
diff --git a/debian/cctiff.1 b/debian/man/cctiff.1
index 7198186..fd017d0 100644
--- a/debian/cctiff.1
+++ b/debian/man/cctiff.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH COLOR "1" "August 2013" "Color Correct a TIFF or JPEG file using any sequence of ICC profiles or Calibrations, V1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH COLOR "1" "September 2014" "Color Correct a TIFF or JPEG file using any sequence of ICC profiles or Calibrations, V1.6.3" "User Commands"
 .SH NAME
 Color \- Color Correct a TIFF file using any sequence of ICC profiles or Calibrations.
 .SH DESCRIPTION
-Color Correct a TIFF or JPEG file using any sequence of ICC profiles or Calibrations, V1.5.1
+Color Correct a TIFF or JPEG file using any sequence of ICC profiles or Calibrations, V1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 .IP
 Diagnostic: Unknown flag '\-'
diff --git a/debian/ccxxmake.1 b/debian/man/ccxxmake.1
index afae2c7..0bd7df7 100644
--- a/debian/ccxxmake.1
+++ b/debian/man/ccxxmake.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create CCMX or CCSS, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create CCMX or CCSS, Version 1.6.3" "User Commands"
 .SH NAME
 Create \- Create CCMX or CCSS.
 .SH DESCRIPTION
-Create CCMX or CCSS, Version 1.5.1
+Create CCMX or CCSS, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 Diagnostic: Flag '\-\-' not recognised
 usage: ccmxmake [\-options] output.ccmx
@@ -24,7 +24,7 @@ Choose the display n from the following list (default 1)
 Optionally choose different display m for VideoLUT access
 .IP
 1 name = ':0.0'
-1 = 'Screen 1, Output VBOX0 at 0, 0, width 1605, height 1079'
+1 = 'Screen 1, Output DVI\-I\-1 at 0, 0, width 1920, height 1080'
 .TP
 \fB\-dweb[\fR:port]
 Display via a web server at port (default 8080)
@@ -80,6 +80,9 @@ Set UI selection character(s)
 \fB\-Y\fR r|n
 Set or override refresh/non\-refresh display type
 .TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-Y\fR A
 Use non\-adaptive integration time mode (if available).
 .IP
@@ -107,7 +110,7 @@ Choose the display n from the following list (default 1)
 Optionally choose different display m for VideoLUT access
 .IP
 1 name = ':0.0'
-1 = 'Screen 1, Output VBOX0 at 0, 0, width 1605, height 1079'
+1 = 'Screen 1, Output DVI\-I\-1 at 0, 0, width 1920, height 1080'
 .TP
 \fB\-dweb[\fR:port]
 Display via a web server at port (default 8080)
@@ -163,6 +166,9 @@ Set UI selection character(s)
 \fB\-Y\fR r|n
 Set or override refresh/non\-refresh display type
 .TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-Y\fR A
 Use non\-adaptive integration time mode (if available).
 .IP
diff --git a/debian/chartread.1 b/debian/man/chartread.1
index d4d0bbf..1d3d21c 100644
--- a/debian/chartread.1
+++ b/debian/man/chartread.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH READ "1" "August 2013" "Read Target Test Chart, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH READ "1" "September 2014" "Read Target Test Chart, Version 1.6.3" "User Commands"
 .SH NAME
 Read \- Read Target Test Chart.
 .SH DESCRIPTION
-Read Target Test Chart, Version 1.5.1
+Read Target Test Chart, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: chartread [\-options] outfile
 .TP
diff --git a/debian/collink.1 b/debian/man/collink.1
index 2ee3c2f..5a933dd 100644
--- a/debian/collink.1
+++ b/debian/man/collink.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH LINK "1" "August 2013" "Link ICC profiles, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH LINK "1" "September 2014" "Link ICC profiles, Version 1.6.3" "User Commands"
 .SH NAME
 Link \- Link ICC profiles.
 .SH DESCRIPTION
-Link ICC profiles, Version 1.5.1
+Link ICC profiles, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 .IP
 Diagnostic: Too few arguments, got 1 expect at least 3
@@ -51,6 +51,12 @@ Special :\- Force 100% C,M or Y only to stay pure
 \fB\-p\fR absprof
 Include abstract profile in link
 .TP
+\fB\-a\fR file.cal
+Apply calibration curves to link output and append linear
+.TP
+\fB\-H\fR file.cal
+Append calibration curves to 3dlut
+.TP
 \fB\-s\fR
 Simple Mode (default)
 .TP
@@ -92,7 +98,7 @@ ms \- Saturation
 s \- Enhanced Saturation [ICC Saturation]
 .IP
 al \- Absolute Colorimetric (Lab)
-rl \- White Point Matched Appearance (Lab)
+rl \- White Point Matched Colorimetric (Lab)
 .TP
 \fB\-w\fR [J,a,b]
 Use forced whitepoint hack [optional target point]
@@ -113,6 +119,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
@@ -135,16 +142,19 @@ Adaptation luminance in cd.m^2 (default 50.0)
 b:background
 Background % of image luminance (default 20)
 .TP
-l:scenewhite
-Scene white in cd.m^2 if surround = auto (default 250)
+l:imagewhite
+Image white in cd.m^2 if surround = auto (default 250)
 .TP
 f:flare
-Flare light % of image luminance (default 1)
+Flare light % of image luminance (default 0)
+.TP
+g:glare
+Flare light % of ambient (default 1)
 .TP
-f:X:Y:Z
-Flare color as XYZ (default media white)
+g:X:Y:Z
+Flare color as XYZ (default media white, Abs: D50)
 .TP
-f:x:y
+g:x:y
 Flare color as x, y
 .TP
 \fB\-t\fR tlimit
@@ -176,6 +186,60 @@ set destination total ink limit, 0 \- 400% (estimate by default)
 \fB\-L\fR klimit
 set destination black ink limit, 0 \- 100% (estimate by default)
 .TP
+\fB\-3\fR flag
+Create "3DLut" output file as well as devlink
+.TP
+e
+eeColor .txt file
+.TP
+m
+MadVR .3dlut   file
+.TP
+\fB\-I\fR b
+Apply BT.1886\-like mapping with effective gamma 2.2 to input
+.TP
+\fB\-I\fR b:g.g
+Apply BT.1886\-like mapping with effective gamma g.g to input
+.TP
+\fB\-I\fR B
+Apply BT.1886 mapping with technical gamma 2.4 to input
+.TP
+\fB\-I\fR B:g.g
+Apply BT.1886 mapping with technical gamma g.g to input
+.TP
+\fB\-e\fR flag
+Video encode input as:
+.TP
+\fB\-E\fR flag
+Video encode output as:
+.TP
+n
+normal 0..1 full range RGB levels (default)
+.TP
+t
+(16\-235)/255 "TV" RGB levels
+.TP
+6
+Rec601 YCbCr SD (16\-235,240)/255 "TV" levels
+.TP
+7
+Rec709 1125/60Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+5
+Rec709 1250/50Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+2
+Rec2020 YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
+C
+Rec2020 Constant Luminance YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
+x
+xvYCC Rec601 YCbCr Rec709 Prims. SD (16\-235,240)/255 "TV" levels
+.TP
+X
+xvYCC Rec709 YCbCr Rec709 Prims. HD (16\-235,240)/255 "TV" levels
+.TP
 \fB\-P\fR
 Create gamut gammap.wrl diagostic
 .PP
@@ -226,6 +290,12 @@ Special :\- Force 100% C,M or Y only to stay pure
 \fB\-p\fR absprof
 Include abstract profile in link
 .TP
+\fB\-a\fR file.cal
+Apply calibration curves to link output and append linear
+.TP
+\fB\-H\fR file.cal
+Append calibration curves to 3dlut
+.TP
 \fB\-s\fR
 Simple Mode (default)
 .TP
@@ -267,7 +337,7 @@ ms \- Saturation
 s \- Enhanced Saturation [ICC Saturation]
 .IP
 al \- Absolute Colorimetric (Lab)
-rl \- White Point Matched Appearance (Lab)
+rl \- White Point Matched Colorimetric (Lab)
 .TP
 \fB\-w\fR [J,a,b]
 Use forced whitepoint hack [optional target point]
@@ -288,6 +358,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
@@ -310,16 +381,19 @@ Adaptation luminance in cd.m^2 (default 50.0)
 b:background
 Background % of image luminance (default 20)
 .TP
-l:scenewhite
-Scene white in cd.m^2 if surround = auto (default 250)
+l:imagewhite
+Image white in cd.m^2 if surround = auto (default 250)
 .TP
 f:flare
-Flare light % of image luminance (default 1)
+Flare light % of image luminance (default 0)
+.TP
+g:glare
+Flare light % of ambient (default 1)
 .TP
-f:X:Y:Z
-Flare color as XYZ (default media white)
+g:X:Y:Z
+Flare color as XYZ (default media white, Abs: D50)
 .TP
-f:x:y
+g:x:y
 Flare color as x, y
 .TP
 \fB\-t\fR tlimit
@@ -351,5 +425,59 @@ set destination total ink limit, 0 \- 400% (estimate by default)
 \fB\-L\fR klimit
 set destination black ink limit, 0 \- 100% (estimate by default)
 .TP
+\fB\-3\fR flag
+Create "3DLut" output file as well as devlink
+.TP
+e
+eeColor .txt file
+.TP
+m
+MadVR .3dlut   file
+.TP
+\fB\-I\fR b
+Apply BT.1886\-like mapping with effective gamma 2.2 to input
+.TP
+\fB\-I\fR b:g.g
+Apply BT.1886\-like mapping with effective gamma g.g to input
+.TP
+\fB\-I\fR B
+Apply BT.1886 mapping with technical gamma 2.4 to input
+.TP
+\fB\-I\fR B:g.g
+Apply BT.1886 mapping with technical gamma g.g to input
+.TP
+\fB\-e\fR flag
+Video encode input as:
+.TP
+\fB\-E\fR flag
+Video encode output as:
+.TP
+n
+normal 0..1 full range RGB levels (default)
+.TP
+t
+(16\-235)/255 "TV" RGB levels
+.TP
+6
+Rec601 YCbCr SD (16\-235,240)/255 "TV" levels
+.TP
+7
+Rec709 1125/60Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+5
+Rec709 1250/50Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+2
+Rec2020 YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
+C
+Rec2020 Constant Luminance YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
+x
+xvYCC Rec601 YCbCr Rec709 Prims. SD (16\-235,240)/255 "TV" levels
+.TP
+X
+xvYCC Rec709 YCbCr Rec709 Prims. HD (16\-235,240)/255 "TV" levels
+.TP
 \fB\-P\fR
 Create gamut gammap.wrl diagostic
diff --git a/debian/colprof.1 b/debian/man/colprof.1
index 75e8564..b9feb69 100644
--- a/debian/colprof.1
+++ b/debian/man/colprof.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create ICC profile, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create ICC profile, Version 1.6.3" "User Commands"
 .SH NAME
 Create \- Create ICC profile.
 .SH DESCRIPTION
-Create ICC profile, Version 1.5.1
+Create ICC profile, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 .IP
 Diagnostic: Unknown flag '\-'
@@ -36,9 +36,6 @@ Quality \- Low, Medium (def), High, Ultra
 \fB\-b\fR [lmhun]
 Low quality B2A table \- or specific B2A quality or none for input device
 .TP
-\fB\-y\fR
-Verify A2B profile
-.TP
 \fB\-ni\fR
 Don't create input (Device) shaper curves
 .TP
@@ -90,6 +87,9 @@ If input profile, scale media white point by scale
 \fB\-R\fR
 Restrict white <= 1.0, black and primaries to be +ve
 .TP
+\fB\-V\fR demphasis
+Degree of dark region cLUT grid emphasis 1.0\-4.0 (default 1.00 = none)
+.TP
 \fB\-f\fR [illum]
 Use Fluorescent Whitening Agent compensation [opt. simulated inst. illum.:
 .IP
@@ -149,7 +149,7 @@ ms \- Saturation
 s \- Enhanced Saturation [ICC Saturation]
 .IP
 al \- Absolute Colorimetric (Lab)
-rl \- White Point Matched Appearance (Lab)
+rl \- White Point Matched Colorimetric (Lab)
 .TP
 \fB\-c\fR viewcond
 set input viewing conditions for output profile CIECAM02 gamut mapping,
@@ -171,6 +171,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
@@ -218,9 +219,6 @@ Quality \- Low, Medium (def), High, Ultra
 \fB\-b\fR [lmhun]
 Low quality B2A table \- or specific B2A quality or none for input device
 .TP
-\fB\-y\fR
-Verify A2B profile
-.TP
 \fB\-ni\fR
 Don't create input (Device) shaper curves
 .TP
@@ -272,6 +270,9 @@ If input profile, scale media white point by scale
 \fB\-R\fR
 Restrict white <= 1.0, black and primaries to be +ve
 .TP
+\fB\-V\fR demphasis
+Degree of dark region cLUT grid emphasis 1.0\-4.0 (default 1.00 = none)
+.TP
 \fB\-f\fR [illum]
 Use Fluorescent Whitening Agent compensation [opt. simulated inst. illum.:
 .IP
@@ -331,7 +332,7 @@ ms \- Saturation
 s \- Enhanced Saturation [ICC Saturation]
 .IP
 al \- Absolute Colorimetric (Lab)
-rl \- White Point Matched Appearance (Lab)
+rl \- White Point Matched Colorimetric (Lab)
 .TP
 \fB\-c\fR viewcond
 set input viewing conditions for output profile CIECAM02 gamut mapping,
@@ -353,6 +354,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
diff --git a/debian/verify.1 b/debian/man/colverifiy.1
index 09f742f..e53707b 100644
--- a/debian/verify.1
+++ b/debian/man/colverifiy.1
@@ -1,20 +1,23 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH VERIFY "1" "August 2013" "Verify CIE values, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH VERIFY "1" "September 2014" "Verify CIE values, Version 1.6.3" "User Commands"
 .SH NAME
 Verify \- Verify CIE values.
 .SH DESCRIPTION
-Verify CIE values, Version 1.5.1
+Verify CIE values, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: verify [\-options] target.ti3 measured.ti3
 .TP
-\fB\-v\fR
-Verbose \- print each patch value
+\fB\-v\fR [n]
+Verbose mode, n >= 2 print each value
 .TP
 \fB\-n\fR
-Normalise each files reading to white Y
+Normalise each files reading to its white Y
 .TP
 \fB\-N\fR
-Normalise each files reading to white XYZ
+Normalise each files reading to its white XYZ
+.TP
+\fB\-m\fR
+Normalise each files reading to its white X+Y+Z
 .TP
 \fB\-D\fR
 Use D50 100.0 as L*a*b* white reference
@@ -51,6 +54,9 @@ A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp
 Choose CIE Observer for spectral data:
 1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
 .TP
+\fB\-L\fR profile.icc
+Skip any first file out of profile gamut patches
+.TP
 \fB\-X\fR file.ccmx
 Apply Colorimeter Correction Matrix to second file
 .TP
@@ -63,14 +69,17 @@ Measured (actual) PCS or spectral values
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: verify [\-options] target.ti3 measured.ti3
 .TP
-\fB\-v\fR
-Verbose \- print each patch value
+\fB\-v\fR [n]
+Verbose mode, n >= 2 print each value
 .TP
 \fB\-n\fR
-Normalise each files reading to white Y
+Normalise each files reading to its white Y
 .TP
 \fB\-N\fR
-Normalise each files reading to white XYZ
+Normalise each files reading to its white XYZ
+.TP
+\fB\-m\fR
+Normalise each files reading to its white X+Y+Z
 .TP
 \fB\-D\fR
 Use D50 100.0 as L*a*b* white reference
@@ -107,6 +116,9 @@ A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp
 Choose CIE Observer for spectral data:
 1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
 .TP
+\fB\-L\fR profile.icc
+Skip any first file out of profile gamut patches
+.TP
 \fB\-X\fR file.ccmx
 Apply Colorimeter Correction Matrix to second file
 .TP
diff --git a/debian/man/colverify.1 b/debian/man/colverify.1
new file mode 100644
index 0000000..e53707b
--- /dev/null
+++ b/debian/man/colverify.1
@@ -0,0 +1,129 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH VERIFY "1" "September 2014" "Verify CIE values, Version 1.6.3" "User Commands"
+.SH NAME
+Verify \- Verify CIE values.
+.SH DESCRIPTION
+Verify CIE values, Version 1.6.3
+Author: Graeme W. Gill, licensed under the AGPL Version 3
+usage: verify [\-options] target.ti3 measured.ti3
+.TP
+\fB\-v\fR [n]
+Verbose mode, n >= 2 print each value
+.TP
+\fB\-n\fR
+Normalise each files reading to its white Y
+.TP
+\fB\-N\fR
+Normalise each files reading to its white XYZ
+.TP
+\fB\-m\fR
+Normalise each files reading to its white X+Y+Z
+.TP
+\fB\-D\fR
+Use D50 100.0 as L*a*b* white reference
+.TP
+\fB\-c\fR
+Show CIE94 delta E values
+.TP
+\fB\-k\fR
+Show CIEDE2000 delta E values
+.TP
+\fB\-s\fR
+Sort patch values by error
+.TP
+\fB\-w\fR
+create VRML vector visualisation (measured.wrl)
+.TP
+\fB\-W\fR
+create VRML marker visualisation (measured.wrl)
+.TP
+\fB\-x\fR
+Use VRML axes
+.TP
+\fB\-f\fR [illum]
+Use Fluorescent Whitening Agent compensation [opt. simulated inst. illum.:
+.IP
+M0, M1, M2, A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp]
+.TP
+\fB\-i\fR illum
+Choose illuminant for computation of CIE XYZ from spectral data & FWA:
+.IP
+A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp
+.TP
+\fB\-o\fR observ
+Choose CIE Observer for spectral data:
+1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
+.TP
+\fB\-L\fR profile.icc
+Skip any first file out of profile gamut patches
+.TP
+\fB\-X\fR file.ccmx
+Apply Colorimeter Correction Matrix to second file
+.TP
+target.ti3
+Target (reference) PCS or spectral values.
+.TP
+measured.ti3
+Measured (actual) PCS or spectral values
+.PP
+Author: Graeme W. Gill, licensed under the AGPL Version 3
+usage: verify [\-options] target.ti3 measured.ti3
+.TP
+\fB\-v\fR [n]
+Verbose mode, n >= 2 print each value
+.TP
+\fB\-n\fR
+Normalise each files reading to its white Y
+.TP
+\fB\-N\fR
+Normalise each files reading to its white XYZ
+.TP
+\fB\-m\fR
+Normalise each files reading to its white X+Y+Z
+.TP
+\fB\-D\fR
+Use D50 100.0 as L*a*b* white reference
+.TP
+\fB\-c\fR
+Show CIE94 delta E values
+.TP
+\fB\-k\fR
+Show CIEDE2000 delta E values
+.TP
+\fB\-s\fR
+Sort patch values by error
+.TP
+\fB\-w\fR
+create VRML vector visualisation (measured.wrl)
+.TP
+\fB\-W\fR
+create VRML marker visualisation (measured.wrl)
+.TP
+\fB\-x\fR
+Use VRML axes
+.TP
+\fB\-f\fR [illum]
+Use Fluorescent Whitening Agent compensation [opt. simulated inst. illum.:
+.IP
+M0, M1, M2, A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp]
+.TP
+\fB\-i\fR illum
+Choose illuminant for computation of CIE XYZ from spectral data & FWA:
+.IP
+A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp
+.TP
+\fB\-o\fR observ
+Choose CIE Observer for spectral data:
+1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
+.TP
+\fB\-L\fR profile.icc
+Skip any first file out of profile gamut patches
+.TP
+\fB\-X\fR file.ccmx
+Apply Colorimeter Correction Matrix to second file
+.TP
+target.ti3
+Target (reference) PCS or spectral values.
+.TP
+measured.ti3
+Measured (actual) PCS or spectral values
diff --git a/debian/dispcal.1 b/debian/man/dispcal.1
index ce04a1f..1570b98 100644
--- a/debian/dispcal.1
+++ b/debian/man/dispcal.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CALIBRATE "1" "August 2013" "Calibrate a Display, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CALIBRATE "1" "September 2014" "Calibrate a Display, Version 1.6.3" "User Commands"
 .SH NAME
 Calibrate \- Calibrate a Display.
 .SH DESCRIPTION
-Calibrate a Display, Version 1.5.1
+Calibrate a Display, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 Diagnostic: Usage requested
 usage: dispcal [options] outfile
@@ -17,7 +17,7 @@ Verbose mode
 Choose the display n from the following list (default 1)
 Optionally choose different display m for VideoLUT access
 .IP
-1 = 'Screen 1, Output VBOX0 at 0, 0, width 1605, height 1079'
+1 = 'Screen 1, Output DVI\-I\-1 at 0, 0, width 1920, height 1080'
 .TP
 \fB\-dweb[\fR:port]
 Display via a web server at port (default 8080)
@@ -92,7 +92,7 @@ Set the target black brightness in cd/m^2
 \fB\-e\fR [n]
 Run n verify passes on final curves
 .TP
-\fB\-E\fR
+\fB\-z\fR
 Run only verify pass on installed calibration curves
 .TP
 \fB\-P\fR ho,vo,ss[,vs]
@@ -106,6 +106,9 @@ Fill whole screen with black background
 \fB\-n\fR
 Don't set override redirect on test window
 .TP
+\fB\-E\fR
+Encode the test values for video range 16..235/255
+.TP
 \fB\-J\fR
 Run instrument calibration first (used rarely)
 .TP
@@ -128,9 +131,15 @@ Choose CIE Observer for spectrometer or CCSS colorimeter data:
 \fB\-I\fR b|w
 Drift compensation, Black: \fB\-Ib\fR, White: \fB\-Iw\fR, Both: \fB\-Ibw\fR
 .TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-Y\fR A
 Use non\-adaptive integration time mode (if available).
 .TP
+\fB\-Y\fR p
+Don't wait for the instrument to be placed on the display
+.TP
 \fB\-C\fR "command"
 Invoke shell "command" each time a color is set
 .TP
@@ -159,7 +168,7 @@ Verbose mode
 Choose the display n from the following list (default 1)
 Optionally choose different display m for VideoLUT access
 .IP
-1 = 'Screen 1, Output VBOX0 at 0, 0, width 1605, height 1079'
+1 = 'Screen 1, Output DVI\-I\-1 at 0, 0, width 1920, height 1080'
 .TP
 \fB\-dweb[\fR:port]
 Display via a web server at port (default 8080)
@@ -234,7 +243,7 @@ Set the target black brightness in cd/m^2
 \fB\-e\fR [n]
 Run n verify passes on final curves
 .TP
-\fB\-E\fR
+\fB\-z\fR
 Run only verify pass on installed calibration curves
 .TP
 \fB\-P\fR ho,vo,ss[,vs]
@@ -248,6 +257,9 @@ Fill whole screen with black background
 \fB\-n\fR
 Don't set override redirect on test window
 .TP
+\fB\-E\fR
+Encode the test values for video range 16..235/255
+.TP
 \fB\-J\fR
 Run instrument calibration first (used rarely)
 .TP
@@ -270,9 +282,15 @@ Choose CIE Observer for spectrometer or CCSS colorimeter data:
 \fB\-I\fR b|w
 Drift compensation, Black: \fB\-Ib\fR, White: \fB\-Iw\fR, Both: \fB\-Ibw\fR
 .TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-Y\fR A
 Use non\-adaptive integration time mode (if available).
 .TP
+\fB\-Y\fR p
+Don't wait for the instrument to be placed on the display
+.TP
 \fB\-C\fR "command"
 Invoke shell "command" each time a color is set
 .TP
diff --git a/debian/dispread.1 b/debian/man/dispread.1
index 44b042f..dbf1776 100644
--- a/debian/dispread.1
+++ b/debian/man/dispread.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH READ "1" "August 2013" "Read a Display, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH READ "1" "September 2014" "Read a Display, Version 1.6.3" "User Commands"
 .SH NAME
 Read \- Read a Display.
 .SH DESCRIPTION
-Read a Display, Version 1.5.1
+Read a Display, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 Diagnostic: Usage requested
 usage: dispread [options] outfile
@@ -17,7 +17,7 @@ Verbose mode
 Choose the display n from the following list (default 1)
 Optionally choose different display m for VideoLUT access
 .IP
-1 = 'Screen 1, Output VBOX0 at 0, 0, width 1605, height 1079'
+1 = 'Screen 1, Output DVI\-I\-1 at 0, 0, width 1920, height 1080'
 .TP
 \fB\-dweb[\fR:port]
 Display via a web server at port (default 8080)
@@ -50,6 +50,9 @@ Fill whole screen with black background
 \fB\-n\fR
 Don't set override redirect on test window
 .TP
+\fB\-E\fR
+Encode the test values for video range 16..235/255
+.TP
 \fB\-J\fR
 Run instrument calibration first (used rarely)
 .TP
@@ -75,9 +78,15 @@ Choose CIE Observer for spectrometer or CCSS colorimeter data:
 \fB\-I\fR b|w
 Drift compensation, Black: \fB\-Ib\fR, White: \fB\-Iw\fR, Both: \fB\-Ibw\fR
 .TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-Y\fR A
 Use non\-adaptive integration time mode (if available).
 .TP
+\fB\-Y\fR p
+Don't wait for the instrument to be placed on the display
+.TP
 \fB\-C\fR "command"
 Invoke shell "command" each time a color is set
 .TP
@@ -106,7 +115,7 @@ Verbose mode
 Choose the display n from the following list (default 1)
 Optionally choose different display m for VideoLUT access
 .IP
-1 = 'Screen 1, Output VBOX0 at 0, 0, width 1605, height 1079'
+1 = 'Screen 1, Output DVI\-I\-1 at 0, 0, width 1920, height 1080'
 .TP
 \fB\-dweb[\fR:port]
 Display via a web server at port (default 8080)
@@ -139,6 +148,9 @@ Fill whole screen with black background
 \fB\-n\fR
 Don't set override redirect on test window
 .TP
+\fB\-E\fR
+Encode the test values for video range 16..235/255
+.TP
 \fB\-J\fR
 Run instrument calibration first (used rarely)
 .TP
@@ -164,9 +176,15 @@ Choose CIE Observer for spectrometer or CCSS colorimeter data:
 \fB\-I\fR b|w
 Drift compensation, Black: \fB\-Ib\fR, White: \fB\-Iw\fR, Both: \fB\-Ibw\fR
 .TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-Y\fR A
 Use non\-adaptive integration time mode (if available).
 .TP
+\fB\-Y\fR p
+Don't wait for the instrument to be placed on the display
+.TP
 \fB\-C\fR "command"
 Invoke shell "command" each time a color is set
 .TP
diff --git a/debian/dispwin.1 b/debian/man/dispwin.1
index 6e1d5a1..9781182 100644
--- a/debian/dispwin.1
+++ b/debian/man/dispwin.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH TEST "1" "August 2013" "Test display patch window, Set Video LUTs, Install profiles, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH TEST "1" "September 2014" "Test display patch window, Set Video LUTs, Install profiles, Version 1.6.3" "User Commands"
 .SH NAME
 Test \- Test display patch window, Set Video LUTs, Install profiles.
 .SH DESCRIPTION
-Test display patch window, Set Video LUTs, Install profiles, Version 1.5.1
+Test display patch window, Set Video LUTs, Install profiles, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 Diagnostic: Unknown flag '\-\-help'
 usage: dispwin [options] [calfile]
@@ -17,7 +17,7 @@ Verbose mode
 Choose the display n from the following list (default 1)
 Optionally choose different display m for Video LUT access
 .IP
-1 = 'Screen 1, Output VBOX0 at 0, 0, width 1605, height 1079'
+1 = 'Screen 1, Output DVI\-I\-1 at 0, 0, width 1920, height 1080'
 .TP
 \fB\-dweb[\fR:port]
 Display via a web server at port (default 8080)
@@ -34,6 +34,9 @@ Run forever with random values
 \fB\-G\fR filename
 Display RGB colors from CGATS file
 .TP
+\fB\-C\fR r.rr,g.gg,b.bb
+Add this RGB color to list to be displayed
+.TP
 \fB\-m\fR
 Manually cycle through values
 .TP
@@ -44,7 +47,7 @@ Test grey ramp fade
 Test just Video LUT loading & Beeps
 .TP
 \fB\-n\fR
-Test native output (rather than through Video LUT)
+Test native output (rather than through Video LUT and C.M.)
 .TP
 \fB\-s\fR filename
 Save the currently loaded Video LUT to 'filename'
@@ -68,7 +71,7 @@ d is one of: n = network, l = local system, u = user (default)
 \fB\-L\fR
 Load installed profiles cal. into Video LUT
 .TP
-\fB\-E\fR
+\fB\-X\fR
 Run in daemon loader mode for given X11 server
 .TP
 \fB\-D\fR [level]
@@ -90,7 +93,7 @@ Verbose mode
 Choose the display n from the following list (default 1)
 Optionally choose different display m for Video LUT access
 .IP
-1 = 'Screen 1, Output VBOX0 at 0, 0, width 1605, height 1079'
+1 = 'Screen 1, Output DVI\-I\-1 at 0, 0, width 1920, height 1080'
 .TP
 \fB\-dweb[\fR:port]
 Display via a web server at port (default 8080)
@@ -107,6 +110,9 @@ Run forever with random values
 \fB\-G\fR filename
 Display RGB colors from CGATS file
 .TP
+\fB\-C\fR r.rr,g.gg,b.bb
+Add this RGB color to list to be displayed
+.TP
 \fB\-m\fR
 Manually cycle through values
 .TP
@@ -117,7 +123,7 @@ Test grey ramp fade
 Test just Video LUT loading & Beeps
 .TP
 \fB\-n\fR
-Test native output (rather than through Video LUT)
+Test native output (rather than through Video LUT and C.M.)
 .TP
 \fB\-s\fR filename
 Save the currently loaded Video LUT to 'filename'
@@ -141,7 +147,7 @@ d is one of: n = network, l = local system, u = user (default)
 \fB\-L\fR
 Load installed profiles cal. into Video LUT
 .TP
-\fB\-E\fR
+\fB\-X\fR
 Run in daemon loader mode for given X11 server
 .TP
 \fB\-D\fR [level]
diff --git a/debian/extracticc.1 b/debian/man/extracticc.1
index 941e610..5bf0a00 100644
--- a/debian/extracticc.1
+++ b/debian/man/extracticc.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH EXTRACT "1" "August 2013" "Extract an ICC profile from a TIFF or JPEG file, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH EXTRACT "1" "September 2014" "Extract an ICC profile from a TIFF or JPEG file, Version 1.6.3" "User Commands"
 .SH NAME
 Extract \- Extract an ICC profile from a TIFF file.
 .SH DESCRIPTION
-Extract an ICC profile from a TIFF or JPEG file, Version 1.5.1
+Extract an ICC profile from a TIFF or JPEG file, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 Diagnostic: Too few parameters
 usage: extracticc  [\-v] infile.tif/jpg outfile.icc
diff --git a/debian/extractttag.1 b/debian/man/extractttag.1
index ee10a25..9bc01dc 100644
--- a/debian/extractttag.1
+++ b/debian/man/extractttag.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH EXTRACT "1" "August 2013" "Extract a text tag from an ICC profile, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH EXTRACT "1" "September 2014" "Extract a text tag from an ICC profile, Version 1.6.3" "User Commands"
 .SH NAME
 Extract \- Extract a text tag from an ICC profile.
 .SH DESCRIPTION
-Extract a text tag from an ICC profile, Version 1.5.1
+Extract a text tag from an ICC profile, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 Diagnostic: Too few parameters
 usage: extractttag  [\-v] infile.icc outfile
diff --git a/debian/fakeCMY.1 b/debian/man/fakeCMY.1
index 7cde10e..91d02f9 100644
--- a/debian/fakeCMY.1
+++ b/debian/man/fakeCMY.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create a fake CMY data file from a CMYK profile, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create a fake CMY data file from a CMYK profile, Version 1.6.3" "User Commands"
 .SH NAME
 Create \- Create a fake CMY data file from a CMYK profile.
 .SH DESCRIPTION
-Create a fake CMY data file from a CMYK profile, Version 1.5.1
+Create a fake CMY data file from a CMYK profile, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: fakeCMY [option] profile.icm fake.ti3
 Diagnostic: Unknown flag
diff --git a/debian/man/fakeread.1 b/debian/man/fakeread.1
new file mode 100644
index 0000000..337fe45
--- /dev/null
+++ b/debian/man/fakeread.1
@@ -0,0 +1,179 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH FAKE "1" "September 2014" "Fake test chart reader - lookup values in ICC/MPP profile, Version 1.6.3" "User Commands"
+.SH NAME
+Fake \- Fake test chart reader - lookup values in ICC/MPP profile.
+.SH DESCRIPTION
+Fake test chart reader \- lookup values in ICC/MPP profile, Version 1.6.3
+Author: Graeme W. Gill, licensed under the AGPL Version 3
+.IP
+Diagnostic: Too few arguments
+.PP
+usage: fakeread [\-options] profile.[icc|mpp|ti3] outfile
+.TP
+\fB\-v\fR [n]
+Verbose mode [level]
+.TP
+\fB\-e\fR flag
+Video encode device input to sepration as:
+.TP
+n
+normal 0..1 full range RGB levels (default)
+.TP
+t
+(16\-235)/255 "TV" RGB levels
+.TP
+6
+Rec601 YCbCr SD (16\-235,240)/255 "TV" levels
+.TP
+7
+Rec709 1125/60Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+5
+Rec709 1250/50Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+2
+Rec2020 YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
+C
+Rec2020 Constant Luminance YCbCr UHD (16\-235,240)/255 "TV" levels
+.HP
+\fB\-p\fR separation.icc Use device link separation profile on input
+.TP
+\fB\-E\fR flag
+Video decode separation device output. See \fB\-e\fR above
+.TP
+\fB\-k\fR file.cal
+Apply calibration (include in .ti3 output)
+.TP
+\fB\-i\fR file.cal
+Include calibration in .ti3 output, but don't apply it
+.TP
+\fB\-K\fR file.cal
+Apply inverse calibration
+.TP
+\fB\-r\fR level
+Add average random deviation of <level>% to device values (after sep. & cal.)
+.TP
+\fB\-0\fR pow
+Apply power to device chanel 0\-9
+.TP
+\fB\-b\fR output.icc
+Apply BT.1886\-like mapping with effective gamma 2.2
+.HP
+\fB\-b\fR g.g:output.icc Apply BT.1886\-like mapping with effective gamma g.g
+.TP
+\fB\-B\fR output.icc
+Apply BT.1886 mapping with technical gamma 2.4
+.HP
+\fB\-B\fR g.g:output.icc Apply BT.1886 mapping with technical gamma g.g
+.TP
+\fB\-I\fR intent
+r = relative colorimetric, a = absolute (default)
+.TP
+\fB\-A\fR L,a,b
+Scale black point to target Lab value
+.TP
+\fB\-l\fR
+Output Lab rather than XYZ
+.TP
+\fB\-s\fR
+Lookup MPP spectral values
+.TP
+\fB\-R\fR level
+Add average random deviation of <level>% to output PCS values
+.TP
+\fB\-u\fR
+Make random deviations have uniform distributions rather than normal
+.TP
+\fB\-S\fR seed
+Set random seed
+.IP
+profile.[icc|mpp|ti3] ICC, MPP profile or TI3 to use
+outfile           Base name for input[ti1]/output[ti3] file
+.PP
+Author: Graeme W. Gill, licensed under the AGPL Version 3
+.IP
+Diagnostic: Too few arguments
+.PP
+usage: fakeread [\-options] profile.[icc|mpp|ti3] outfile
+.TP
+\fB\-v\fR [n]
+Verbose mode [level]
+.TP
+\fB\-e\fR flag
+Video encode device input to sepration as:
+.TP
+n
+normal 0..1 full range RGB levels (default)
+.TP
+t
+(16\-235)/255 "TV" RGB levels
+.TP
+6
+Rec601 YCbCr SD (16\-235,240)/255 "TV" levels
+.TP
+7
+Rec709 1125/60Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+5
+Rec709 1250/50Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+2
+Rec2020 YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
+C
+Rec2020 Constant Luminance YCbCr UHD (16\-235,240)/255 "TV" levels
+.HP
+\fB\-p\fR separation.icc Use device link separation profile on input
+.TP
+\fB\-E\fR flag
+Video decode separation device output. See \fB\-e\fR above
+.TP
+\fB\-k\fR file.cal
+Apply calibration (include in .ti3 output)
+.TP
+\fB\-i\fR file.cal
+Include calibration in .ti3 output, but don't apply it
+.TP
+\fB\-K\fR file.cal
+Apply inverse calibration
+.TP
+\fB\-r\fR level
+Add average random deviation of <level>% to device values (after sep. & cal.)
+.TP
+\fB\-0\fR pow
+Apply power to device chanel 0\-9
+.TP
+\fB\-b\fR output.icc
+Apply BT.1886\-like mapping with effective gamma 2.2
+.HP
+\fB\-b\fR g.g:output.icc Apply BT.1886\-like mapping with effective gamma g.g
+.TP
+\fB\-B\fR output.icc
+Apply BT.1886 mapping with technical gamma 2.4
+.HP
+\fB\-B\fR g.g:output.icc Apply BT.1886 mapping with technical gamma g.g
+.TP
+\fB\-I\fR intent
+r = relative colorimetric, a = absolute (default)
+.TP
+\fB\-A\fR L,a,b
+Scale black point to target Lab value
+.TP
+\fB\-l\fR
+Output Lab rather than XYZ
+.TP
+\fB\-s\fR
+Lookup MPP spectral values
+.TP
+\fB\-R\fR level
+Add average random deviation of <level>% to output PCS values
+.TP
+\fB\-u\fR
+Make random deviations have uniform distributions rather than normal
+.TP
+\fB\-S\fR seed
+Set random seed
+.IP
+profile.[icc|mpp|ti3] ICC, MPP profile or TI3 to use
+outfile           Base name for input[ti1]/output[ti3] file
diff --git a/debian/greytiff.1 b/debian/man/greytiff.1
index 93a7e31..137686c 100644
--- a/debian/greytiff.1
+++ b/debian/man/greytiff.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CONVERT "1" "August 2013" "Convert a TIFF file to monochrome using an ICC device profile, V1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CONVERT "1" "September 2014" "Convert a TIFF file to monochrome using an ICC device profile, V1.6.3" "User Commands"
 .SH NAME
 Convert \- Convert a TIFF file to monochrome using an ICC device profile.
 .SH DESCRIPTION
-Convert a TIFF file to monochrome using an ICC device profile, V1.5.1
+Convert a TIFF file to monochrome using an ICC device profile, V1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: greytiff [\-v level] profile.icm infile.tif outfile.tif
 .TP
diff --git a/debian/iccdump.1 b/debian/man/iccdump.1
index 3d1b8ef..6c75135 100644
--- a/debian/iccdump.1
+++ b/debian/man/iccdump.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH DUMP "1" "August 2013" "Dump an ICC file in human readable form, V2.16" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH DUMP "1" "September 2014" "Dump an ICC file in human readable form, V2.17" "User Commands"
 .SH NAME
 Dump \- Dump an ICC file in human readable form.
 .SH DESCRIPTION
-Dump an ICC file in human readable form, V2.16
+Dump an ICC file in human readable form, V2.17
 Author: Graeme W. Gill
 usage: iccdump [\-v level] [\-t tagname] [\-s] infile
 .TP
diff --git a/debian/iccgamut.1 b/debian/man/iccgamut.1
index 28abb13..b83978a 100644
--- a/debian/iccgamut.1
+++ b/debian/man/iccgamut.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create Lab/Jab gamut plot Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create Lab/Jab gamut plot Version 1.6.3" "User Commands"
 .SH NAME
 Create \- Create Lab/Jab gamut plot.
 .SH DESCRIPTION
-Create Lab/Jab gamut plot Version 1.5.1
+Create Lab/Jab gamut plot Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: iccgamut [options] profile
 Diagnostic: Unknown flag
@@ -55,6 +55,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
@@ -77,16 +78,19 @@ Adaptation luminance in cd.m^2 (default 50.0)
 b:background
 Background % of image luminance (default 20)
 .TP
-l:scenewhite
-Scene white in cd.m^2 if surround = auto (default 250)
+l:imagewhite
+Image white in cd.m^2 if surround = auto (default 250)
 .TP
 f:flare
-Flare light % of image luminance (default 1)
+Flare light % of image luminance (default 0)
 .TP
-f:X:Y:Z
-Flare color as XYZ (default media white)
+g:glare
+Flare light % of ambient (default 1)
 .TP
-f:x:y
+g:X:Y:Z
+Flare color as XYZ (default media white, Abs: D50)
+.TP
+g:x:y
 Flare color as x, y
 .TP
 \fB\-s\fR
@@ -143,6 +147,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
@@ -165,16 +170,19 @@ Adaptation luminance in cd.m^2 (default 50.0)
 b:background
 Background % of image luminance (default 20)
 .TP
-l:scenewhite
-Scene white in cd.m^2 if surround = auto (default 250)
+l:imagewhite
+Image white in cd.m^2 if surround = auto (default 250)
 .TP
 f:flare
-Flare light % of image luminance (default 1)
+Flare light % of image luminance (default 0)
+.TP
+g:glare
+Flare light % of ambient (default 1)
 .TP
-f:X:Y:Z
-Flare color as XYZ (default media white)
+g:X:Y:Z
+Flare color as XYZ (default media white, Abs: D50)
 .TP
-f:x:y
+g:x:y
 Flare color as x, y
 .TP
 \fB\-s\fR
diff --git a/debian/icclu.1 b/debian/man/icclu.1
index f0239a6..5a2c08f 100644
--- a/debian/icclu.1
+++ b/debian/man/icclu.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH TRANSLATE "1" "August 2013" "Translate colors through an ICC profile, V2.16" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH TRANSLATE "1" "September 2014" "Translate colors through an ICC profile, V2.17" "User Commands"
 .SH NAME
 Translate \- Translate colors through an ICC profile.
 .SH DESCRIPTION
-Translate colors through an ICC profile, V2.16
+Translate colors through an ICC profile, V2.17
 Author: Graeme W. Gill
 usage: icclu [\-v level] [\-f func] [\-i intent] [\-o order] profile
 .TP
diff --git a/debian/illumread.1 b/debian/man/illumread.1
index 07f7ba0..078ae66 100644
--- a/debian/illumread.1
+++ b/debian/man/illumread.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH MEASURE "1" "August 2013" "Measure an illuminant, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH MEASURE "1" "September 2014" "Measure an illuminant, Version 1.6.3" "User Commands"
 .SH NAME
 Measure \- Measure an illuminant.
 .SH DESCRIPTION
-Measure an illuminant, Version 1.5.1
+Measure an illuminant, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: illumread [\-options] output.sp
 .TP
@@ -24,6 +24,12 @@ Disable initial calibration of instrument if possible
 \fB\-H\fR
 Use high resolution spectrum mode (if available)
 .TP
+\fB\-Y\fR r
+Set refresh measurement mode
+.TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-W\fR n|h|x
 Override serial port flow control: n = none, h = HW, x = Xon/Xoff
 .TP
@@ -53,6 +59,12 @@ Disable initial calibration of instrument if possible
 \fB\-H\fR
 Use high resolution spectrum mode (if available)
 .TP
+\fB\-Y\fR r
+Set refresh measurement mode
+.TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-W\fR n|h|x
 Override serial port flow control: n = none, h = HW, x = Xon/Xoff
 .TP
diff --git a/debian/invprofcheck.1 b/debian/man/invprofcheck.1
index d3781b3..f61e35e 100644
--- a/debian/invprofcheck.1
+++ b/debian/man/invprofcheck.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CHECK "1" "August 2013" "Check fwd to bwd relative transfer of an ICC file, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CHECK "1" "September 2014" "Check fwd to bwd relative transfer of an ICC file, Version 1.6.3" "User Commands"
 .SH NAME
 Check \- Check fwd to bwd relative transfer of an ICC file.
 .SH DESCRIPTION
-Check fwd to bwd relative transfer of an ICC file, Version 1.5.1
+Check fwd to bwd relative transfer of an ICC file, Version 1.6.3
 Author: Graeme W. Gill
 usage: invprofcheck [\-] profile.icm
 .TP
@@ -38,7 +38,7 @@ create VRML visualisation (profile.wrl)
 Use VRML axes
 .TP
 \fB\-e\fR
-Color vectors acording to delta E
+Color vectors according to delta E
 .TP
 profile.icm
 Profile to check
@@ -77,7 +77,7 @@ create VRML visualisation (profile.wrl)
 Use VRML axes
 .TP
 \fB\-e\fR
-Color vectors acording to delta E
+Color vectors according to delta E
 .TP
 profile.icm
 Profile to check
diff --git a/debian/kodak2ti3.1 b/debian/man/kodak2ti3.1
index 325b564..78db11d 100644
--- a/debian/kodak2ti3.1
+++ b/debian/man/kodak2ti3.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CONVERT "1" "August 2013" "Convert Kodak raw printer profile data to Argyll print data, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CONVERT "1" "September 2014" "Convert Kodak raw printer profile data to Argyll print data, Version 1.6.3" "User Commands"
 .SH NAME
 Convert \- Convert Kodak raw printer profile data to Argyll print data.
 .SH DESCRIPTION
-Convert Kodak raw printer profile data to Argyll print data, Version 1.5.1
+Convert Kodak raw printer profile data to Argyll print data, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: kodak2ti3 [\-v] [\-l limit] infile outfile
 .TP
diff --git a/debian/mppcheck.1 b/debian/man/mppcheck.1
index 9aad8d6..51cfdc7 100644
--- a/debian/mppcheck.1
+++ b/debian/man/mppcheck.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CHECK "1" "August 2013" "Check Model Printer Profile, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CHECK "1" "September 2014" "Check Model Printer Profile, Version 1.6.3" "User Commands"
 .SH NAME
 Check \- Check Model Printer Profile.
 .SH DESCRIPTION
-Check Model Printer Profile, Version 1.5.1
+Check Model Printer Profile, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: debian/tmp/usr/bin/mppcheck [\-v] [\-c] [\-s] [\-y] values.ti3 profile.mpp
 .TP
diff --git a/debian/mpplu.1 b/debian/man/mpplu.1
index ad19c94..2f9fdcd 100644
--- a/debian/mpplu.1
+++ b/debian/man/mpplu.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH TRANSLATE "1" "August 2013" "Translate colors through an MPP profile, V1.00" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH TRANSLATE "1" "September 2014" "Translate colors through an MPP profile, V1.00" "User Commands"
 .SH NAME
 Translate \- Translate colors through an MPP profile.
 .SH DESCRIPTION
diff --git a/debian/mppprof.1 b/debian/man/mppprof.1
index 007453f..f0c129b 100644
--- a/debian/mppprof.1
+++ b/debian/man/mppprof.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create Model Printer Profile, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create Model Printer Profile, Version 1.6.3" "User Commands"
 .SH NAME
 Create \- Create Model Printer Profile.
 .SH DESCRIPTION
-Create Model Printer Profile, Version 1.5.1
+Create Model Printer Profile, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: debian/tmp/usr/bin/mppprof [options] outfile
 .HP
diff --git a/debian/oeminst.1 b/debian/man/oeminst.1
index 8db1f8a..28de472 100644
--- a/debian/oeminst.1
+++ b/debian/man/oeminst.1
@@ -1,13 +1,13 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH INSTALL "1" "August 2013" "Install OEM data files, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH INSTALL "1" "September 2014" "Install OEM data files, Version 1.6.3" "User Commands"
 .SH NAME
 Install \- List information about the FILEs.
 .SH DESCRIPTION
-Install OEM data files, Version 1.5.1
+Install OEM data files, Version 1.6.3
 Author: Graeme W. Gill, licensed under the GPL Version 2 or later
 usage: oeminst [\-options] [infile(s)]
 .TP
-\fB\-v\fR
+\fB\-v\fR [level]
 Verbose
 .TP
 \fB\-n\fR
@@ -29,7 +29,7 @@ If no file is provided, oeminst will look for the install CD.
 Author: Graeme W. Gill, licensed under the GPL Version 2 or later
 usage: oeminst [\-options] [infile(s)]
 .TP
-\fB\-v\fR
+\fB\-v\fR [level]
 Verbose
 .TP
 \fB\-n\fR
diff --git a/debian/printcal.1 b/debian/man/printcal.1
index 93e0c5c..5680462 100644
--- a/debian/printcal.1
+++ b/debian/man/printcal.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create printer calibration, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create printer calibration, Version 1.6.3" "User Commands"
 .SH NAME
 Create \- Create printer calibration.
 .SH DESCRIPTION
-Create printer calibration, Version 1.5.1
+Create printer calibration, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 .IP
 Diagnostic: Too few arguments, got 1 expect at least 2
diff --git a/debian/printtarg.1 b/debian/man/printtarg.1
index bad9f5a..f8e21d9 100644
--- a/debian/printtarg.1
+++ b/debian/man/printtarg.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH GENERATE "1" "August 2013" "Generate Target PostScrip file, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH GENERATE "1" "September 2014" "Generate Target PostScrip file, Version 1.6.3" "User Commands"
 .SH NAME
 Generate \- Generate Target PostScrip file.
 .SH DESCRIPTION
-Generate Target PostScrip file, Version 1.5.1
+Generate Target PostScrip file, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 .IP
 Diagnostic: Unknown flag
@@ -105,6 +105,9 @@ Don't limit strip length
 \fB\-L\fR
 Suppress any left paper clip border
 .TP
+\fB\-U\fR
+Suppress CUPS cupsJobTicket: cups\-disable\-cmm in PS & EPS files
+.TP
 \fB\-p\fR size
 Select page size from:
 A4       [210.0 x 297.0 mm]
@@ -224,6 +227,9 @@ Don't limit strip length
 \fB\-L\fR
 Suppress any left paper clip border
 .TP
+\fB\-U\fR
+Suppress CUPS cupsJobTicket: cups\-disable\-cmm in PS & EPS files
+.TP
 \fB\-p\fR size
 Select page size from:
 A4       [210.0 x 297.0 mm]
diff --git a/debian/profcheck.1 b/debian/man/profcheck.1
index d6d974d..d290f68 100644
--- a/debian/profcheck.1
+++ b/debian/man/profcheck.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CHECK "1" "August 2013" "Check accuracy of ICC profile, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CHECK "1" "September 2014" "Check accuracy of ICC profile, Version 1.6.3" "User Commands"
 .SH NAME
 Check \- Check accuracy of ICC profile.
 .SH DESCRIPTION
-Check accuracy of ICC profile, Version 1.5.1
+Check accuracy of ICC profile, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: profcheck [\-options] data.ti3 iccprofile.icm
 .TP
@@ -26,7 +26,7 @@ Use VRML axes
 Make VRML lines a minimum of 0.5
 .TP
 \fB\-e\fR
-Color vectors acording to delta E
+Color vectors according to delta E
 .HP
 \fB\-d\fR devval1,deval2,devvalN
 .IP
@@ -81,7 +81,7 @@ Use VRML axes
 Make VRML lines a minimum of 0.5
 .TP
 \fB\-e\fR
-Color vectors acording to delta E
+Color vectors according to delta E
 .HP
 \fB\-d\fR devval1,deval2,devvalN
 .IP
diff --git a/debian/refine.1 b/debian/man/refine.1
index ad63ddf..18845db 100644
--- a/debian/refine.1
+++ b/debian/man/refine.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create abstract correction profile given table of absolute CIE correction values, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create abstract correction profile given table of absolute CIE correction values, Version 1.6.3" "User Commands"
 .SH NAME
 Create \- Create abstract correction profile given table of absolute CIE correction values.
 .SH DESCRIPTION
-Create abstract correction profile given table of absolute CIE correction values, Version 1.5.1
+Create abstract correction profile given table of absolute CIE correction values, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 Diagnostic: Too few arguments
 usage: refine [\-options] cietarget ciecurrent [outdevicc] [inabs] outabs
diff --git a/debian/revfix.1 b/debian/man/revfix.1
index 334215b..e741657 100644
--- a/debian/revfix.1
+++ b/debian/man/revfix.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH INVERT "1" "August 2013" "Invert AtoB1 to make BtoA1 for CMYK profiles, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH INVERT "1" "September 2014" "Invert AtoB1 to make BtoA1 for CMYK profiles, Version 1.6.3" "User Commands"
 .SH NAME
 Invert \- Invert AtoB1 to make BtoA1 for CMYK profiles.
 .SH DESCRIPTION
-Invert AtoB1 to make BtoA1 for CMYK profiles, Version 1.5.1
+Invert AtoB1 to make BtoA1 for CMYK profiles, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: revfix [\-options] iccin iccout
 .TP
diff --git a/debian/scanin.1 b/debian/man/scanin.1
index e107ae8..663c69b 100644
--- a/debian/scanin.1
+++ b/debian/man/scanin.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH SCANIN, "1" "August 2013" "Scanin, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH SCANIN, "1" "September 2014" "Scanin, Version 1.6.3" "User Commands"
 .SH NAME
 Scanin, \- Scanin.
 .SH DESCRIPTION
-Scanin, Version 1.5.1
+Scanin, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 .PP
 usage: scanin [options] input.tif recogin.cht valin.cie [diag.tif]
diff --git a/debian/spec2cie.1 b/debian/man/spec2cie.1
index 1ec3695..9bd7068 100644
--- a/debian/spec2cie.1
+++ b/debian/man/spec2cie.1
@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CONVERT "1" "August 2013" "Convert spectral .ti3 file, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CONVERT "1" "September 2014" "Convert spectral .ti3 file, Version 1.6.3" "User Commands"
 .SH NAME
 Convert \- Convert spectral .ti3 file.
 .SH SYNOPSIS
 .B spec2cie
 [\fIoptions\fR] \fIinput.ti3 output.ti3\fR
 .SH DESCRIPTION
-Convert spectral .ti3 file, Version 1.5.1
+Convert spectral .ti3 file, Version 1.6.3
 Author: Gerhard Fuernkranz, licensed under the AGPL Version 3
 .TP
 \fB\-v\fR
diff --git a/debian/specplot.1 b/debian/man/specplot.1
index 969e717..b794adc 100644
--- a/debian/specplot.1
+++ b/debian/man/specplot.1
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH PLOT "1" "August 2013" "Plot spectrum and calculate CCT and VCT" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH PLOT "1" "September 2014" "Plot spectrum and calculate CCT and VCT" "User Commands"
 .SH NAME
 Plot \- Plot spectrum and calculate CCT and VCT.
 .SH DESCRIPTION
diff --git a/debian/splitti3.1 b/debian/man/splitti3.1
index e1a3dd1..f08b866 100644
--- a/debian/splitti3.1
+++ b/debian/man/splitti3.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH SPLIT "1" "August 2013" "Split a .ti3 into two, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH SPLIT "1" "September 2014" "Split a .ti3 into two, Version 1.6.3" "User Commands"
 .SH NAME
 Split \- Split a .ti3 into two.
 .SH DESCRIPTION
-Split a .ti3 into two, Version 1.5.1
+Split a .ti3 into two, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: splitcgats [\-options] input.ti3 output1.ti3 output2.ti3
 .TP
diff --git a/debian/spotread.1 b/debian/man/spotread.1
index 0432ef7..fea84c6 100644
--- a/debian/spotread.1
+++ b/debian/man/spotread.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH MEASURE "1" "August 2013" "Measure spot values, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH MEASURE "1" "September 2014" "Measure spot values, Version 1.6.3" "User Commands"
 .SH NAME
 Measure \- Read Print Spot values.
 .SH DESCRIPTION
-Measure spot values, Version 1.5.1
+Measure spot values, Version 1.6.3
 Author: Graeme W. Gill, licensed under the GPL Version 2 or later
 Diagnostic: Flag \fB\-\-\fR not recognised
 usage: spotread [\-options] [logfile]
@@ -32,7 +32,7 @@ Use emissive measurement mode (absolute results)
 Use display white brightness relative measurement mode
 .TP
 \fB\-ew\fR
-Use display white relative measurement mode
+Use display white point relative chromatically adjusted mode
 .TP
 \fB\-p\fR
 Use telephoto measurement mode (absolute results)
@@ -41,7 +41,7 @@ Use telephoto measurement mode (absolute results)
 Use projector white brightness relative measurement mode
 .TP
 \fB\-pw\fR
-Use projector white relative measurement mode
+Use projector white point relative chromatically adjusted mode
 .TP
 \fB\-a\fR
 Use ambient measurement mode (absolute results)
@@ -107,6 +107,9 @@ Use Colorimeter Calibration Spectral Samples for calibration
 \fB\-Y\fR r|n
 Override refresh, non\-refresh display mode
 .TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-Y\fR A
 Use non\-adaptive integration time mode (if available).
 .TP
@@ -147,7 +150,7 @@ Use emissive measurement mode (absolute results)
 Use display white brightness relative measurement mode
 .TP
 \fB\-ew\fR
-Use display white relative measurement mode
+Use display white point relative chromatically adjusted mode
 .TP
 \fB\-p\fR
 Use telephoto measurement mode (absolute results)
@@ -156,7 +159,7 @@ Use telephoto measurement mode (absolute results)
 Use projector white brightness relative measurement mode
 .TP
 \fB\-pw\fR
-Use projector white relative measurement mode
+Use projector white point relative chromatically adjusted mode
 .TP
 \fB\-a\fR
 Use ambient measurement mode (absolute results)
@@ -222,6 +225,9 @@ Use Colorimeter Calibration Spectral Samples for calibration
 \fB\-Y\fR r|n
 Override refresh, non\-refresh display mode
 .TP
+\fB\-Y\fR R:rate
+Override measured refresh rate with rate Hz
+.TP
 \fB\-Y\fR A
 Use non\-adaptive integration time mode (if available).
 .TP
diff --git a/debian/synthcal.1 b/debian/man/synthcal.1
index 9a6d828..d63ef55 100644
--- a/debian/synthcal.1
+++ b/debian/man/synthcal.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create a synthetic calibration file, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create a synthetic calibration file, Version 1.6.3" "User Commands"
 .SH NAME
 Create \- Create a synthetic calibration file.
 .SH DESCRIPTION
-Create a synthetic calibration file, Version 1.5.1
+Create a synthetic calibration file, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: synthcal [\-options] outfile
 .TP
diff --git a/debian/synthread.1 b/debian/man/synthread.1
index 02345c1..444071e 100644
--- a/debian/synthread.1
+++ b/debian/man/synthread.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH SYNTHETIC "1" "August 2013" "Synthetic device model test chart reader - Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH SYNTHETIC "1" "September 2014" "Synthetic device model test chart reader - Version 1.6.3" "User Commands"
 .SH NAME
 Synthetic \- Synthetic device model test chart reader.
 .SH DESCRIPTION
-Synthetic device model test chart reader \- Version 1.5.1
+Synthetic device model test chart reader \- Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 Error 'Unrecognised flag'
 usage: synthread [\-v] [\-s] [separation.icm] profile.[icc|mpp|ti3] outfile
diff --git a/debian/targen.1 b/debian/man/targen.1
index 1150f14..89e5b95 100644
--- a/debian/targen.1
+++ b/debian/man/targen.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH GENERATE "1" "August 2013" "Generate Target deviceb test chart color values, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH GENERATE "1" "September 2014" "Generate Target deviceb test chart color values, Version 1.6.3" "User Commands"
 .SH NAME
 Generate \- Generate Target deviceb test chart color values.
 .SH DESCRIPTION
-Generate Target deviceb test chart color values, Version 1.5.1
+Generate Target deviceb test chart color values, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: targen [options] outfile
 .IP
@@ -38,6 +38,9 @@ Generate good optimized points rather than Fast
 \fB\-e\fR patches
 White test patches (default 4)
 .TP
+\fB\-B\fR patches
+Black test patches (default 4 Grey/RGB, else 0)
+.TP
 \fB\-s\fR steps
 Single channel steps (default grey 50, color 0)
 .TP
@@ -47,6 +50,9 @@ Grey axis RGB or CMY steps (default 0)
 \fB\-m\fR steps
 Multidimensional device space cube steps (default 0)
 .TP
+\fB\-b\fR steps
+Multidimensional body centered cubic steps (default 0)
+.TP
 \fB\-f\fR patches
 Add iterative & adaptive full spread patches to total (default grey 0, color 836)
 Default is Optimised Farthest Point Sampling (OFPS)
@@ -88,9 +94,12 @@ Optional power\-like value applied to all device values.
 Optional device ICC or MPP pre\-conditioning profile filename
 (Use "none" to turn off any conditioning)
 .TP
-\fB\-N\fR emphasis
+\fB\-N\fR nemphasis
 Degree of neutral axis patch concentration 0.0\-1.0 (default 0.50)
 .TP
+\fB\-V\fR demphasis
+Degree of dark region patch concentration 1.0\-4.0 (default 1.00 = none)
+.TP
 \fB\-F\fR L,a,b,rad
 Filter out samples outside Lab sphere.
 .TP
@@ -137,6 +146,9 @@ Generate good optimized points rather than Fast
 \fB\-e\fR patches
 White test patches (default 4)
 .TP
+\fB\-B\fR patches
+Black test patches (default 4 Grey/RGB, else 0)
+.TP
 \fB\-s\fR steps
 Single channel steps (default grey 50, color 0)
 .TP
@@ -146,6 +158,9 @@ Grey axis RGB or CMY steps (default 0)
 \fB\-m\fR steps
 Multidimensional device space cube steps (default 0)
 .TP
+\fB\-b\fR steps
+Multidimensional body centered cubic steps (default 0)
+.TP
 \fB\-f\fR patches
 Add iterative & adaptive full spread patches to total (default grey 0, color 836)
 Default is Optimised Farthest Point Sampling (OFPS)
@@ -187,9 +202,12 @@ Optional power\-like value applied to all device values.
 Optional device ICC or MPP pre\-conditioning profile filename
 (Use "none" to turn off any conditioning)
 .TP
-\fB\-N\fR emphasis
+\fB\-N\fR nemphasis
 Degree of neutral axis patch concentration 0.0\-1.0 (default 0.50)
 .TP
+\fB\-V\fR demphasis
+Degree of dark region patch concentration 1.0\-4.0 (default 1.00 = none)
+.TP
 \fB\-F\fR L,a,b,rad
 Filter out samples outside Lab sphere.
 .TP
diff --git a/debian/tiffgamut.1 b/debian/man/tiffgamut.1
index 5b3114d..23713fe 100644
--- a/debian/tiffgamut.1
+++ b/debian/man/tiffgamut.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create VRML image of the gamut surface of a TIFF or JPEG, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create VRML image of the gamut surface of a TIFF or JPEG, Version 1.6.3" "User Commands"
 .SH NAME
 Create \- Create VRML image of the gamut surface of a TIFF.
 .SH DESCRIPTION
-Create VRML image of the gamut surface of a TIFF or JPEG, Version 1.5.1
+Create VRML image of the gamut surface of a TIFF or JPEG, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 usage: tiffgamut [\-v level] [profile.icm | embedded.tif/jpg] infile1.tif/jpg [infile2.tif/jpg ...]
 .TP
@@ -48,6 +48,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
@@ -70,16 +71,19 @@ Adaptation luminance in cd.m^2 (default 50.0)
 b:background
 Background % of image luminance (default 20)
 .TP
-l:scenewhite
-Scene white in cd.m^2 if surround = auto (default 250)
+l:imagewhite
+Image white in cd.m^2 if surround = auto (default 250)
 .TP
 f:flare
-Flare light % of image luminance (default 1)
+Flare light % of image luminance (default 0)
 .TP
-f:X:Y:Z
-Flare color as XYZ (default media white)
+g:glare
+Flare light % of ambient (default 1)
 .TP
-f:x:y
+g:X:Y:Z
+Flare color as XYZ (default media white, Abs: D50)
+.TP
+g:x:y
 Flare color as x, y
 .HP
 \fB\-O\fR outputfile Override the default output filename.
@@ -128,6 +132,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
@@ -150,16 +155,19 @@ Adaptation luminance in cd.m^2 (default 50.0)
 b:background
 Background % of image luminance (default 20)
 .TP
-l:scenewhite
-Scene white in cd.m^2 if surround = auto (default 250)
+l:imagewhite
+Image white in cd.m^2 if surround = auto (default 250)
 .TP
 f:flare
-Flare light % of image luminance (default 1)
+Flare light % of image luminance (default 0)
+.TP
+g:glare
+Flare light % of ambient (default 1)
 .TP
-f:X:Y:Z
-Flare color as XYZ (default media white)
+g:X:Y:Z
+Flare color as XYZ (default media white, Abs: D50)
 .TP
-f:x:y
+g:x:y
 Flare color as x, y
 .HP
 \fB\-O\fR outputfile Override the default output filename.
diff --git a/debian/man/timage.1 b/debian/man/timage.1
new file mode 100644
index 0000000..7a30c33
--- /dev/null
+++ b/debian/man/timage.1
@@ -0,0 +1,59 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CREATE "1" "September 2014" "Create test images, default hex RGB surface and wedge, Version 1.6.3" "User Commands"
+.SH NAME
+Create \- Create test images, default hex RGB surface and wedge.
+.SH DESCRIPTION
+Create test images, default hex RGB surface and wedge, Version 1.6.3
+Author: Graeme W. Gill, licensed under the AGPL Version 3
+usage: timage [\-options] outfile.tif
+.TP
+\fB\-t\fR
+Generate rectangular gamut boundary test chart
+.TP
+\fB\-p\fR steps
+Generate a colorspace step chart with L* steps^2
+.TP
+\fB\-r\fR res
+Resolution in DPI (default 200)
+.TP
+\fB\-s\fR
+Smooth blend
+.TP
+\fB\-x\fR
+16 bit output
+.TP
+\fB\-4\fR
+CMYK output
+.TP
+\fB\-g\fR prop
+Percentage towards grey (default 0%)
+.TP
+outfile.tif
+Profile to check against
+.PP
+Author: Graeme W. Gill, licensed under the AGPL Version 3
+usage: timage [\-options] outfile.tif
+.TP
+\fB\-t\fR
+Generate rectangular gamut boundary test chart
+.TP
+\fB\-p\fR steps
+Generate a colorspace step chart with L* steps^2
+.TP
+\fB\-r\fR res
+Resolution in DPI (default 200)
+.TP
+\fB\-s\fR
+Smooth blend
+.TP
+\fB\-x\fR
+16 bit output
+.TP
+\fB\-4\fR
+CMYK output
+.TP
+\fB\-g\fR prop
+Percentage towards grey (default 0%)
+.TP
+outfile.tif
+Profile to check against
diff --git a/debian/txt2ti3.1 b/debian/man/txt2ti3.1
index 789d352..07d22b7 100644
--- a/debian/txt2ti3.1
+++ b/debian/man/txt2ti3.1
@@ -1,12 +1,12 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CONVERT "1" "August 2013" "Convert Gretag/Logo or X-Rite ColorPport raw RGB or CMYK device profile data to Argyll CGATS data, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH CONVERT "1" "September 2014" "Convert Gretag/Logo or X-Rite ColorPport raw RGB or CMYK device profile data to Argyll CGATS data, Version 1.6.3" "User Commands"
 .SH NAME
 Convert \- Convert Gretag/Logo or X-Rite ColorPport raw RGB or CMYK device profile data to Argyll CGATS data.
 .SH DESCRIPTION
-Convert Gretag/Logo or X\-Rite ColorPport raw RGB or CMYK device profile data to Argyll CGATS data, Version 1.5.1
+Convert Gretag/Logo or X\-Rite ColorPport raw RGB or CMYK device profile data to Argyll CGATS data, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 error: Unknown flag
-usage: txt2ti3 [\-v] [\-l limit] [devfile] infile [specfile] outfile
+usage: txt2ti3 [\-v] [\-l limit] [devfile] infile [specfile] outbase
 .TP
 \fB\-2\fR
 Create dummy .ti2 file as well
@@ -34,7 +34,7 @@ Output file basename for .ti3 and .ti2
 .PP
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 error: Unknown flag
-usage: txt2ti3 [\-v] [\-l limit] [devfile] infile [specfile] outfile
+usage: txt2ti3 [\-v] [\-l limit] [devfile] infile [specfile] outbase
 .TP
 \fB\-2\fR
 Create dummy .ti2 file as well
diff --git a/debian/viewgam.1 b/debian/man/viewgam.1
index 79cf7ad..ea27eca 100644
--- a/debian/viewgam.1
+++ b/debian/man/viewgam.1
@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH VIEW "1" "August 2013" "View gamuts Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH VIEW "1" "September 2014" "View gamuts Version 1.6.3" "User Commands"
 .SH NAME
 View \- View gamuts.
 .SH DESCRIPTION
-View gamuts Version 1.5.1
+View gamuts Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
 Diagnostic: Too few arguments, got 1 expect at least 2
 usage: viewgam { [\-c color] [\-t trans] [\-w|s] infile.gam } ... outfile.wrl
diff --git a/debian/xicclu.1 b/debian/man/xicclu.1
index 9806d66..98fdeff 100644
--- a/debian/xicclu.1
+++ b/debian/man/xicclu.1
@@ -1,11 +1,11 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH TRANSLATE "1" "August 2013" "Translate colors through an xicc, Version 1.5.1" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
+.TH LOOKUP "1" "September 2014" "Lookup ICC or CAL colors, Version 1.6.3" "User Commands"
 .SH NAME
-Translate \- Translate colors through an xicc.
+Lookup \- Translate colors through an xicc.
 .SH DESCRIPTION
-Translate colors through an xicc, Version 1.5.1
+Lookup ICC or CAL colors, Version 1.6.3
 Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: xicclu [\-options] profile
+usage: xicclu [\-options] profile_or_cal
 Diagnostic: Unknown flag
 .TP
 \fB\-v\fR level
@@ -39,6 +39,33 @@ j = CIECAM02 Appearance Jab, J = CIECAM02 Appearance JCh
 \fB\-s\fR scale
 Scale device range 0.0 \- scale rather than 0.0 \- 1.0
 .TP
+\fB\-e\fR flag
+Video encode device input as:
+.TP
+\fB\-E\fR flag
+Video decode device output as:
+.TP
+n
+normal 0..1 full range RGB levels (default)
+.TP
+t
+(16\-235)/255 "TV" RGB levels
+.TP
+6
+Rec601 YCbCr SD (16\-235,240)/255 "TV" levels
+.TP
+7
+Rec709 1125/60Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+5
+Rec709 1250/50Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+2
+Rec2020 YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
+C
+Rec2020 Constant Luminance YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
 \fB\-k\fR [zhxrlv]
 Black value target: z = zero K,
 h = 0.5 K, x = max K, r = ramp K (def.)
@@ -90,6 +117,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
@@ -112,16 +140,19 @@ Adaptation luminance in cd.m^2 (default 50.0)
 b:background
 Background % of image luminance (default 20)
 .TP
-l:scenewhite
-Scene white in cd.m^2 if surround = auto (default 250)
+l:imagewhite
+Image white in cd.m^2 if surround = auto (default 250)
 .TP
 f:flare
-Flare light % of image luminance (default 1)
+Flare light % of image luminance (default 0)
+.TP
+g:glare
+Flare light % of ambient (default 1)
 .TP
-f:X:Y:Z
+g:X:Y:Z
 Flare color as XYZ (default media white, Abs: D50)
 .TP
-f:x:y
+g:x:y
 Flare color as x, y
 .IP
 The colors to be translated should be fed into standard in,
@@ -131,7 +162,7 @@ A line not starting with a number will terminate the program.
 Use \fB\-v0\fR for just output colors.
 .PP
 Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: xicclu [\-options] profile
+usage: xicclu [\-options] profile_or_cal
 Diagnostic: Unknown flag
 .TP
 \fB\-v\fR level
@@ -165,6 +196,33 @@ j = CIECAM02 Appearance Jab, J = CIECAM02 Appearance JCh
 \fB\-s\fR scale
 Scale device range 0.0 \- scale rather than 0.0 \- 1.0
 .TP
+\fB\-e\fR flag
+Video encode device input as:
+.TP
+\fB\-E\fR flag
+Video decode device output as:
+.TP
+n
+normal 0..1 full range RGB levels (default)
+.TP
+t
+(16\-235)/255 "TV" RGB levels
+.TP
+6
+Rec601 YCbCr SD (16\-235,240)/255 "TV" levels
+.TP
+7
+Rec709 1125/60Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+5
+Rec709 1250/50Hz YCbCr HD (16\-235,240)/255 "TV" levels
+.TP
+2
+Rec2020 YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
+C
+Rec2020 Constant Luminance YCbCr UHD (16\-235,240)/255 "TV" levels
+.TP
 \fB\-k\fR [zhxrlv]
 Black value target: z = zero K,
 h = 0.5 K, x = max K, r = ramp K (def.)
@@ -216,6 +274,7 @@ mb \- Bright monitor in bright work environment
 md \- Monitor in darkened work environment
 jm \- Projector in dim environment
 jd \- Projector in dark environment
+tv \- Television/Film Studio
 .IP
 pcd \- Photo CD \- original scene outdoors
 .IP
@@ -238,16 +297,19 @@ Adaptation luminance in cd.m^2 (default 50.0)
 b:background
 Background % of image luminance (default 20)
 .TP
-l:scenewhite
-Scene white in cd.m^2 if surround = auto (default 250)
+l:imagewhite
+Image white in cd.m^2 if surround = auto (default 250)
 .TP
 f:flare
-Flare light % of image luminance (default 1)
+Flare light % of image luminance (default 0)
+.TP
+g:glare
+Flare light % of ambient (default 1)
 .TP
-f:X:Y:Z
+g:X:Y:Z
 Flare color as XYZ (default media white, Abs: D50)
 .TP
-f:x:y
+g:x:y
 Flare color as x, y
 .IP
 The colors to be translated should be fed into standard in,
diff --git a/debian/missing-sources/deep_arrays.json b/debian/missing-sources/deep_arrays.json
new file mode 100644
index 0000000..3e1c094
--- /dev/null
+++ b/debian/missing-sources/deep_arrays.json
@@ -0,0 +1,18 @@
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
+[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[
+[[[[[[[[[[[[[[[[
+]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
+]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/debian/missing-sources/difficult_json_c_test_case.json b/debian/missing-sources/difficult_json_c_test_case.json
new file mode 100644
index 0000000..d2bf5ea
--- /dev/null
+++ b/debian/missing-sources/difficult_json_c_test_case.json
@@ -0,0 +1,7 @@
+{ "glossary": 
+    { "title": "example glossary", "GlossDiv": 
+	{ "title": "S", "GlossList": 
+	    [{ "ID": "SGML", "SortAs": "SGML", "GlossTerm": "Standard Generalized Markup Language", "Acronym": "SGML", "Abbrev": "ISO 8879:1986", "GlossDef": "A meta-markup language, used to create markup languages such as DocBook.", "GlossSeeAlso": ["GML", "XML", "markup"] } ] 
+	}
+    }
+}
diff --git a/debian/missing-sources/difficult_json_c_test_case_with_comments.json b/debian/missing-sources/difficult_json_c_test_case_with_comments.json
new file mode 100644
index 0000000..189dca8
--- /dev/null
+++ b/debian/missing-sources/difficult_json_c_test_case_with_comments.json
@@ -0,0 +1,7 @@
+{ "glossary": 
+    { /* you */ "title": /**/ "example glossary", /*should*/"GlossDiv": 
+	{ "title": /*never*/"S", /*ever*/"GlossList": 
+	    [ { "ID": "SGML", "SortAs": "SGML", "GlossTerm": "Standard Generalized Markup Language", "Acronym": "SGML", "Abbrev": "ISO 8879:1986", "GlossDef": "A meta-markup language, used to create markup languages such as DocBook.", /*see*/"GlossSeeAlso"/*this*/:/*coming*/[/*out*/"GML"/*of*/,/*the*/"XML"/*parser!*/, "markup"] /*hey*/}/*ho*/]/*hey*/
+	}/*ho*/
+    } 
+}  // and the parser won't even get this far, so chill.  /* hah!
diff --git a/debian/missing-sources/non_utf8_char_in_string.json b/debian/missing-sources/non_utf8_char_in_string.json
new file mode 100644
index 0000000..7d75519
--- /dev/null
+++ b/debian/missing-sources/non_utf8_char_in_string.json
@@ -0,0 +1,88 @@
+{
+    "CoreletAPIVersion":2,
+    "CoreletType":"standalone",
+    "documentation":"A corelet that provides the capability to upload a folder’s contents into a user’s locker.",
+    "functions":
+    [
+	{
+	    "documentation":"Displays a dialog box that allows user to select a folder on the local system.",
+	    "name":"ShowBrowseDialog","parameters":
+	    [
+		{
+		    "documentation":"The callback function for results.",
+		    "name":"callback",
+		    "required":true,
+		    "type":"callback"
+		}
+	    ]
+	},
+	{
+	    "documentation":"Uploads all mp3 files in the folder provided.",
+	    "name":"UploadFolder","parameters":
+	    [
+		{
+		    "documentation":"The path to upload mp3 files from.",
+		    "name":"path",
+		    "required":true,
+		    "type":"string"
+		},
+		{
+		    "documentation":"The callback function for progress.",
+		    "name":"callback",
+		    "required":true,
+		    "type":"callback"
+		}
+	    ]
+	},
+	{
+	    "documentation":"Returns the server name to the current locker service.",
+	    "name":"GetLockerService",
+	    "parameters":[]
+	},
+	{
+	    "documentation":"Changes the name of the locker service.",
+	    "name":"SetLockerService",
+	    "parameters":
+	    [
+		{
+		    "documentation":"The value of the locker service to set active.",
+		    "name":"LockerService",
+		    "required":true,
+		    "type":"string"
+		}
+	    ]
+	},
+	{
+	    "documentation":"Downloads locker files to the suggested folder.",
+	    "name":"DownloadFile",
+	    "parameters":
+	    [
+		{
+		    "documentation":"The origin path of the locker file.",
+		    "name":"path",
+		    "required":true,
+		    "type":"string"
+		},
+		{
+		    "documentation":"The Window destination path of the locker file.",
+		    "name":"destination",
+		    "required":true,"type":"integer"
+		},
+		{
+		    "documentation":"The callback function for progress.",
+		    "name":"callback",
+		    "required":true,
+		    "type":"callback"
+		}
+	    ]
+	}
+    ],
+    "name":"LockerUploader",
+    "version":
+    {
+	"major":0,
+	"micro":1,
+	"minor":0
+    },
+    "versionString":"0.0.1"
+}
\ No newline at end of file
diff --git a/debian/patches/01_autotools-support.diff b/debian/patches/01_autotools-support.diff
index 8e0a6fe..13b7649 100644
--- a/debian/patches/01_autotools-support.diff
+++ b/debian/patches/01_autotools-support.diff
@@ -1,5 +1,7 @@
---- /dev/null
-+++ b/Makefile.shared
+Index: trunk/Makefile.shared
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/Makefile.shared	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,15 @@
 +# Common CFLAGS for Argyll components
 +
@@ -16,8 +18,10 @@
 +	$(MAKE) -C $(@D) $(@F)
 +./%.la:
 +	$(MAKE) -C $(@D) $(@F)
---- /dev/null
-+++ b/config.h.in
+Index: trunk/config.h.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/config.h.in	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,95 @@
 +/* config.h.in.  Generated from configure.ac by autoheader.  */
 +
@@ -114,8 +118,10 @@
 +
 +/* Define to 1 if the X Window System is missing or not being used. */
 +#undef X_DISPLAY_MISSING
---- /dev/null
-+++ b/Makefile.am
+Index: trunk/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,23 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -140,8 +146,10 @@
 +
 +
 +EXTRA_DIST = Readme.txt ttbd.txt log.txt
---- /dev/null
-+++ b/configure.ac
+Index: trunk/configure.ac
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/configure.ac	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,133 @@
 +AC_INIT([argyll], [1.3.7])
 +AM_INIT_AUTOMAKE([1.9 foreign])
@@ -276,8 +284,10 @@
 +		 ucmm/Makefile])
 +
 +AC_OUTPUT
---- /dev/null
-+++ b/tweak/Makefile.am
+Index: trunk/tweak/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/tweak/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,11 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -290,8 +300,10 @@
 +bin_PROGRAMS = refine
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/rspl/Makefile.am
+Index: trunk/rspl/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/rspl/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,15 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -308,8 +320,10 @@
 +check_PROGRAMS = revbench c1 c1df t2d t2ddf t3d t3ddf tnd trnd
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/plot/Makefile.am
+Index: trunk/plot/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/plot/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,12 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -323,8 +337,10 @@
 +libvrml_la_LIBADD = $(ICC_LIBS) ../numlib/libargyllnum.la
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/doc/Makefile.am
+Index: trunk/doc/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/doc/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,6 @@
 +docdir = $(datadir)/doc/argyll
 +
@@ -332,8 +348,10 @@
 +	$(wildcard *.gif)
 +
 +EXTRA_DIST = $(doc_DATA)
---- /dev/null
-+++ b/numlib/Makefile.am
+Index: trunk/numlib/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/numlib/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,15 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -350,9 +368,11 @@
 +	soboltest
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/spectro/Makefile.am
-@@ -0,0 +1,53 @@
+Index: trunk/spectro/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/spectro/Makefile.am	2014-09-01 21:41:09.629460471 +0200
+@@ -0,0 +1,54 @@
 +include $(top_srcdir)/Makefile.shared
 +
 +privatelib_LTLIBRARIES = libinsttypes.la libconv.la libinst.la libinstapp.la libdisp.la
@@ -368,7 +388,8 @@
 +	spyd2.c spyd2.h spyd2setup.h spyd2PLD.h huey.c huey.h		\
 +	usbio.c hidio.c pollem.c pollem.h icoms.h conv.h usbio.h	\
 +	hidio.h i1d3.h i1d3.c colorhug.c colorhug.h icoms.c		\
-+	oemarch.h oemarch.c iusb.h vinflate.c inflate.c
++	oemarch.h oemarch.c iusb.h vinflate.c inflate.c			\
++	specbos.c
 +libinst_la_LIBADD = $(ICC_LIBS) ../numlib/libargyllnum.la		\
 +	../libargyll.la ../rspl/librspl.la libconv.la
 +
@@ -406,8 +427,10 @@
 +ref_DATA = ccxx.ti1 SOtele.sp $(wildcard *.cal)
 +
 +EXTRA_DIST = Readme.txt
---- /dev/null
-+++ b/ref/Makefile.am
+Index: trunk/ref/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/ref/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,7 @@
 +refdir = $(datadir)/color/argyll/ref
 +
@@ -416,8 +439,10 @@
 +	$(wildcard *.ti2)
 +
 +EXTRA_DIST = $(ref_DATA)
---- /dev/null
-+++ b/link/Makefile.am
+Index: trunk/link/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/link/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,11 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -430,8 +455,10 @@
 +bin_PROGRAMS = collink pathplot
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/imdi/Makefile.am
+Index: trunk/imdi/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/imdi/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,40 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -473,8 +500,10 @@
 +	./imdi_make
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/scanin/Makefile.am
+Index: trunk/scanin/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/scanin/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,19 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -495,8 +524,10 @@
 +ref_DATA = $(wildcard *.cht) $(wildcard *.cie) $(wildcard *.ti2)
 +
 +EXTRA_DIST = $(ref_DATA) License.txt Readme.txt
---- /dev/null
-+++ b/cgats/Makefile.am
+Index: trunk/cgats/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/cgats/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,9 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -507,8 +538,10 @@
 +	cgatsstd.c
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/render/Makefile.am
+Index: trunk/render/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/render/Makefile.am	2014-09-01 21:40:52.561137062 +0200
 @@ -0,0 +1,13 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -523,8 +556,10 @@
 +check_PROGRAMS = timage
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/jcnf/Makefile.am
+Index: trunk/jcnf/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/jcnf/Makefile.am	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,15 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -541,8 +576,10 @@
 +check_PROGRAMS = test
 +
 +EXTRA_DIST = Readme.txt
---- /dev/null
-+++ b/jcnf/yajl/Makefile.am
+Index: trunk/jcnf/yajl/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/jcnf/yajl/Makefile.am	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,13 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -557,14 +594,18 @@
 +LDADD = ./libyajl.la
 +
 +check_PROGRAMS = yajl_test json_verify
---- /dev/null
-+++ b/h/Makefile.am
+Index: trunk/h/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/h/Makefile.am	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,3 @@
 +EXTRA_DIST = Readme.txt copyright.h config.h sort.h llist.h xlist.h	\
 +	counters.h
 +
---- /dev/null
-+++ b/icc/Makefile.am
+Index: trunk/icc/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/icc/Makefile.am	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,22 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -588,8 +629,10 @@
 +ref_DATA = $(wildcard *.icm)
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/ucmm/Makefile.am
+Index: trunk/ucmm/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/ucmm/Makefile.am	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,9 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -600,8 +643,10 @@
 +libucmm_la_LIBADD = $(ICC_LIBS) ../jcnf/libjcnf.la ../spectro/libconv.la
 +
 +LDADD = libucmm.la
---- /dev/null
-+++ b/xicc/Makefile.am
+Index: trunk/xicc/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/xicc/Makefile.am	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,28 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -631,8 +676,10 @@
 +	../gamut/libgammap.la ../target/libtarget.la
 +
 +EXTRA_DIST = xmono.c xmatrix.c xlut.c
---- /dev/null
-+++ b/target/Makefile.am
+Index: trunk/target/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/target/Makefile.am	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,28 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -662,8 +709,10 @@
 +ref_DATA = $(wildcard *.ti2)
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/profile/Makefile.am
+Index: trunk/profile/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/profile/Makefile.am	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,27 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -692,8 +741,10 @@
 +ref_DATA = $(wildcard *.sp)
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/gamut/Makefile.am
+Index: trunk/gamut/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/gamut/Makefile.am	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,27 @@
 +include $(top_srcdir)/Makefile.shared
 +
@@ -722,8 +773,10 @@
 +##ref_DATA = RefMediumGamut.gam
 +
 +EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/imdi/imdi_k.h
+Index: trunk/imdi/imdi_k.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/imdi/imdi_k.h	2014-09-01 21:40:52.565137138 +0200
 @@ -0,0 +1,910 @@
 +/* Integer Multi-Dimensional Interpolation */
 +/* Declarations for all the generated kernel functions */
@@ -1635,8 +1688,10 @@
 +
 +int no_kfuncs = 891;
 +
---- /dev/null
-+++ b/configure
+Index: trunk/configure
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/configure	2014-09-01 21:40:52.573137290 +0200
 @@ -0,0 +1,15216 @@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
@@ -16854,8 +16909,10 @@
 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 +fi
 +
---- /dev/null
-+++ b/config.sub
+Index: trunk/config.sub
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/config.sub	2014-09-01 21:40:52.573137290 +0200
 @@ -0,0 +1,1791 @@
 +#! /bin/sh
 +# Configuration validation subroutine script.
@@ -18648,8 +18705,10 @@
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
---- /dev/null
-+++ b/aclocal.m4
+Index: trunk/aclocal.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/aclocal.m4	2014-09-01 21:40:52.577137366 +0200
 @@ -0,0 +1,1073 @@
 +# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
 +
@@ -19724,8 +19783,10 @@
 +m4_include([m4/ltsugar.m4])
 +m4_include([m4/ltversion.m4])
 +m4_include([m4/lt~obsolete.m4])
---- /dev/null
-+++ b/missing
+Index: trunk/missing
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/missing	2014-09-01 21:40:52.577137366 +0200
 @@ -0,0 +1,215 @@
 +#! /bin/sh
 +# Common wrapper for a few potentially missing GNU programs.
@@ -19942,8 +20003,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
---- /dev/null
-+++ b/depcomp
+Index: trunk/depcomp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/depcomp	2014-09-01 21:40:52.577137366 +0200
 @@ -0,0 +1,791 @@
 +#! /bin/sh
 +# depcomp - compile a program generating dependencies as side-effects
@@ -20736,8 +20799,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
---- /dev/null
-+++ b/install-sh
+Index: trunk/install-sh
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/install-sh	2014-09-01 21:40:52.577137366 +0200
 @@ -0,0 +1,527 @@
 +#!/bin/sh
 +# install - install a program, script, or datafile
@@ -21266,8 +21331,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
---- /dev/null
-+++ b/config.guess
+Index: trunk/config.guess
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/config.guess	2014-09-01 21:40:52.577137366 +0200
 @@ -0,0 +1,1558 @@
 +#! /bin/sh
 +# Attempt to guess a canonical system name.
@@ -22827,8 +22894,10 @@
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
---- /dev/null
-+++ b/m4/ltoptions.m4
+Index: trunk/m4/ltoptions.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/ltoptions.m4	2014-09-01 21:40:52.577137366 +0200
 @@ -0,0 +1,384 @@
 +# Helper functions for option handling.                    -*- Autoconf -*-
 +#
@@ -23214,8 +23283,10 @@
 +		 [m4_define([_LTDL_TYPE], [installable])])
 +LT_OPTION_DEFINE([LTDL_INIT], [convenience],
 +		 [m4_define([_LTDL_TYPE], [convenience])])
---- /dev/null
-+++ b/m4/libtool.m4
+Index: trunk/m4/libtool.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/libtool.m4	2014-09-01 21:40:52.581137441 +0200
 @@ -0,0 +1,7991 @@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
@@ -31208,8 +31279,10 @@
 +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
 +         [0], [convert $build files to toolchain format])dnl
 +])# _LT_PATH_CONVERSION_FUNCTIONS
---- /dev/null
-+++ b/m4/ltversion.m4
+Index: trunk/m4/ltversion.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/ltversion.m4	2014-09-01 21:40:52.585137517 +0200
 @@ -0,0 +1,23 @@
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
@@ -31234,8 +31307,10 @@
 +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 +_LT_DECL(, macro_revision, 0)
 +])
---- /dev/null
-+++ b/m4/ltsugar.m4
+Index: trunk/m4/ltsugar.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/ltsugar.m4	2014-09-01 21:40:52.585137517 +0200
 @@ -0,0 +1,123 @@
 +# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 +#
@@ -31360,8 +31435,10 @@
 +           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
 +		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
 +])
---- /dev/null
-+++ b/m4/lt~obsolete.m4
+Index: trunk/m4/lt~obsolete.m4
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/lt~obsolete.m4	2014-09-01 21:40:52.585137517 +0200
 @@ -0,0 +1,98 @@
 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 +#
diff --git a/debian/patches/100_spelling.patch b/debian/patches/100_spelling.patch
new file mode 100644
index 0000000..c86f79c
--- /dev/null
+++ b/debian/patches/100_spelling.patch
@@ -0,0 +1,616 @@
+Description: correct some typos
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2014-09-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/icc/icc.c
+===================================================================
+--- trunk.orig/icc/icc.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/icc/icc.c	2014-09-04 13:18:05.797221556 +0200
+@@ -1466,7 +1466,7 @@
+ 		case icSigViewingCondDescTag:
+ 			return "Viewing Condition Description";
+ 		case icSigViewingConditionsTag:
+-			return "Viewing Condition Paramaters";
++			return "Viewing Condition Parameters";
+ 		default:
+ 			sprintf(buf,"Unrecognized - %s",tag2str(sig));
+ 			return buf;
+Index: trunk/spectro/ccxxmake.c
+===================================================================
+--- trunk.orig/spectro/ccxxmake.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/ccxxmake.c	2014-09-04 13:18:05.797221556 +0200
+@@ -358,7 +358,7 @@
+ 			/* COM port  */
+ 			} else if (argv[fa][1] == 'c') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -c");
++				if (na == NULL) usage("Parameter expected following -c");
+ 				comno = atoi(na);
+ 				if (comno < 1 || comno > 40) usage("-c parameter %d out of range",comno);
+ 
+@@ -452,7 +452,7 @@
+ 			/* Serial port flow control */
+ 			} else if (argv[fa][1] == 'W') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -W");
++				if (na == NULL) usage("Parameter expected following -W");
+ 				if (na[0] == 'n' || na[0] == 'N')
+ 					fc = fc_none;
+ 				else if (na[0] == 'h' || na[0] == 'H')
+Index: trunk/spectro/dispcal.c
+===================================================================
+--- trunk.orig/spectro/dispcal.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dispcal.c	2014-09-04 13:18:05.801221640 +0200
+@@ -1698,7 +1698,7 @@
+ 			/* Serial port flow control */
+ 			} else if (argv[fa][1] == 'W') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -W");
++				if (na == NULL) usage("Parameter expected following -W");
+ 				if (na[0] == 'n' || na[0] == 'N')
+ 					fc = fc_none;
+ 				else if (na[0] == 'h' || na[0] == 'H')
+@@ -1721,13 +1721,13 @@
+ 			/* Black point correction amount */
+ 			} else if (argv[fa][1] == 'k') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -k");
++				if (na == NULL) usage("Parameter expected following -k");
+ 				bkcorrect = atof(na);
+ 				if (bkcorrect < 0.0 || bkcorrect > 1.0) usage("-k parameter must be between 0.0 and 1.0");
+ 			/* Neutral blend rate (power) */
+ 			} else if (argv[fa][1] == 'A') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -A");
++				if (na == NULL) usage("Parameter expected following -A");
+ 				x.nbrate = atof(na);
+ 				if (x.nbrate < 0.05 || x.nbrate > 20.0) usage("-A parameter must be between 0.05 and 20.0");
+ 			/* Black brightness */
+@@ -1757,7 +1757,7 @@
+ 			/* COM port  */
+ 			} else if (argv[fa][1] == 'c') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -c");
++				if (na == NULL) usage("Parameter expected following -c");
+ 				comport = atoi(na);
+ 				if (comport < 1 || comport > 50) usage("-c parameter %d out of range",comport);
+ 
+@@ -2753,7 +2753,7 @@
+ 			/* Black level adjustment */
+ 			/* Due to the possibility of the channel offsets not being even, */
+ 			/* we use the largest of the XYZ values after they have been */
+-			/* scaled to be even acording to the white XYZ balance. */
++			/* scaled to be even according to the white XYZ balance. */
+ 			/* It's safer to set the black level a bit low, and then the */
+ 			/* calibration curves can bump the low ones up. */
+ 			if (c == '1') {
+Index: trunk/spectro/dispread.c
+===================================================================
+--- trunk.orig/spectro/dispread.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dispread.c	2014-09-04 13:18:05.801221640 +0200
+@@ -368,7 +368,7 @@
+ 			/* COM port  */
+ 			} else if (argv[fa][1] == 'c') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -c");
++				if (na == NULL) usage("Parameter expected following -c");
+ 				comport = atoi(na);
+ 				if (comport < 1 || comport > 50) usage("-c parameter %d out of range",comport);
+ 
+Index: trunk/spectro/spotread.c
+===================================================================
+--- trunk.orig/spectro/spotread.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/spotread.c	2014-09-04 13:18:05.801221640 +0200
+@@ -472,7 +472,7 @@
+ 			/* COM port  */
+ 			} else if (argv[fa][1] == 'c') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -c");
++				if (na == NULL) usage("Parameter expected following -c");
+ 				{
+ 					comport = atoi(na);
+ 					if (comport < 1 || comport > 40) usage("-c parameter %d out of range",comport);
+@@ -481,7 +481,7 @@
+ 			/* Display type */
+ 			} else if (argv[fa][1] == 'y') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -y");
++				if (na == NULL) usage("Parameter expected following -y");
+ 				dtype = na[0];
+ 
+ #ifndef SALONEINSTLIB
+@@ -489,7 +489,7 @@
+ 			} else if (argv[fa][1] == 'I') {
+ 
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -I");
++				if (na == NULL) usage("Parameter expected following -I");
+ 				if (strcmp(na, "A") == 0
+ 				 || strcmp(na, "M0") == 0) {
+ 					spec = 1;
+@@ -528,7 +528,7 @@
+ 			/* Spectral Illuminant type for XYZ computation */
+ 			} else if (argv[fa][1] == 'i') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -i");
++				if (na == NULL) usage("Parameter expected following -i");
+ 				if (strcmp(na, "A") == 0) {
+ 					spec = 1;
+ 					illum = icxIT_A;
+@@ -568,7 +568,7 @@
+ 			/* Spectral Observer type */
+ 			} else if (argv[fa][1] == 'Q') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -Q");
++				if (na == NULL) usage("Parameter expected following -Q");
+ 				if (strcmp(na, "1931_2") == 0) {			/* Classic 2 degree */
+ 					obType = icxOT_CIE_1931_2;
+ 				} else if (strcmp(na, "1964_10") == 0) {	/* Classic 10 degree */
+@@ -646,7 +646,7 @@
+ 			/* Filter configuration */
+ 			} else if (argv[fa][1] == 'F') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -F");
++				if (na == NULL) usage("Parameter expected following -F");
+ 				if (na[0] == 'n' || na[0] == 'N')
+ 					fe = inst_opt_filter_none;
+ 				else if (na[0] == 'p' || na[0] == 'P')
+@@ -661,7 +661,7 @@
+ 			/* Extra filter compensation file */
+ 			} else if (argv[fa][1] == 'E') {
+ 				fa = nfa;
+-				if (na == NULL) usage("Paramater expected following -E");
++				if (na == NULL) usage("Parameter expected following -E");
+ 				strncpy(filtername,na,MAXNAMEL-1); filtername[MAXNAMEL-1] = '\000';
+ 
+ 			/* Show Yxy */
+Index: trunk/spectro/colorhug.c
+===================================================================
+--- trunk.orig/spectro/colorhug.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/colorhug.c	2014-09-04 13:18:05.801221640 +0200
+@@ -210,7 +210,7 @@
+ 
+ 	a1logd(p->log,8,"colorhug_command: Read %d bytes and %d read\n",xrbytes,rbytes);
+ 	if (rbytes >= 2) {
+-		a1logd(p->log,6,"colorhug_command: recieved cmd '%s' error '%s' args '%s'\n",
++		a1logd(p->log,6,"colorhug_command: received cmd '%s' error '%s' args '%s'\n",
+ 				inst_desc(buf[1]),
+ 				colorhug_interp_error((inst *) p, buf[0]),
+ 				icoms_tohex(buf, rbytes - 2));
+Index: trunk/spectro/dispwin.c
+===================================================================
+--- trunk.orig/spectro/dispwin.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dispwin.c	2014-09-04 13:18:05.805221723 +0200
+@@ -2727,7 +2727,7 @@
+ 
+ /* Un-Install a display profile */
+ /* Return nz if failed, */
+-/* 1 if not sucessfully deleted */
++/* 1 if not successfully deleted */
+ /* 2 if profile not found */
+ int dispwin_uninstall_profile(dispwin *p, char *fname, p_scope scope) {
+ 	debugr2((errout,"dispwin_uninstall_profile '%s'\n", fname));
+@@ -5089,7 +5089,7 @@
+ 		p->native &= ~2;
+ 	}
+ 
+-	debugr("new_dispwin: return sucessfully\n");
++	debugr("new_dispwin: return successfully\n");
+ 	return p;
+ }
+ 
+Index: trunk/spectro/dtp51.c
+===================================================================
+--- trunk.orig/spectro/dtp51.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dtp51.c	2014-09-04 13:18:05.805221723 +0200
+@@ -678,7 +678,7 @@
+ 		case DTP51_INVALID_STEP:
+ 			return "Invalid step";
+ 		case DTP51_NO_DATA_AVAILABLE:
+-			return "No data availble";
++			return "No data avaialble";
+ 		case DTP51_LAMP_MARGINAL:
+ 			return "Lamp marginal";
+ 		case DTP51_LAMP_FAILURE:
+Index: trunk/spectro/dtp92.c
+===================================================================
+--- trunk.orig/spectro/dtp92.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dtp92.c	2014-09-04 13:18:05.805221723 +0200
+@@ -888,7 +888,7 @@
+ 		case DTP92_NO_DATA_AVAILABLE:
+ 			return "No data available";
+ 		case DTP92_MISSING_PARAMETER:
+-			return "Paramter is missing";
++			return "Parameter is missing";
+ 		case DTP92_CALIBRATION_DENIED:
+ 			return "Invalid calibration enable code";
+ 		case DTP92_NEEDS_OFFSET_CAL:
+Index: trunk/spectro/hidio.c
+===================================================================
+--- trunk.orig/spectro/hidio.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/hidio.c	2014-09-04 13:18:05.805221723 +0200
+@@ -726,7 +726,7 @@
+ 	{
+ 		unsigned char *rbuf2;
+ 
+-		/* Create a copy of the data recieved with one more byte */
++		/* Create a copy of the data received with one more byte */
+ 		if ((rbuf2 = malloc(bsize + 1)) == NULL) {
+ 			a1loge(p->log, ICOM_SYS, "icoms_hid_read: malloc failed\n");
+ 			return ICOM_SYS;
+Index: trunk/spectro/huey.c
+===================================================================
+--- trunk.orig/spectro/huey.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/huey.c	2014-09-04 13:18:05.805221723 +0200
+@@ -81,7 +81,7 @@
+ /* i1Display command codes */
+ /* B = byte (8bit), S = short (16bit), W = word (32bit), A = string */
+ /* U = unused byte, - = no arguments/results */
+-/* The is a 7 byte command buffer and 6 response recieve buffer. */
++/* The is a 7 byte command buffer and 6 response receive buffer. */
+ /* :2 means the read is from a second 8 byte ep x81 read. */
+ /* cbuf[-] is command byte */
+ /* rbuf[-2] is continuation byte */
+Index: trunk/spectro/i1pro_imp.c
+===================================================================
+--- trunk.orig/spectro/i1pro_imp.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/i1pro_imp.c	2014-09-04 13:18:05.809221806 +0200
+@@ -3691,7 +3691,7 @@
+ 		return I1PRO_OK;
+ 	}
+ 
+-	/* We've sucessfully restored the dark calibration */
++	/* We've successfully restored the dark calibration */
+ 	s->dark_valid = 1;
+ 	s->ddate = m->caldate;
+ 
+@@ -3736,7 +3736,7 @@
+ 		return I1PRO_OK;
+ 	}
+ 
+-	/* We've sucessfully restored the calibration */
++	/* We've successfully restored the calibration */
+ 	s->cal_valid = 1;
+ 	s->cfdate = m->caldate;
+ 
+Index: trunk/spectro/madvrwin.c
+===================================================================
+--- trunk.orig/spectro/madvrwin.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/madvrwin.c	2014-09-04 13:18:05.809221806 +0200
+@@ -582,7 +582,7 @@
+ 	}
+ #endif
+ 
+-	debugr("new_madvrwin: return sucessfully\n");
++	debugr("new_madvrwin: return successfully\n");
+ 
+ 	return p;
+ }
+Index: trunk/spectro/ss.c
+===================================================================
+--- trunk.orig/spectro/ss.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/ss.c	2014-09-04 13:18:05.809221806 +0200
+@@ -1787,7 +1787,7 @@
+ 		case ss_et_BadHexEncoding:
+ 			return "Message received from instrument has bad Hex encoding";
+ 		case ss_et_RecBufferOverun:
+-			return "Message received from instrument would overflow recieve buffer";
++			return "Message received from instrument would overflow receive buffer";
+ 		default:
+ 			return "Unknown error code";
+ 	}
+Index: trunk/spectro/ss_imp.c
+===================================================================
+--- trunk.orig/spectro/ss_imp.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/ss_imp.c	2014-09-04 13:18:05.809221806 +0200
+@@ -216,7 +216,7 @@
+ 	return 0;
+ }
+ 
+-/* Return the first enum from the recieve buffer without removing it. */
++/* Return the first enum from the receive buffer without removing it. */
+ int ss_peek_ans(ss *p) {
+ 	int rv;
+ 
+Index: trunk/spectro/webwin.c
+===================================================================
+--- trunk.orig/spectro/webwin.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/webwin.c	2014-09-04 13:18:05.809221806 +0200
+@@ -513,7 +513,7 @@
+ 		msec_sleep(50);
+ 	}
+ 
+-	debugr("new_webwin: return sucessfully\n");
++	debugr("new_webwin: return successfully\n");
+ 
+ 	return p;
+ }
+Index: trunk/xicc/cv.c
+===================================================================
+--- trunk.orig/xicc/cv.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/xicc/cv.c	2014-09-04 13:18:05.809221806 +0200
+@@ -100,7 +100,7 @@
+ 
+ 	printf("There are %d parameters:\n",np); fflush(stdout);
+ 	for (i = 0; i < np; i++) {
+-		printf("Paramter %d = %f\n",i, params[i]); fflush(stdout);
++		printf("Parameter %d = %f\n",i, params[i]); fflush(stdout);
+ 	}
+ 
+ 	/* Display the result */
+Index: trunk/spectro/ss_imp.h
+===================================================================
+--- trunk.orig/spectro/ss_imp.h	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/ss_imp.h	2014-09-04 13:18:05.809221806 +0200
+@@ -720,7 +720,7 @@
+ /* - - - - - - - - - - - - - - - - - - - - - */
+ /* ANSWER: */
+ 
+-/* Return the first enum from the recieve buffer without removing it. */
++/* Return the first enum from the receive buffer without removing it. */
+ int ss_peek_ans(struct _ss *p);
+ 
+ /* Remove a Spectrolino answer enum from the revieve buffer, */
+Index: trunk/imdi/cctiff.c
+===================================================================
+--- trunk.orig/imdi/cctiff.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/imdi/cctiff.c	2014-09-04 13:18:05.809221806 +0200
+@@ -32,7 +32,7 @@
+ 	Add flag to ignore inkname mismatches.
+ 
+ 
+-	Should add support for transfering any extra alpha
++	Should add support for transferring any extra alpha
+ 	planes from input to output, rather than simply ignoring them.
+ 
+ 
+@@ -1934,11 +1934,11 @@
+ 
+ 		if (wh != NULL) {
+ 			printf("Output TIFF file '%s'\n",out_name);
+-			printf("Ouput raster file ICC colorspace is %s\n",icm2str(icmColorSpaceSignature,su.outs));
++			printf("Output raster file ICC colorspace is %s\n",icm2str(icmColorSpaceSignature,su.outs));
+ 			printf("Output TIFF file photometric is %s\n",Photometric2str(wphotometric));
+ 		} else {
+ 			printf("Output JPEG file '%s'\n",out_name);
+-			printf("Ouput raster file ICC colorspace is %s\n",icm2str(icmColorSpaceSignature,su.outs));
++			printf("Output raster file ICC colorspace is %s\n",icm2str(icmColorSpaceSignature,su.outs));
+ 			printf("Output JPEG file colorspace is %s\n",JPEG_cspace2str(wj.jpeg_color_space));
+ 			if (wdesc != NULL)
+ 				printf("Output raster file description: '%s'\n",wdesc);
+Index: trunk/imdi/imdi.h
+===================================================================
+--- trunk.orig/imdi/imdi.h	2014-09-04 13:18:05.821222055 +0200
++++ trunk/imdi/imdi.h	2014-09-04 13:18:05.809221806 +0200
+@@ -38,7 +38,7 @@
+ 
+ 	/* Note that once an imdi is created, multiple can call interp() without */
+ 	/* interfering with each other, allowing parallel execution. */
+-	void (*interp)(struct _imdi *s, void **outp, int outst,		/* Ouput pointers and stride */
++	void (*interp)(struct _imdi *s, void **outp, int outst,		/* Output pointers and stride */
+ 	                                void **inp, int inst,		/* Input pointers and stride */
+ 	                                unsigned int npixels);		/* Number of pixels */
+ 
+Index: trunk/spectro/munki_imp.c
+===================================================================
+--- trunk.orig/spectro/munki_imp.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/munki_imp.c	2014-09-04 13:18:05.813221888 +0200
+@@ -6358,7 +6358,7 @@
+ 	int i, j, jj, k, cx, sx;
+ 	munki_fc coeff[40][16];	/* Existing filter cooefficients */
+ 	int nwav1;					/* Number of filters */
+-	double wl_short1, wl_long1;	/* Ouput wavelength of first and last filters */
++	double wl_short1, wl_long1;	/* Output wavelength of first and last filters */
+ 	double wl_step1;
+ 	munki_xp xp[41];			/* Crossover points each side of filter */
+ 	munki_code ev = MUNKI_OK;
+Index: trunk/target/printtarg.c
+===================================================================
+--- trunk.orig/target/printtarg.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/target/printtarg.c	2014-09-04 13:18:05.813221888 +0200
+@@ -2946,7 +2946,7 @@
+ 	double sscale = 1.0;	/* Spacer size scale */
+ 	int rand = 1;
+ 	int qbits = 0;			/* Quantization bits */
+-	int oft = 0;			/* Ouput File type, 0 = PS, 1 = EPS , 2 = TIFF */
++	int oft = 0;			/* Output File type, 0 = PS, 1 = EPS , 2 = TIFF */
+ 	int nocups = 0;			/* Supress CUPS PS/EPS job ticket */
+ 	depth2d tiffdpth = bpc8_2d;	/* TIFF pixel depth */
+ 	double tiffres = 100.0;	/* TIFF resolution in DPI */
+Index: trunk/gamut/nearsmth.c
+===================================================================
+--- trunk.orig/gamut/nearsmth.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/gamut/nearsmth.c	2014-09-04 13:18:05.813221888 +0200
+@@ -259,7 +259,7 @@
+ 	double va, vr = 0.0, vl, vd, vv = 0.0;
+ 
+ 	/* Absolute, Delta E^2 between test point and destination closest */
+-	/* aodv is already positioned acording to the LCh weights, */
++	/* aodv is already positioned according to the LCh weights, */
+ 	/* so weight as per average of these */
+ 	a_o = w->a.o;
+ 	va = wdesq(dtp, aodv, a_o, a_o, a_o, SUM_POW);
+@@ -1299,7 +1299,7 @@
+ 	return 0;
+ }
+ 
+-/* Tweak weights acording to extra cmy cusp flags or rel override */
++/* Tweak weights according to extra cmy cusp flags or rel override */
+ void tweak_weights(gammapweights out[14], int dst_cmymap, int rel_oride)  {
+ 	int i;
+ 
+@@ -3508,7 +3508,7 @@
+ 	swdiag = new_rspl(RSPL_NOFLAGS, 3, 3);	/* Allocate 3D -> 3D */
+ 	swdiag->fit_rspl(swdiag, RSPL_NOFLAGS, fpnts, nmpts, NULL, NULL, gres, NULL, NULL, 1.0, avgdev, NULL);
+ 
+-	/* Now create a plot of the sci_gam with the vertexes colored acording to the */
++	/* Now create a plot of the sci_gam with the vertexes colored according to the */
+ 	/* diagnostic map. */
+ 	if ((wrl = new_vrml("sci_gam_wt.wrl", 1)) == NULL) {
+ 		fprintf(stderr,"gamut map: new_vrml failed\n");
+Index: trunk/gamut/nearsmth.h
+===================================================================
+--- trunk.orig/gamut/nearsmth.h	2014-09-04 13:18:05.821222055 +0200
++++ trunk/gamut/nearsmth.h	2014-09-04 13:18:05.813221888 +0200
+@@ -267,7 +267,7 @@
+ gammapweights *src2, double wgt2
+ );
+ 
+-/* Tweak weights acording to extra cmy cusp flags or rel override */
++/* Tweak weights according to extra cmy cusp flags or rel override */
+ void tweak_weights(gammapweights out[14], int dst_cmymap, int rel_oride);
+ 
+ #endif /* NEARSMTH_H */
+Index: trunk/imdi/cctiffo.c
+===================================================================
+--- trunk.orig/imdi/cctiffo.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/imdi/cctiffo.c	2014-09-04 13:18:05.813221888 +0200
+@@ -307,7 +307,7 @@
+ 		case PHOTOMETRIC_LOGLUV:
+ 			return "CIELog2Luv";
+ 	}
+-	sprintf(buf,"Unknonw Tag %d",pmtc);
++	sprintf(buf,"Unknown Tag %d",pmtc);
+ 	return buf;
+ }
+ 
+Index: trunk/imdi/greytiff.c
+===================================================================
+--- trunk.orig/imdi/greytiff.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/imdi/greytiff.c	2014-09-04 13:18:05.813221888 +0200
+@@ -131,7 +131,7 @@
+ 		case PHOTOMETRIC_LOGLUV:
+ 			return "CIELog2Luv";
+ 	}
+-	sprintf(buf,"Unknonw Tag %d",pmtc);
++	sprintf(buf,"Unknown Tag %d",pmtc);
+ 	return buf;
+ }
+ 
+Index: trunk/link/collink.c
+===================================================================
+--- trunk.orig/link/collink.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/link/collink.c	2014-09-04 13:18:05.817221971 +0200
+@@ -899,7 +899,7 @@
+ 			}
+ 			/* We've got the input profile PCS' at this point. */
+ 
+-			/* If we're transfering the K value from the input profile to the */
++			/* If we're transferring the K value from the input profile to the */
+ 			/* output, copy it into locus[], which will be given to the inverse */
+ 			/* lookup function, else the inverse lookup will generate a K using */
+ 			/* the curve parameters. */  
+@@ -1039,7 +1039,7 @@
+ 		if (p->nhack == 2) {
+ 			/* Ideally we would create a 4D PCSK -> PCSK gamut mapping */
+ 			/* to smoothly and accurately cope with the changing source */
+-			/* and destination gamuts acording to their degree of "K onlyness". */
++			/* and destination gamuts according to their degree of "K onlyness". */
+ 			/* In practice we're going to simply interpolated between */
+ 			/* two extremes: unrestricted gamut and K only black gamut. */
+ 			double map0[3], map1[3];
+Index: trunk/profile/invprofcheck.c
+===================================================================
+--- trunk.orig/profile/invprofcheck.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/profile/invprofcheck.c	2014-09-04 13:18:05.817221971 +0200
+@@ -94,7 +94,7 @@
+ 	fprintf(stderr," -k           Show CIEDE2000 delta E values\n");
+ 	fprintf(stderr," -w           create VRML visualisation (profile.wrl)\n");
+ 	fprintf(stderr," -x           Use VRML axes\n");
+-	fprintf(stderr," -e           Color vectors acording to delta E\n");
++	fprintf(stderr," -e           Color vectors according to delta E\n");
+ 	fprintf(stderr," profile.icm  Profile to check\n");
+ 	exit(1);
+ }
+Index: trunk/profile/printcal.c
+===================================================================
+--- trunk.orig/profile/printcal.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/profile/printcal.c	2014-09-04 13:18:05.817221971 +0200
+@@ -1289,7 +1289,7 @@
+ 				icmXYZ2Lab(&wht, wp->Lab, wp->XYZ);
+ 			}
+ 
+-			/* Sort the channel acording to device value */ 
++			/* Sort the channel according to device value */ 
+ 			/* For a consistent result for identical device values, */
+ 			/* secondary sort by inverse CIE value */
+ //#define HEAP_COMPARE(A,B) ((A).dev < (B).dev)
+Index: trunk/profile/profcheck.c
+===================================================================
+--- trunk.orig/profile/profcheck.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/profile/profcheck.c	2014-09-04 13:18:05.817221971 +0200
+@@ -54,7 +54,7 @@
+ 	fprintf(stderr," -w              create VRML visualisation (iccprofile.wrl)\n");
+ 	fprintf(stderr," -x              Use VRML axes\n");
+ 	fprintf(stderr," -m              Make VRML lines a minimum of 0.5\n");
+-	fprintf(stderr," -e              Color vectors acording to delta E\n");
++	fprintf(stderr," -e              Color vectors according to delta E\n");
+ 	fprintf(stderr," -d devval1,deval2,devvalN\n");
+ 	fprintf(stderr,"                 Specify a device value to sort against\n");
+ 	fprintf(stderr," -p              Sort device value by PCS (Lab) target\n");
+Index: trunk/spectro/dispsup.c
+===================================================================
+--- trunk.orig/spectro/dispsup.c	2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dispsup.c	2014-09-04 13:18:05.817221971 +0200
+@@ -604,7 +604,7 @@
+ 		scb->serno = p->serno++;
+ 		scb->msec = msec_time();
+ 
+-		a1logd(p->log,1, "got reading %f %f %f, transfering to col\n",
++		a1logd(p->log,1, "got reading %f %f %f, transferring to col\n",
+ 		                val.XYZ[0], val.XYZ[1], val.XYZ[2]);
+ 
+ 		scb->mtype = val.mtype;
+Index: trunk/gamut/gammap.c
+===================================================================
+--- trunk.orig/gamut/gammap.c	2014-01-31 05:08:51.000000000 +0100
++++ trunk/gamut/gammap.c	2014-09-04 13:21:15.557161603 +0200
+@@ -760,7 +760,7 @@
+ #endif
+ 			if (gmi->bph == gmm_clipBP) {
+ 
+-				/* Extend the target black point to accomodate the */
++				/* Extend the target black point to accommodate the */
+ 				/* bent or clipped destination space L* range */
+ 				if (fabp[0] < dr_cs_bp[0]) {
+ 					t = (fabp[0] - dr_cs_wp[0])/(dr_cs_bp[0] - dr_cs_wp[0]);
+Index: trunk/profile/profout.c
+===================================================================
+--- trunk.orig/profile/profout.c	2014-01-31 05:09:02.000000000 +0100
++++ trunk/profile/profout.c	2014-09-04 13:21:56.566012838 +0200
+@@ -1052,7 +1052,7 @@
+ 		if (iccver < icmVersion2_4) {
+ 			iccver = icmVersion2_4;		/* Need 2.4.0 for Display intents */
+ 			if (verb)
+-				fprintf(verbo,"Bumped ICC version to 2.4.0 to accomodate multiple Display intents\n");
++				fprintf(verbo,"Bumped ICC version to 2.4.0 to accommodate multiple Display intents\n");
+ 		}
+ 	}
+ 	if (wr_icco->set_version(wr_icco, iccver) != 0)
+Index: trunk/render/thscreen.c
+===================================================================
+--- trunk.orig/render/thscreen.c	2014-01-31 05:09:05.000000000 +0100
++++ trunk/render/thscreen.c	2014-09-04 13:22:40.638927581 +0200
+@@ -396,7 +396,7 @@
+ 	mrang = 65535.0/(t->oelev - 1.0); 
+ 	DBG(("new_thscreen() raw modulation rande = %f\n",mrang));
+ 
+-	/* Modify the modulation range to accomodate any level overlap */
++	/* Modify the modulation range to accommodate any level overlap */
+ 	if (olap > 0.0 && t->oelev > 2) {
+ 		mrang = ((t->oelev - 2.0) * olap * mrang + 65535.0)/(t->oelev - 1.0);
+ 		DBG(("new_thscreen() modulation adjusted for overlap = %f\n",mrang));
+Index: trunk/xicc/xspect.c
+===================================================================
+--- trunk.orig/xicc/xspect.c	2014-01-31 05:08:53.000000000 +0100
++++ trunk/xicc/xspect.c	2014-09-04 13:23:27.695904152 +0200
+@@ -3462,7 +3462,7 @@
+ /* Given an emission spectrum, set the UV output to the given level. */
+ /* The shape of the UV is taken from FWA1_stim, and the level is */
+ /* with respect to the Y of the input spectrum. */
+-/* The output range is extended to accomodate the UV wavelengths */
++/* The output range is extended to accommodate the UV wavelengths */
+ void xsp_setUV(xspect *out, xspect *in, double uvlevel) {
+ 	int i, xs, xe;
+ 	double ww, avg;
diff --git a/debian/patches/10_spectro_inst.patch b/debian/patches/10_spectro_inst.patch
new file mode 100644
index 0000000..7a5cc9d
--- /dev/null
+++ b/debian/patches/10_spectro_inst.patch
@@ -0,0 +1,98 @@
+Index: trunk/spectro/inst.c
+===================================================================
+--- trunk.orig/spectro/inst.c	2014-09-01 20:08:46.629215428 +0200
++++ trunk/spectro/inst.c	2014-09-01 20:08:46.621215261 +0200
+@@ -59,11 +59,12 @@
+ #if defined(ENABLE_FAST_SERIAL)
+ instType fast_ser_inst_type(icoms *p, int tryhard, 
+        inst_code (*uicallback)(void *cntx, inst_ui_purp purp), void *cntx);
++#endif /* ENABLE_FAST_SERIAL */
+ # if defined(ENABLE_SERIAL)
+ static instType ser_inst_type(icoms *p, 
+        inst_code (*uicallback)(void *cntx, inst_ui_purp purp), void *cntx);
+ # endif /* ENABLE_SERIAL */
+-#endif /* ENABLE_FAST_SERIAL */
++
+ 
+ /* ------------------------------------ */
+ /* Default methods for instrument class */
+Index: trunk/spectro/icoms_nt.c
+===================================================================
+--- trunk.orig/spectro/icoms_nt.c	2014-09-01 20:08:46.629215428 +0200
++++ trunk/spectro/icoms_nt.c	2014-09-01 20:08:46.621215261 +0200
+@@ -22,8 +22,12 @@
+ 	struct fast_com_name *next;
+ } fast_com_name;
+ 
+-#if defined(ENABLE_SERIAL) || defined(ENABLE_FAST_SERIAL)
+-instType fast_ser_inst_type(icoms *p, int tryhard, void *, void *); 
++#if defined(ENABLE_FAST_SERIAL)
++instType fast_ser_inst_type(icoms *p, int tryhard, void *, void *);
++#endif /* ENABLE_FAST_SERIAL */
++
++#if defined(ENABLE_SERIAL)
++instType ser_inst_type(icoms *p, void *, void *);
+ #endif /* ENABLE_SERIAL */
+ 
+ /* Create and return a list of available serial ports or USB instruments for this system. */
+Index: trunk/spectro/icoms_ux.c
+===================================================================
+--- trunk.orig/spectro/icoms_ux.c	2014-09-01 20:08:46.629215428 +0200
++++ trunk/spectro/icoms_ux.c	2014-09-01 20:08:46.621215261 +0200
+@@ -46,8 +46,15 @@
+ #include <mach/task_policy.h>
+ #endif /* __APPLE__ */
+ 
+-#if defined(ENABLE_SERIAL) || defined(ENABLE_FAST_SERIAL)
+-instType fast_ser_inst_type(icoms *p, int tryhard, void *, void *); 
++#include "inst.h"
++
++#if defined(ENABLE_FAST_SERIAL)
++instType fast_ser_inst_type(icoms *p, int tryhard, void *, void *);
++#endif /* ENABLE_FAST_SERIAL */
++
++#if defined(ENABLE_SERIAL)
++static instType ser_inst_type(icoms *p, 
++       inst_code (*uicallback)(void *cntx, inst_ui_purp purp), void *cntx);
+ #endif /* ENABLE_SERIAL */
+ 
+ /* Create and return a list of available serial ports or USB instruments for this system */
+@@ -134,7 +141,12 @@
+ 				icoms *icom;
+ 				if ((path = p->get_last_path(p)) != NULL
+ 				 && (icom = new_icoms(path, p->log)) != NULL) {
++#if defined(ENABLE_FAST_SERIAL)
+ 					instType itype = fast_ser_inst_type(icom, 0, NULL, NULL);
++#endif
++#if defined(ENABLE_SERIAL)
++					instType itype = ser_inst_type(icom, NULL, NULL);
++#endif
+ 					if (itype != instUnknown)
+ 						icompaths_set_serial_itype(path, itype);
+ 					icom->del(icom);
+@@ -279,7 +291,12 @@
+ 				icoms *icom;
+ 				if ((path = p->get_last_path(p)) != NULL
+ 				 && (icom = new_icoms(path, p->log)) != NULL) {
++#if defined(ENABLE_FAST_SERIAL)
+ 					instType itype = fast_ser_inst_type(icom, 0, NULL, NULL);
++#endif
++#if defined(ENABLE_SERIAL)
++					instType itype = ser_inst_type(icom, (void *)NULL, (void *)NULL);
++#endif
+ 					if (itype != instUnknown)
+ 						icompaths_set_serial_itype(path, itype);
+ 					icom->del(icom);
+Index: trunk/spectro/Makefile.UNIX
+===================================================================
+--- trunk.orig/spectro/Makefile.UNIX	2014-01-31 05:08:58.000000000 +0100
++++ trunk/spectro/Makefile.UNIX	2014-09-01 20:10:22.819216376 +0200
+@@ -26,7 +26,7 @@
+ LIBOF     =
+ RANLIB    = echo
+ AS        = as
+-CCFLAGSDEF   = -DUNIX -c
++CCFLAGSDEF   = -DUNIX -c -fPIC
+ CC        = cc $(CCFLAGS) $(STDHDRS)
+ CCOF      = -o 
+ LINKFLAGSDEF = -lm -lpthread -lrt
diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch
new file mode 100644
index 0000000..a2cc91a
--- /dev/null
+++ b/debian/patches/15_jam.patch
@@ -0,0 +1,87 @@
+Description: Add multiarch support to jam files
+Author: Jörg Frings Fürst <debian@jff-webhosting.net>
+Forwarded: 
+Last-Update: 2014-09-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/Jamtop
+===================================================================
+--- trunk.orig/Jamtop	2014-09-06 10:26:03.492738912 +0200
++++ trunk/Jamtop	2014-09-06 10:26:03.484738743 +0200
+@@ -108,13 +108,18 @@
+ }
+ 
+ # See if we have a system TIFF library.
+-if ! $(BUILTIN_TIFF) && $(UNIX) {
+-	if [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ]  {
++if ! $(BUILDIN_TIFF) {
++if $(UNIX) {
++	if    [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ]
++	   || [ GLOB /usr/include/x86_64-linux-gnu : tiffio.h ]
++	   || [ GLOB /usr/include/i386-linux-gnu : tiffio.h ] {
+ 		if  [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ]
+ 		 || [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ]
+ 		 || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ]
+ 		 || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ]
+-		 || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] { 
++		 || [ GLOB /usr/lib/lib/i386-linux-gnu : libtiff.so ]
++		 || [ GLOB /usr/lib/lib/i386-linux-gnu : libtiff.a ]
++		 || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] {
+ 			echo "Using system TIFF library" ;
+ 			TIFFLIB = ;
+ 			TIFFINC = ;
+@@ -123,12 +128,13 @@
+ 		}
+ 	}
+ }
++}
+ 
+ # If nothing else, use Argyll supplied TIFF library
+ if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) {
+ 	echo "Using Argyll TIFF library" ;
+-	TIFFLIB = ../tiff/libtiff.lib ;
+-	TIFFINC = ../tiff ;
++#	TIFFLIB = ../tiff/libtiff.lib ;
++#	TIFFINC = ../tiff ;
+ }
+ 
+ # See if we have a system JPEG library.
+Index: trunk/Jambase
+===================================================================
+--- trunk.orig/Jambase	2014-09-06 10:26:03.492738912 +0200
++++ trunk/Jambase	2014-09-06 10:26:03.484738743 +0200
+@@ -880,7 +880,7 @@
+ 
+ 	# UNIX defaults
+ 
+-	CCFLAGS			?= -DUNIX -D_THREAD_SAFE -pipe ;
++	CCFLAGS			?= $(CPPFLAGS) -g -DUNIX -D_THREAD_SAFE -pipe ;
+ 	CCOPTFLAG		?= -O2 ;		
+ 	CCDEBUGFLAG		?= -g ;		
+ 	CCPROFFLAG		?= ;		
+@@ -890,7 +890,7 @@
+ 	CHGRP			?= chgrp ;
+ 	CHOWN			?= chown ;
+ 	LEX				?= lex ;
+-	LINKFLAGS		?= ;
++	LINKFLAGS		?= $(LDFLAGS) ;
+ 	LINKOPTFLAG		?= -O ;				# Affects creating .so's
+ 	LINKSTRIPFLAG	?= -s ;
+ 	LINKDEBUGFLAG	?= ;
+Index: trunk/imdi/Makefile
+===================================================================
+--- trunk.orig/imdi/Makefile	2014-09-06 10:26:03.492738912 +0200
++++ trunk/imdi/Makefile	2014-09-06 10:26:03.484738743 +0200
+@@ -9,10 +9,10 @@
+ # by uncommenting the appropriate line:
+ 
+ # Microsoft VC++, WinNT setup
+-include Makefile.WNT
++#include Makefile.WNT
+ 
+ # Generic UNIX setup
+-#include Makefile.UNIX
++include Makefile.UNIX
+ 
+ # Apple OS X
+ #include Makefile.OSX
diff --git a/debian/patches/series b/debian/patches/series
index ea92233..17d3b70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,8 @@
-01_autotools-support.diff
-02_firmware-package-builder.diff
-03_usb-db.diff
-04_CVE-2012-4405.diff
-06_fix_udev_rule.patch
+100_spelling.patch
+15_jam.patch
+#10_spectro_inst.patch
+#01_autotools-support.diff
+#02_firmware-package-builder.diff
+#03_usb-db.diff
+#04_CVE-2012-4405.diff
+#06_fix_udev_rule.patch
diff --git a/debian/pathplot.1 b/debian/pathplot.1
deleted file mode 100644
index 4abbda7..0000000
--- a/debian/pathplot.1
+++ /dev/null
@@ -1,17 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH PLOT "1" "August 2013" "Plot device space path L in/out curve from an ICC link file, Version 1.5.1" "User Commands"
-.SH NAME
-Plot \- Plot device space path L in/out curve from an ICC link file.
-.SH DESCRIPTION
-Plot device space path L in/out curve from an ICC link file, Version 1.5.1
-Author: Graeme W. Gill
-usage: pathplot inprof linkprof outprof
-.TP
-\fB\-v\fR
-verbose
-.PP
-Author: Graeme W. Gill
-usage: pathplot inprof linkprof outprof
-.TP
-\fB\-v\fR
-verbose
diff --git a/debian/rules b/debian/rules
index 54eca76..0f3d8ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,125 +1,126 @@
 #!/usr/bin/make -f
 
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--no-undefined
+# hardening
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-####CC:=ccache $(CC)
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--no-undefined
 
-%:
-	dh $@ --with quilt,autoreconf
-
-# Doesn't work for now.
-#--parallel
-
-override_dh_auto_configure:
-	chmod +x ./configure
+#export OSTYPE MACHTYPE HOSTTYPE
 
-	dh_auto_configure -- \
-	CC="$(CC)"
-
-override_dh_autoreconf:
-	dh_autoreconf --as-needed
-
-override_dh_auto_clean:
-	dh_clean imdi/imdi_k.c ref/RefMediumGamut.gam \
-	libusb/Makefile libusb/config.h libusb/config.log libusb/usb.h	\
-	libusb/config.status libusb/doc/Makefile libusb/libtool		\
-	libusb/libusb-config libusb/libusb.pc libusb/stamp-h1		\
-	libusb/tests/Makefile firmware-package-builder/*.tar.gz
+export DH_OPTIONS
 
-	[ ! $(shell grep jam Makefile) ] || rm Makefile
 
-	[ ! -f Makefile ] || $(MAKE) distclean
+NO_PROC=$(shell cat /proc/cpuinfo | grep processor | wc -l)
 
-	find -name Makefile.in | xargs -r rm
+JAMCMDLINE = -q -fJambase -j$(NO_PROC) -sPREFIX=/usr -sDESTDIR=$(CURDIR)/debian/tmp  -sREFSUBDIR=share/color/argyll/ref -sBUILTIN_TIFF=false
 
-override_dh_auto_install: firmware-package-builder/spyder2.tar.gz
-	$(MAKE) install -i DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-
-	rm debian/tmp/usr/share/doc/argyll/DocLicense.txt
-	rm debian/tmp/usr/share/doc/argyll/License.txt
+%:
+	dh $@ --parallel
 
-	-rm `find $(CURDIR)/debian/tmp -name '*.la'`
+override_dh_auto_build:
+	jam $(JAMCMDLINE) all
 
-override_dh_install:
-	dh_install -X.a -X.la --fail-missing
+override_dh_auto_clean:
+	jam $(JAMCMDLINE) clean
+	rm -f $(CURDIR)/tiff/*.a
+	rm -f $(CURDIR)/tiff/*.h
+	rm -f $(CURDIR)/tiff/config.log
+	rm -f $(CURDIR)/tiff/config.status
+	rm -f $(CURDIR)/tiff/Makefile
+	rm -f $(CURDIR)/tiff/libtool
+	rm -f $(CURDIR)/tiff/mkg3states
+	rm -f $(CURDIR)/imdi/imdi_k.c
+	rm -rf $(CURDIR)/debian/tmp/*
+	[ ! -d $(CURDIR)/debian/tmp ] || rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/tmp
+	dh_clean
+
+override_dh_auto_install:
+	jam $(JAMCMDLINE) dirs
+	jam $(JAMCMDLINE) install
+	rm $(CURDIR)/debian/tmp/usr/bin/License.txt
+
+override_dh_installdocs:
+	dh_installdocs --link-doc=argyll-doc
+	rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License.txt
+	rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License2.txt
+	rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License3.txt
+#	rm $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/License4.txt
+	rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/DocLicense.txt
 
-#	for i in $$(cat debian/libicc2.install debian/libicc-dev.install) ; do rm -f $(CURDIR)/debian/argyll/$$i ; done
-#	rm $(CURDIR)/debian/argyll/usr/share/doc/argyll/License.txt $(CURDIR)/debian/argyll/usr/share/doc/argyll/DocLicense.txt
-#	for i in average refine targen verify ; do mv $(CURDIR)/debian/argyll/usr/bin/$$i $(CURDIR)/debian/argyll/usr/bin/argyll-$$i ; done
 
 override_dh_installchangelogs:
 	dh_installchangelogs log.txt
 
-LIBICC_VERSION=$(shell awk -F= '/^LIBICC_VERSION=/ { print $$2 }' icc/Makefile.am)
-ARGYLL_VERSION=$(shell dpkg-parsechangelog | awk '/^Version:/ { print $$2 }')
+#LIBICC_VERSION=$(shell awk -F= '/^LIBICC_VERSION=/ { print $$2 }' icc/Makefile.am)
+#ARGYLL_VERSION=$(shell dpkg-parsechangelog | awk '/^Version:/ { print $$2 }')
 
-override_dh_gencontrol:
-	dh_gencontrol -plibicc2 -- -v$(LIBICC_VERSION)+argyll$(ARGYLL_VERSION)
-	dh_gencontrol -plibicc-dev -- -v$(LIBICC_VERSION)+argyll$(ARGYLL_VERSION)
-	dh_gencontrol --remaining-packages
+#override_dh_gencontrol:
+##	dh_gencontrol -plibicc2 -- -v$(LIBICC_VERSION)+argyll$(ARGYLL_VERSION)
+##	dh_gencontrol -plibicc-dev -- -v$(LIBICC_VERSION)+argyll$(ARGYLL_VERSION)
+#	dh_gencontrol --remaining-packages
 
 #build: firmware-package-builder/spyder2.tar.gz
 
-firmware-package-builder/%.tar.gz: firmware-package-builder/argyll-firmware-%
-	chmod +x $</debian/rules
-	tar cfCz $@ firmware-package-builder $(notdir $<)
+#firmware-package-builder/%.tar.gz: firmware-package-builder/argyll-firmware-%
+#	chmod +x $</debian/rules
+#	tar cfCz $@ firmware-package-builder $(notdir $<)
 
 override_dh_strip:
 	dh_strip --dbg-package=argyll-dbg
 
-override_dh_makeshlibs:
-	dh_makeshlibs -- -c4
-
-override_dh_builddeb:
-	dh_builddeb -- -Zbzip2
-
 build-manpages:
-	help2man -N --no-discard-stderr --name="Dump an ICC file in human readable form." debian/tmp/usr/bin/iccdump > debian/iccdump.1
-	help2man -N --no-discard-stderr --name="Translate colors through an ICC profile." debian/tmp/usr/bin/icclu > debian/icclu.1
-	help2man -N --no-discard-stderr --name="Apply device calibration to an ICC profile." debian/tmp/usr/bin/applycal > debian/applycal.1
-	help2man -N --no-discard-stderr --name="Average or merge values in .ti3 like files." debian/tmp/usr/bin/average > debian/average.1
-	help2man -N --no-discard-stderr --name="Convert Colorblind raw device profile data to Argyll data." debian/tmp/usr/bin/cb2ti3 > debian/cb2ti3.1
-	help2man -N --no-discard-stderr --name="Color Correct a TIFF file using any sequence of ICC profiles or Calibrations." debian/tmp/usr/bin/cctiff > debian/cctiff.1
-	help2man -N --no-discard-stderr --name="Plot spectrum and calculate CCT and VCT." debian/tmp/usr/bin/ccttest > debian/ccttest.1
-	help2man -N --no-discard-stderr --name="Create CCMX or CCSS." debian/tmp/usr/bin/ccxxmake > debian/ccxxmake.1
-	help2man -N --no-discard-stderr --name="Read Target Test Chart." debian/tmp/usr/bin/chartread > debian/chartread.1
-	help2man -N --no-discard-stderr --name="Link ICC profiles." debian/tmp/usr/bin/collink > debian/collink.1
-	help2man -N --no-discard-stderr --name="Create ICC profile." debian/tmp/usr/bin/colprof > debian/colprof.1
-	help2man -N --no-discard-stderr --name="Calibrate a Display." debian/tmp/usr/bin/dispcal > debian/dispcal.1
-	help2man -N --no-discard-stderr --name="Read a Display." debian/tmp/usr/bin/dispread > debian/dispread.1
-	help2man -N --no-discard-stderr --name="Test display patch window, Set Video LUTs, Install profiles." debian/tmp/usr/bin/dispwin > debian/dispwin.1
-	help2man -N --no-discard-stderr --name="Extract an ICC profile from a TIFF file." debian/tmp/usr/bin/extracticc > debian/extracticc.1
-	help2man -N --no-discard-stderr --name="Extract a text tag from an ICC profile." debian/tmp/usr/bin/extractttag > debian/extractttag.1
-	help2man -N --no-discard-stderr --name="Create a fake CMY data file from a CMYK profile." debian/tmp/usr/bin/fakeCMY > debian/fakeCMY.1
-	help2man -N --no-discard-stderr --name="Fake test chart reader - lookup values in ICC/MPP profile." debian/tmp/usr/bin/fakeread > debian/fakeread.1
-	help2man -N --no-discard-stderr --name="Convert a TIFF file to monochrome using an ICC device profile." debian/tmp/usr/bin/greytiff > debian/greytiff.1
-	help2man -N --no-discard-stderr --name="Dump an ICC file in human readable form." debian/tmp/usr/bin/iccdump > debian/iccdump.1
-	help2man -N --no-discard-stderr --name="Create Lab/Jab gamut plot." debian/tmp/usr/bin/iccgamut > debian/iccgamut.1
-	help2man -N --no-discard-stderr --name="Measure an illuminant." debian/tmp/usr/bin/illumread > debian/illumread.1
-	help2man -N --no-discard-stderr --name="Check fwd to bwd relative transfer of an ICC file." debian/tmp/usr/bin/invprofcheck > debian/invprofcheck.1
-	help2man -N --no-discard-stderr --name="Convert Kodak raw printer profile data to Argyll print data." debian/tmp/usr/bin/kodak2ti3 > debian/kodak2ti3.1
-	help2man -N --no-discard-stderr --name="Check Model Printer Profile." debian/tmp/usr/bin/mppcheck > debian/mppcheck.1
-	help2man -N --no-discard-stderr --name="Translate colors through an MPP profile." debian/tmp/usr/bin/mpplu > debian/mpplu.1
-	help2man -N --no-discard-stderr --name="Create Model Printer Profile." debian/tmp/usr/bin/mppprof > debian/mppprof.1
-	help2man -N --no-discard-stderr --name="Plot device space path L in/out curve from an ICC link file." debian/tmp/usr/bin/pathplot > debian/pathplot.1
-	help2man -N --no-discard-stderr --name="Create printer calibration." debian/tmp/usr/bin/printcal > debian/printcal.1
-	help2man -N --no-discard-stderr --name="Generate Target PostScrip file." debian/tmp/usr/bin/printtarg > debian/printtarg.1
-	help2man -N --no-discard-stderr --name="Check accuracy of ICC profile." debian/tmp/usr/bin/profcheck > debian/profcheck.1
-	help2man -N --no-discard-stderr --name="Create abstract correction profile given table of absolute CIE correction values." debian/tmp/usr/bin/refine > debian/refine.1
-	help2man -N --no-discard-stderr --name="Invert AtoB1 to make BtoA1 for CMYK profiles." debian/tmp/usr/bin/revfix > debian/revfix.1
-	help2man -N --no-discard-stderr --name="Scanin." debian/tmp/usr/bin/scanin > debian/scanin.1
-	help2man -N --no-discard-stderr --name="Create Simple CMYK Device Profile." debian/tmp/usr/bin/simpprof > debian/simpprof.1
-	help2man -N --no-discard-stderr --name="Convert spectral .ti3 file." debian/tmp/usr/bin/spec2cie > debian/spec2cie.1
-	help2man -N --no-discard-stderr --name="Plot spectrum and calculate CCT and VCT." debian/tmp/usr/bin/specplot > debian/specplot.1
-	help2man -N --no-discard-stderr --name="Split a .ti3 into two." debian/tmp/usr/bin/splitti3 > debian/splitti3.1
-	help2man -N --no-discard-stderr --name="Read Print Spot values." debian/tmp/usr/bin/spotread > debian/spotread.1
-	help2man -N --no-discard-stderr --name="Create a synthetic calibration file." debian/tmp/usr/bin/synthcal > debian/synthcal.1
-	help2man -N --no-discard-stderr --name="Synthetic device model test chart reader." debian/tmp/usr/bin/synthread > debian/synthread.1
-	help2man -N --no-discard-stderr --name="Generate Target deviceb test chart color values." debian/tmp/usr/bin/targen > debian/targen.1
-	help2man -N --no-discard-stderr --name="Create VRML image of the gamut surface of a TIFF." debian/tmp/usr/bin/tiffgamut > debian/tiffgamut.1
-	help2man -N --no-discard-stderr --name="Convert Gretag/Logo or X-Rite ColorPport raw RGB or CMYK device profile data to Argyll CGATS data." debian/tmp/usr/bin/txt2ti3 > debian/txt2ti3.1
-	help2man -N --no-discard-stderr --name="Verify CIE values." debian/tmp/usr/bin/verify > debian/verify.1
-	help2man -N --no-discard-stderr --name="View gamuts." debian/tmp/usr/bin/viewgam > debian/viewgam.1
-	help2man -N --no-discard-stderr --name="Translate colors through an xicc." debian/tmp/usr/bin/xicclu > debian/xicclu.1
-	help2man -N --no-discard-stderr --name="List information about the FILEs." debian/tmp/usr/bin/oeminst > debian/oeminst.1
+	help2man -N --no-discard-stderr --name="Dump an ICC file in human readable form." debian/tmp/usr/bin/iccdump > debian/man/iccdump.1
+	help2man -N --no-discard-stderr --name="Translate colors through an ICC profile." debian/tmp/usr/bin/icclu > debian/man/icclu.1
+	help2man -N --no-discard-stderr --name="Apply device calibration to an ICC profile." debian/tmp/usr/bin/applycal > debian/man/applycal.1
+	help2man -N --no-discard-stderr --name="Average or merge values in .ti3 like files." debian/tmp/usr/bin/average > debian/man/average.1
+	help2man -N --no-discard-stderr --name="Convert Colorblind raw device profile data to Argyll data." debian/tmp/usr/bin/cb2ti3 > debian/man/cb2ti3.1
+	help2man -N --no-discard-stderr --name="Color Correct a TIFF file using any sequence of ICC profiles or Calibrations." debian/tmp/usr/bin/cctiff > debian/man/cctiff.1
+	help2man -N --no-discard-stderr --name="Create CCMX or CCSS." debian/tmp/usr/bin/ccxxmake > debian/man/ccxxmake.1
+	help2man -N --no-discard-stderr --name="Read Target Test Chart." debian/tmp/usr/bin/chartread > debian/man/chartread.1
+	help2man -N --no-discard-stderr --name="Link ICC profiles." debian/tmp/usr/bin/collink > debian/man/collink.1
+	help2man -N --no-discard-stderr --name="Create ICC profile." debian/tmp/usr/bin/colprof > debian/man/colprof.1
+	help2man -N --no-discard-stderr --name="Verify CIE values." debian/tmp/usr/bin/colverify > debian/man/colverify.1
+	help2man -N --no-discard-stderr --name="Calibrate a Display." debian/tmp/usr/bin/dispcal > debian/man/dispcal.1
+	help2man -N --no-discard-stderr --name="Read a Display." debian/tmp/usr/bin/dispread > debian/man/dispread.1
+	help2man -N --no-discard-stderr --name="Test display patch window, Set Video LUTs, Install profiles." debian/tmp/usr/bin/dispwin > debian/man/dispwin.1
+	help2man -N --no-discard-stderr --name="Extract an ICC profile from a TIFF file." debian/tmp/usr/bin/extracticc > debian/man/extracticc.1
+	help2man -N --no-discard-stderr --name="Extract a text tag from an ICC profile." debian/tmp/usr/bin/extractttag > debian/man/extractttag.1
+	help2man -N --no-discard-stderr --name="Create a fake CMY data file from a CMYK profile." debian/tmp/usr/bin/fakeCMY > debian/man/fakeCMY.1
+	help2man -N --no-discard-stderr --name="Fake test chart reader - lookup values in ICC/MPP profile." debian/tmp/usr/bin/fakeread > debian/man/fakeread.1
+	help2man -N --no-discard-stderr --name="Convert a TIFF file to monochrome using an ICC device profile." debian/tmp/usr/bin/greytiff > debian/man/greytiff.1
+	help2man -N --no-discard-stderr --name="Dump an ICC file in human readable form." debian/tmp/usr/bin/iccdump > debian/man/iccdump.1
+	help2man -N --no-discard-stderr --name="Create Lab/Jab gamut plot." debian/tmp/usr/bin/iccgamut > debian/man/iccgamut.1
+	help2man -N --no-discard-stderr --name="Measure an illuminant." debian/tmp/usr/bin/illumread > debian/man/illumread.1
+	help2man -N --no-discard-stderr --name="Check fwd to bwd relative transfer of an ICC file." debian/tmp/usr/bin/invprofcheck > debian/man/invprofcheck.1
+	help2man -N --no-discard-stderr --name="Convert Kodak raw printer profile data to Argyll print data." debian/tmp/usr/bin/kodak2ti3 > debian/man/kodak2ti3.1
+	help2man -N --no-discard-stderr --name="Check Model Printer Profile." debian/tmp/usr/bin/mppcheck > debian/man/mppcheck.1
+	help2man -N --no-discard-stderr --name="Translate colors through an MPP profile." debian/tmp/usr/bin/mpplu > debian/man/mpplu.1
+	help2man -N --no-discard-stderr --name="Create Model Printer Profile." debian/tmp/usr/bin/mppprof > debian/man/mppprof.1
+	help2man -N --no-discard-stderr --name="List information about the FILEs." debian/tmp/usr/bin/oeminst > debian/man/oeminst.1
+	help2man -N --no-discard-stderr --name="Create printer calibration." debian/tmp/usr/bin/printcal > debian/man/printcal.1
+	help2man -N --no-discard-stderr --name="Generate Target PostScrip file." debian/tmp/usr/bin/printtarg > debian/man/printtarg.1
+	help2man -N --no-discard-stderr --name="Check accuracy of ICC profile." debian/tmp/usr/bin/profcheck > debian/man/profcheck.1
+	help2man -N --no-discard-stderr --name="Create abstract correction profile given table of absolute CIE correction values." debian/tmp/usr/bin/refine > debian/man/refine.1
+	help2man -N --no-discard-stderr --name="Invert AtoB1 to make BtoA1 for CMYK profiles." debian/tmp/usr/bin/revfix > debian/man/revfix.1
+	help2man -N --no-discard-stderr --name="Scanin." debian/tmp/usr/bin/scanin > debian/man/scanin.1
+	help2man -N --no-discard-stderr --name="Convert spectral .ti3 file." debian/tmp/usr/bin/spec2cie > debian/man/spec2cie.1
+	help2man -N --no-discard-stderr --name="Plot spectrum and calculate CCT and VCT." debian/tmp/usr/bin/specplot > debian/man/specplot.1
+	help2man -N --no-discard-stderr --name="Split a .ti3 into two." debian/tmp/usr/bin/splitti3 > debian/man/splitti3.1
+	help2man -N --no-discard-stderr --name="Read Print Spot values." debian/tmp/usr/bin/spotread > debian/man/spotread.1
+	help2man -N --no-discard-stderr --name="Create a synthetic calibration file." debian/tmp/usr/bin/synthcal > debian/man/synthcal.1
+	help2man -N --no-discard-stderr --name="Synthetic device model test chart reader." debian/tmp/usr/bin/synthread > debian/man/synthread.1
+	help2man -N --no-discard-stderr --name="Generate Target deviceb test chart color values." debian/tmp/usr/bin/targen > debian/man/targen.1
+	help2man -N --no-discard-stderr --name="Create VRML image of the gamut surface of a TIFF." debian/tmp/usr/bin/tiffgamut > debian/man/tiffgamut.1
+	help2man -N --no-discard-stderr --name="Create test images, default hex RGB surface and wedge." debian/tmp/usr/bin/timage > debian/man/timage.1
+	help2man -N --no-discard-stderr --name="Convert Gretag/Logo or X-Rite ColorPport raw RGB or CMYK device profile data to Argyll CGATS data." debian/tmp/usr/bin/txt2ti3 > debian/man/txt2ti3.1
+	help2man -N --no-discard-stderr --name="View gamuts." debian/tmp/usr/bin/viewgam > debian/man/viewgam.1
+	help2man -N --no-discard-stderr --name="Translate colors through an xicc." debian/tmp/usr/bin/xicclu > debian/man/xicclu.1
+
+VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/')
+
+get-orig-source: 
+	wget http://www.argyllcms.com/Argyll_V${VERSION}_src.zip -O ../Argyll_V${VERSION}_src.zip
+	unzip ../Argyll_V${VERSION}_src.zip  -d ../
+	mv ../Argyll_V${VERSION} ../argyll_${VERSION}
+	tar cJf ../argyll_${VERSION}.orig.tar.xz ../argyll_${VERSION}
+	rm -fr ../argyll_${VERSION} ../Argyll_V${VERSION}_src.zip 
diff --git a/debian/simpprof.1 b/debian/simpprof.1
deleted file mode 100644
index 243a085..0000000
--- a/debian/simpprof.1
+++ /dev/null
@@ -1,23 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
-.TH CREATE "1" "August 2013" "Create Simple CMYK Device Profile, Version 1.1" "User Commands"
-.SH NAME
-Create \- Create Simple CMYK Device Profile.
-.SH DESCRIPTION
-Create Simple CMYK Device Profile, Version 1.1
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: debian/tmp/usr/bin/simpprof [\-v] outfile
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-outfile
-Base name for input.tr3/output.pr1 file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: debian/tmp/usr/bin/simpprof [\-v] outfile
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-outfile
-Base name for input.tr3/output.pr1 file
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..22a4de9
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = xz
+compression-level = 9
diff --git a/debian/tools/buildman.sh b/debian/tools/buildman.sh
new file mode 100755
index 0000000..fee4393
--- /dev/null
+++ b/debian/tools/buildman.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+cd ../../
+
+quilt push -a
+
+debian/rules override_dh_auto_build
+debian/rules override_dh_auto_install
+debian/rules build-manpages
+debian/rules override_dh_auto_clean
+
+quilt pop -a
+