edit man pages

53 files changed, 393 insertions, 3217 deletions

diff --git a/debian/argyll-doc.doc-base b/debian/argyll-doc.doc-base
index 962b063..b4f3f54 100644
--- a/debian/argyll-doc.doc-base
+++ b/debian/argyll-doc.doc-base
@@ -3,5 +3,5 @@ Title: Argyll Documentation
 Section: Graphics
 
 Format: HTML
-Index: /usr/share/doc/argyll-doc/ArgyllDoc.html
-Files: /usr/share/doc/argyll-doc/*.html
+Index: /usr/share/doc/argyll-doc/html/ArgyllDoc.html
+Files: /usr/share/doc/argyll-doc/html/*.html
diff --git a/debian/argyll-doc.docs b/debian/argyll-doc.docs
index 30d29de..aba2a6e 100644
--- a/debian/argyll-doc.docs
+++ b/debian/argyll-doc.docs
@@ -1 +1,3 @@
-doc/*
+doc/* 
+Readme.txt
+debian/README.Debian
diff --git a/debian/changelog b/debian/changelog
index d99cb72..4f95acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-argyll (1.6.3-1) UNRELEASED; urgency=medium
+argyll (1.6.3-1) unstable; urgency=medium
 
   * New Maintainer (Closes: #720178).
   * New upstream release (Closes: #742658).
@@ -6,18 +6,19 @@ argyll (1.6.3-1) UNRELEASED; urgency=medium
     - Add get-orig-source.
     - Remove useless --with quilt from dh $@
     - Enable hardening=+all
+    - Remove section for not included spyder2 firmware.
     - 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).
+      + Remove autoconf and automake | automaken
     - For previously not existing Vcs
       + Create a new git repository on alioth.
-      + Add the Fields Vcs-Browser and Vcs-Git.
+      + 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.
+        Now in argyll. Now only dummy package.
       + libicc2 & libicc-dev
         Useless. Only linked to argyll & icc-utils.
       + libimdi0 & libimdi-dev
@@ -25,10 +26,15 @@ argyll (1.6.3-1) UNRELEASED; urgency=medium
   * 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
+    - Rewrite into DEP-5 format.
+    - Add myself to the list of authors for debian/*.
+    - Add missing licenses and authors.
+  * debian/*.1
+    - Move to debian/man/*.1.
+  * debian/man/*
+    - Rewrite the help2man generated man pages (Closes: #670857)
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sun, 07 Sep 2014 14:50:46 +0200
 
 argyll (1.5.1-8) unstable; urgency=medium
 
diff --git a/debian/copyright b/debian/copyright
index 18352f9..37ee3d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,11 +7,10 @@ Files: *
 Copyright: 1995-2010 Graeme W. Gill <Graeme@argyllcms.com>
 License: AGPL-3
 
-Files:
- icc/*
- cgats/*
- jcnf/*
- ucmm/*
+Files: icc/*
+       cgats/*
+       jcnf/*
+       ucmm/*
 Copyright: 1995-2011 Graeme W. Gill <Graeme@argyllcms.com>
 License: Expat
 
@@ -39,7 +38,7 @@ License: Expat
 
 Files: usb/driver/*
 Copyright: 2002-2005 Stephan Meyer <ste_meyer@web.de>
-License: GPL-2 & LGPL-2
+License: GPL-2 and LGPL-2
  The library (DLL) is distributed under the terms of the GNU Lesser
  General Public License (LGPL).
  .
@@ -64,21 +63,20 @@ 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
+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
 
@@ -128,9 +126,8 @@ Files: tiff/contrib/ras/*
 Copyright: 1990      Sun Microsystems, Inc.
 License: Expat
 
-Files: 
- tiff/libtiff/mkg2states.h
- tiff/libtiff/tif_fax3.*
+Files: tiff/libtiff/mkg2states.h
+       tiff/libtiff/tif_fax3.*
 Copyright: 1991-1997 Sam Leffler
            1991-1997 Silicon Graphics, Inc.
            1990-1995 Frank D. Cringle
@@ -177,10 +174,9 @@ Files: tiff/tools/tiff2pdf.c
 Copyright: 2003      Ross Finlayson
 License: Expat
 
-Files: 
- tiff/tools/bmp2tiff.c
- tiff/tools/raw2tiff.c
- tiff/tools/tiffgt.c 
+Files: tiff/tools/bmp2tiff.c
+       tiff/tools/raw2tiff.c
+       tiff/tools/tiffgt.c 
 Copyright: 2002-2004, Andrey Kiselev <dron@ak4719.spb.edu>
 License: Expat
 
diff --git a/debian/man/applycal.1 b/debian/man/applycal.1
index c512245..eb2f902 100644
--- a/debian/man/applycal.1
+++ b/debian/man/applycal.1
@@ -1,14 +1,12 @@
 .\" 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"
+.TH APPLY "1" "September 2014" "applycal" "User Commands"
 .SH NAME
 Apply \- Apply device calibration to an ICC profile.
 .SH DESCRIPTION
-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
-.PP
-usage: applycal [\-options] [calfile.cal] inprof.icc [outprof.icc]
+Apply device calibration to an ICC profile
+.SH SYNOPSIS
+.B applycal
+.RB [\-options] [calfile.cal] inprof.icc [outprof.icc]
 .TP
 \fB\-v\fR
 Verbose mode
@@ -29,31 +27,4 @@ inprof.icc
 ICC profile to read
 .TP
 outprof.icc
-modified ICC profile to write
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Too few arguments
-.PP
-usage: applycal [\-options] [calfile.cal] inprof.icc [outprof.icc]
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-a\fR
-Apply or re\-apply calibration (default)
-.TP
-\fB\-u\fR
-Remove calibration
-.TP
-\fB\-c\fR
-Check calibration
-.TP
-calfile.cal
-Calibration file to apply
-.TP
-inprof.icc
-ICC profile to read
-.TP
-outprof.icc
-modified ICC profile to write
+modified ICC profile to write
\ No newline at end of file
diff --git a/debian/man/average.1 b/debian/man/average.1
index 73fe678..ae80f1f 100644
--- a/debian/man/average.1
+++ b/debian/man/average.1
@@ -1,37 +1,14 @@
 .\" 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"
+.TH AVERAGE "1" "September 2014" "average" "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.6.3
+Average or merge values in .ti3 like files
 .IP
 Diagnostic: Too few arguments (1, minimum is 2)
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: average [\-options] input1.ti3 input2.ti3 ... output.ti3
-.TP
-\fB\-v\fR
-Verbose
-.TP
-\fB\-m\fR
-Merge rather than average
-.TP
-input1.ti3
-First input file
-.TP
-input2.ti3
-Second input file
-.TP
-\&...
-etc.
-.TP
-output.ti3
-Resulting averaged or merged output file
-.IP
-Diagnostic: Too few arguments (1, minimum is 2)
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: average [\-options] input1.ti3 input2.ti3 ... output.ti3
+.SH SYNOPSIS
+.B average 
+.RB [\-options]\ \input1.ti3\ \input2.ti3 ... output.ti3
 .TP
 \fB\-v\fR
 Verbose
diff --git a/debian/man/cb2ti3.1 b/debian/man/cb2ti3.1
index 16681cb..ddf3a9d 100644
--- a/debian/man/cb2ti3.1
+++ b/debian/man/cb2ti3.1
@@ -1,11 +1,12 @@
 .\" 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"
+.TH CONVERT "1" "September 2014" "cb2ti3" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: cb2ti3 [\-v] [\-l limit] infile outfile
+Convert Colorblind raw device profile data to Argyll data
+.SH SYNOPSIS
+.B cb2ti3 
+.RB [\-v] [\-l limit] infile outfile
 .TP
 \fB\-v\fR
 Verbose mode
@@ -17,19 +18,4 @@ infile
 Base name for input.CMY and input.nCIE file
 .TP
 outfile
-Base name for output.ti3 file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: cb2ti3 [\-v] [\-l limit] infile outfile
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-l\fR limit
-Set inklimit in .ti3 file
-.TP
-infile
-Base name for input.CMY and input.nCIE file
-.TP
-outfile
-Base name for output.ti3 file
+Base name for output.ti3 file
\ No newline at end of file
diff --git a/debian/man/cctiff.1 b/debian/man/cctiff.1
index fd017d0..cb23e31 100644
--- a/debian/man/cctiff.1
+++ b/debian/man/cctiff.1
@@ -1,84 +1,12 @@
 .\" 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"
+.TH COLOR "1" "September 2014" "cctiff" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Unknown flag '\-'
-.PP
-usage: cctiff [\-options] { [\-i intent] profile.icc | calbrtn.cal ...} infile.tif/jpg outfile.tif/jpg
-.TP
-\fB\-v\fR
-Verbose.
-.TP
-\fB\-c\fR
-Combine linearisation curves into one transform.
-.TP
-\fB\-p\fR
-Use slow precise correction.
-.TP
-\fB\-k\fR
-Check fast result against precise, and report.
-.TP
-\fB\-r\fR n
-Override the default CLUT resolution
-.TP
-\fB\-t\fR n
-Choose output encoding from 1..n
-.TP
-\fB\-f\fR [T|J]
-Set output format to Tiff or Jpeg (Default is same as input)
-.TP
-\fB\-q\fR quality
-Set JPEG quality 1..100 (Default 80)
-.TP
-\fB\-a\fR
-Read and Write planes > 4 as alpha planes
-.TP
-\fB\-I\fR
-Ignore any file or profile colorspace mismatches
-.TP
-\fB\-D\fR
-Don't append or set the output TIFF or JPEG description
-.TP
-\fB\-e\fR profile.[icc | tiff | jpg]
-Optionally embed a profile in the destination TIFF or JPEG file.
-.IP
-Then for each profile in sequence:
-.TP
-\fB\-i\fR intent
-p = perceptual, r = relative colorimetric,
-s = saturation, a = absolute colorimetric
-.TP
-\fB\-o\fR order
-n = normal (priority: lut > matrix > monochrome)
-r = reverse (priority: monochrome > matrix > lut)
-.TP
-profile.[icc | tiff]
-Device, Link or Abstract profile
-.IP
-( May be embedded profile in TIFF/JPEG file)
-.IP
-or each calibration file in sequence:
-.TP
-\fB\-d\fR dir
-f = forward cal. (default), b = backwards cal.
-.TP
-calbrtn.cal
-Device calibration file.
-.TP
-infile.tif/jpg
-Input TIFF/JPEG file in appropriate color space
-.IP
-outfile.tif/jpg Output TIFF/JPEG file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Unknown flag '\-'
-.PP
-usage: cctiff [\-options] { [\-i intent] profile.icc | calbrtn.cal ...} infile.tif/jpg outfile.tif/jpg
+Color Correct a TIFF or JPEG file using any sequence of ICC profiles or Calibrations
+.SH SYNOPSIS
+.B cctiff
+.RB [\-options]\ { [\-i intent]\ profile.icc\ |\ calbrtn.cal\ ...}\ infile.(tif|jpg)\ outfile.(tif|jpg)
 .TP
 \fB\-v\fR
 Verbose.
diff --git a/debian/man/ccxxmake.1 b/debian/man/ccxxmake.1
index 0bd7df7..337db92 100644
--- a/debian/man/ccxxmake.1
+++ b/debian/man/ccxxmake.1
@@ -1,98 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "ccmxmake" "User Commands"
 .SH NAME
 Create \- Create CCMX or CCSS.
 .SH DESCRIPTION
-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
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-S\fR
-Create CCSS rather than CCMX
-.HP
-\fB\-f\fR file1.ti3[,file2.ti3] Create from one or two .ti3 files rather than measure.
-.TP
-\fB\-display\fR displayname
-Choose X11 display name
-.TP
-\fB\-d\fR n[,m]
-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 DVI\-I\-1 at 0, 0, width 1920, height 1080'
-.TP
-\fB\-dweb[\fR:port]
-Display via a web server at port (default 8080)
-.TP
-\fB\-p\fR
-Use telephoto mode (ie. for a projector) (if available)
-.TP
-\fB\-P\fR ho,vo,ss[,vs]
-Position test window and scale it
-ho,vi: 0.0 = left/top, 0.5 = center, 1.0 = right/bottom etc.
-ss: 0.5 = half, 1.0 = normal, 2.0 = double etc.
-.TP
-\fB\-F\fR
-Fill whole screen with black background
-.TP
-\fB\-n\fR
-Don't set override redirect on test window
-.TP
-\fB\-N\fR
-Disable initial calibration of instrument if possible
-.TP
-\fB\-H\fR
-Use high resolution spectrum mode (if available)
-.TP
-\fB\-C\fR "command"
-Invoke shell "command" each time a color is set
-.TP
-\fB\-o\fR observ
-Choose CIE Observer for CCMX spectrometer data:
-1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
-.TP
-\fB\-s\fR steps
-Override default patch sequence combination steps  (default 1)
-.TP
-\fB\-W\fR n|h|x
-Override serial port flow control: n = none, h = HW, x = Xon/Xoff
-.TP
-\fB\-D\fR [level]
-Print debug diagnostics to stderr
-.TP
-\fB\-E\fR desciption
-Override the default overall description
-.TP
-\fB\-I\fR displayname
-Set display make and model description
-.TP
-\fB\-T\fR displaytech
-Set display technology description (ie. CRT, LCD etc.)
-.TP
-\fB\-U\fR c
-Set UI selection character(s)
-.TP
-\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
-correction.ccmx | calibration.ccss
-.IP
-File to save result to
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Flag '\-\-' not recognised
-usage: ccmxmake [\-options] output.ccmx
+Create CCMX or CCSS
+.SH SYNOPSIS
+.B ccmxmake 
+.RB [\-options]\ output.ccmx
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/chartread.1 b/debian/man/chartread.1
index 1d3d21c..1d8285e 100644
--- a/debian/man/chartread.1
+++ b/debian/man/chartread.1
@@ -1,101 +1,12 @@
 .\" 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"
+.TH READ "1" "September 2014" "chartread" "User Commands"
 .SH NAME
 Read \- Read Target Test Chart.
 .SH DESCRIPTION
-Read Target Test Chart, Version 1.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: chartread [\-options] outfile
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-c\fR listno
-Set communication port from the following list (default 1)
-.IP
-** No ports found **
-.TP
-\fB\-t\fR
-Use transmission measurement mode
-.TP
-\fB\-d\fR
-Use display measurement mode (white Y relative results)
-.TP
-\fB\-e\fR
-Emissive for transparency on a light box
-.TP
-\fB\-p\fR
-Measure patch by patch rather than strip
-.TP
-\fB\-x\fR [lx]
-Take external values, either L*a*b* (\fB\-xl\fR) or XYZ (\fB\-xx\fR).
-.TP
-\fB\-n\fR
-Don't save spectral information (default saves spectral)
-.TP
-\fB\-l\fR
-Save CIE as D50 L*a*b* rather than XYZ
-.TP
-\fB\-L\fR
-Save CIE as D50 L*a*b* as well as XYZ
-.TP
-\fB\-r\fR
-Resume reading partly read chart
-.TP
-\fB\-I\fR file.cal
-Override calibration info from .ti2 in resulting .ti3
-.TP
-\fB\-F\fR filter
-Set filter configuration (if aplicable):
-.TP
-n
-None
-.TP
-p
-Polarising filter
-.TP
-6
-D65
-.TP
-u
-U.V. Cut
-.TP
-\fB\-N\fR
-Disable initial calibration of instrument if possible
-.TP
-\fB\-B\fR
-Disable auto bi\-directional strip recognition
-.TP
-\fB\-H\fR
-Use high resolution spectrum mode (if available)
-.TP
-\fB\-X\fR file.ccmx
-Apply Colorimeter Correction Matrix
-.TP
-\fB\-X\fR file.ccss
-Use Colorimeter Calibration Spectral Samples for calibration
-.TP
-\fB\-Q\fR observ
-Choose CIE Observer for CCSS instrument:
-1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
-.TP
-\fB\-T\fR ratio
-Modify strip patch consistency tolerance by ratio
-.TP
-\fB\-S\fR
-Suppress wrong strip & unexpected value warnings
-.TP
-\fB\-W\fR n|h|x
-Override serial port flow control: n = none, h = HW, x = Xon/Xoff
-.TP
-\fB\-D\fR [level]
-Print debug diagnostics to stderr
-.TP
-outfile
-Base name for input[ti2]/output[ti3] file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: chartread [\-options] outfile
+Read Target Test Chart
+.SH SYNOPSIS
+.B chartread 
+.RB [\-options]\ outfile
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/collink.1 b/debian/man/collink.1
index 5a933dd..35d6c02 100644
--- a/debian/man/collink.1
+++ b/debian/man/collink.1
@@ -1,256 +1,14 @@
 .\" 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"
+.TH LINK "1" "September 2014" "collink" "User Commands"
 .SH NAME
 Link \- Link ICC profiles.
 .SH DESCRIPTION
-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
-.PP
-usage: collink [options] srcprofile dstprofile linkedprofile
-.TP
-\fB\-v\fR
-Verbose
-.HP
-\fB\-A\fR manufacturer Manufacturer description string
-.TP
-\fB\-M\fR model
-Model description string
-.TP
-\fB\-D\fR description
-Profile Description string (Default "inoutfile")
-.TP
-\fB\-C\fR copyright
-Copyright string
-.TP
-\fB\-V\fR
-Verify existing profile, rather than link
-.TP
-\fB\-q\fR lmhu
-Quality \- Low, Medium (def), High, Ultra
-.TP
-\fB\-r\fR res
-Override clut res. set by \fB\-q\fR
-.TP
-\fB\-n\fR
-Don't preserve device linearization curves in result
-.TP
-\fB\-f\fR
-Special :\- Force neutral colors to be K only output
-.TP
-\fB\-fk\fR
-Special :\- Force K only neutral colors to be K only output
-.TP
-\fB\-F\fR
-Special :\- Force all colors to be K only output
-.TP
-\fB\-fcmy\fR
-Special :\- Force 100% C,M or Y only to stay pure
-.TP
-\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
-\fB\-g\fR [src.gam]
-Gamut Mapping Mode [optional source image gamut]
-.TP
-\fB\-G\fR [src.gam]
-Gamut Mapping Mode using inverse outprofile A2B
-.IP
-Simple Mode Options:
-\fB\-i\fR in_intent    p = perceptual, r = relative colorimetric,
-.IP
-s = saturation, a = absolute colorimetric
-.TP
-\fB\-o\fR out_intent
-p = perceptual, r = relative colorimetric,
-s = saturation, a = absolute colorimetric
-.TP
-Gamut Mapping
-Mode Options:
-.TP
-\fB\-i\fR intent
-set linking intent from the following choice:
-.IP
-a \- Absolute Colorimetric (in Jab) [ICC Absolute Colorimetric]
-.IP
-aw \- Absolute Colorimetric (in Jab) with scaling to fit white point
-aa \- Absolute Appearance
-.IP
-r \- White Point Matched Appearance [ICC Relative Colorimetric]
-.IP
-la \- Luminance axis matched Appearance
-.IP
-p \- Perceptual (Preferred) (Default) [ICC Perceptual]
-.IP
-pa \- Perceptual Apperance
-ms \- Saturation
-.IP
-s \- Enhanced Saturation [ICC Saturation]
-.IP
-al \- Absolute Colorimetric (Lab)
-rl \- White Point Matched Colorimetric (Lab)
-.TP
-\fB\-w\fR [J,a,b]
-Use forced whitepoint hack [optional target point]
-.TP
-\fB\-c\fR viewcond
-set source viewing conditions for CIECAM02,
-either an enumerated choice, or a parameter
-.TP
-\fB\-d\fR viewcond
-set destination viewing conditions for CIECAM02,
-either an enumerated choice, or parameter:value changes
-.IP
-pp \- Practical Reflection Print (ISO\-3664 P2)
-pe \- Print evaluation environment (CIE 116\-1995)
-pc \- Critical print evaluation environment (ISO\-3664 P1)
-mt \- Monitor in typical work environment
-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
-ob \- Original scene \- Bright Outdoors
-cx \- Cut Sheet Transparencies on a viewing box
-.TP
-s:surround
-n = auto, a = average, m = dim, d = dark,
-c = transparency (default average)
-.TP
-w:X:Y:Z
-Adapted white point as XYZ (default media white)
-.TP
-w:x:y
-Adapted white point as x, y
-.TP
-a:adaptation
-Adaptation luminance in cd.m^2 (default 50.0)
-.TP
-b:background
-Background % of image luminance (default 20)
-.TP
-l:imagewhite
-Image white in cd.m^2 if surround = auto (default 250)
-.TP
-f:flare
-Flare light % of image luminance (default 0)
-.TP
-g:glare
-Flare light % of ambient (default 1)
-.TP
-g:X:Y:Z
-Flare color as XYZ (default media white, Abs: D50)
-.TP
-g:x:y
-Flare color as x, y
-.TP
-\fB\-t\fR tlimit
-set source total ink limit, 0 \- 400% (estimate by default)
-.TP
-\fB\-T\fR klimit
-set source black ink limit, 0 \- 100% (estimate by default)
-.IP
-Inverse outprofile A2B Options:
-\fB\-k\fR tezhxr       CMYK Black generation
-.IP
-t = transfer K from source to destination, e = retain K of destination B2A table
-z = zero K, h = 0.5 K, x = maximum K, r = ramp K (default)
-.HP
-\fB\-k\fR p stle stpo enpo enle shape
-.IP
-p = black target generation curve parameters
-.HP
-\fB\-k\fR q stle0 stpo0 enpo0 enle0 shape0 stle2 stpo2 enpo2 enle2 shape2
-.IP
-q = transfer source K to dual curve limits
-.TP
-\fB\-K\fR parameters
-Same as \fB\-k\fR, but target is K locus rather than K value itself
-.TP
-\fB\-l\fR tlimit
-set destination total ink limit, 0 \- 400% (estimate by default)
-.TP
-\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
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Too few arguments, got 1 expect at least 3
-.PP
-usage: collink [options] srcprofile dstprofile linkedprofile
+Link ICC profiles
+.SH SYNOPSIS
+.B collink 
+.RB [options]\ srcprofile\ dstprofile\ linkedprofile
 .TP
-\fB\-v\fR
-Verbose
+\fB\-v\fR Verbose
 .HP
 \fB\-A\fR manufacturer Manufacturer description string
 .TP
diff --git a/debian/man/colprof.1 b/debian/man/colprof.1
index b9feb69..cf8b9b1 100644
--- a/debian/man/colprof.1
+++ b/debian/man/colprof.1
@@ -1,197 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "colprof" "User Commands"
 .SH NAME
 Create \- Create ICC profile.
 .SH DESCRIPTION
-Create ICC profile, Version 1.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Unknown flag '\-'
-.PP
-usage: debian/tmp/usr/bin/colprof [\-options] inoutfile
-.TP
-\fB\-v\fR
-Verbose mode
-.HP
-\fB\-A\fR manufacturer Manufacturer description string
-.TP
-\fB\-M\fR model
-Model description string
-.TP
-\fB\-D\fR description
-Profile Description string (Default "inoutfile")
-.TP
-\fB\-C\fR copyright
-Copyright string
-.TP
-\fB\-Z\fR tmnb
-Attributes: Transparency, Matte, Negative, BlackAndWhite
-.TP
-\fB\-Z\fR prsa
-Default intent: Perceptual, Rel. Colorimetric, Saturation, Abs. Colorimetric
-.TP
-\fB\-q\fR lmhu
-Quality \- Low, Medium (def), High, Ultra
-.TP
-\fB\-b\fR [lmhun]
-Low quality B2A table \- or specific B2A quality or none for input device
-.TP
-\fB\-ni\fR
-Don't create input (Device) shaper curves
-.TP
-\fB\-np\fR
-Don't create input (Device) grid position curves
-.TP
-\fB\-no\fR
-Don't create output (PCS) shaper curves
-.TP
-\fB\-nc\fR
-Don't put the input .ti3 data in the profile
-.TP
-\fB\-k\fR zhxr
-Black value target: z = zero K,
-h = 0.5 K, x = max K, r = ramp K (def.)
-.HP
-\fB\-k\fR p stle stpo enpo enle shape
-.IP
-stle: K level at White 0.0 \- 1.0
-stpo: start point of transition Wh 0.0 \- Bk 1.0
-enpo: End point of transition Wh 0.0 \- Bk 1.0
-enle: K level at Black 0.0 \- 1.0
-shape: 1.0 = straight, 0.0\-1.0 concave, 1.0\-2.0 convex
-.TP
-\fB\-K\fR parameters
-Same as \fB\-k\fR, but target is K locus rather than K value itself
-.TP
-\fB\-l\fR tlimit
-override total ink limit, 0 \- 400% (default from .ti3)
-.TP
-\fB\-L\fR klimit
-override black ink limit, 0 \- 100% (default from .ti3)
-.TP
-\fB\-a\fR lxXgsmGS
-Algorithm type override
-l = Lab cLUT (def.), x = XYZ cLUT, X = display XYZ cLUT + matrix
-g = gamma+matrix, s = shaper+matrix, m = matrix only,
-G = single gamma+matrix, S = single shaper+matrix
-.TP
-\fB\-u\fR
-If input profile, auto scale WP to allow extrapolation
-.TP
-\fB\-uc\fR
-If input profile, clip cLUT values above WP
-.TP
-\fB\-U\fR scale
-If input profile, scale media white point by scale
-.TP
-\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
-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:
-.IP
-1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
-.TP
-\fB\-r\fR avgdev
-Average deviation of device+instrument readings as a percentage (default 0.50%)
-.TP
-\fB\-s\fR src.icc
-Apply gamut mapping to output profile perceptual B2A table for given source space
-.TP
-\fB\-S\fR src.icc
-Apply gamut mapping to output profile perceptual and saturation B2A table
-.TP
-\fB\-nP\fR
-Use colormetric source gamut to make output profile perceptual table
-.TP
-\fB\-nS\fR
-Use colormetric source gamut to make output profile saturation table
-.TP
-\fB\-g\fR src.gam
-Use source image gamut as well for output profile gamut mapping
-.TP
-\fB\-p\fR absprof,...
-Incorporate abstract profile(s) into output tables
-.TP
-\fB\-t\fR intent
-Override gamut mapping intent for output profile perceptual table:
-.TP
-\fB\-T\fR intent
-Override gamut mapping intent for output profile saturation table:
-.IP
-a \- Absolute Colorimetric (in Jab) [ICC Absolute Colorimetric]
-.IP
-aw \- Absolute Colorimetric (in Jab) with scaling to fit white point
-aa \- Absolute Appearance
-.IP
-r \- White Point Matched Appearance [ICC Relative Colorimetric]
-.IP
-la \- Luminance axis matched Appearance
-.IP
-p \- Perceptual (Preferred) (Default) [ICC Perceptual]
-.IP
-pa \- Perceptual Apperance
-ms \- Saturation
-.IP
-s \- Enhanced Saturation [ICC Saturation]
-.IP
-al \- Absolute Colorimetric (Lab)
-rl \- White Point Matched Colorimetric (Lab)
-.TP
-\fB\-c\fR viewcond
-set input viewing conditions for output profile CIECAM02 gamut mapping,
-.IP
-either an enumerated choice, or a parameter
-.TP
-\fB\-d\fR viewcond
-set output viewing conditions for output profile CIECAM02 gamut mapping
-.IP
-either an enumerated choice, or a parameter
-Also sets out of gamut clipping CAM space.
-either an enumerated choice, or a series of parameters:value changes
-.IP
-pp \- Practical Reflection Print (ISO\-3664 P2)
-pe \- Print evaluation environment (CIE 116\-1995)
-pc \- Critical print evaluation environment (ISO\-3664 P1)
-mt \- Monitor in typical work environment
-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
-ob \- Original scene \- Bright Outdoors
-cx \- Cut Sheet Transparencies on a viewing box
-.TP
-\fB\-P\fR
-Create gamut gammap_p.wrl and gammap_s.wrl diagostics
-.TP
-\fB\-O\fR outputfile
-Override the default output filename.
-.TP
-inoutfile
-Base name for input.ti3/output.icc file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Unknown flag '\-'
-.PP
-usage: debian/tmp/usr/bin/colprof [\-options] inoutfile
+Create ICC profile
+.SH SYNOPSIS
+.B colprof 
+.RB [\-options]\ inoutfile
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/colverifiy.1 b/debian/man/colverifiy.1
deleted file mode 100644
index e53707b..0000000
--- a/debian/man/colverifiy.1
+++ /dev/null
@@ -1,129 +0,0 @@
-.\" 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/man/colverify.1 b/debian/man/colverify.1
index e53707b..392d8f0 100644
--- a/debian/man/colverify.1
+++ b/debian/man/colverify.1
@@ -1,73 +1,12 @@
 .\" 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"
+.TH VERIFY "1" "September 2014" "verfiy" "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
+Verify CIE values
+.SH SYNOPSIS
+.B verify 
+.RB [\-options]\ target.ti3\ measured.ti3
 .TP
 \fB\-v\fR [n]
 Verbose mode, n >= 2 print each value
diff --git a/debian/man/dispcal.1 b/debian/man/dispcal.1
index 1570b98..20e9442 100644
--- a/debian/man/dispcal.1
+++ b/debian/man/dispcal.1
@@ -1,163 +1,12 @@
 .\" 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"
+.TH CALIBRATE "1" "September 2014" "dispcal" "User Commands"
 .SH NAME
 Calibrate \- Calibrate a Display.
 .SH DESCRIPTION
-Calibrate a Display, Version 1.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Usage requested
-usage: dispcal [options] outfile
-.TP
-\fB\-v\fR [n]
-Verbose mode
-.HP
-\fB\-display\fR displayname Choose X11 display name
-.TP
-\fB\-d\fR n[,m]
-Choose the display n from the following list (default 1)
-Optionally choose different display m for VideoLUT access
-.IP
-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)
-.TP
-\fB\-c\fR listno
-Set communication port from the following list (default 1)
-.IP
-** No ports found **
-.TP
-\fB\-r\fR
-Report on the calibrated display then exit
-.TP
-\fB\-R\fR
-Report on the uncalibrated display then exit
-.TP
-\fB\-m\fR
-Skip adjustment of the monitor controls
-.TP
-\fB\-o\fR [profile.icc]
-Create fast matrix/shaper profile [different filename to outfile.icc]
-.TP
-\fB\-O\fR "description"
-Fast ICC Profile Description string (Default "outfile")
-.TP
-\fB\-u\fR
-Update previous calibration and (if \fB\-o\fR used) ICC profile VideoLUTs
-.TP
-\fB\-q\fR [vlmh]
-Quality \- Very Low, Low, Medium (def), High
-.TP
-\fB\-p\fR
-Use telephoto mode (ie. for a projector) (if available)
-.TP
-\fB\-t\fR [temp]
-White Daylight locus target, optional target temperaturee in deg. K (deflt.)
-.TP
-\fB\-T\fR [temp]
-White Black Body locus target, optional target temperaturee in deg. K
-.TP
-\fB\-w\fR x,y
-Set the target white point as chromaticity coordinates
-.TP
-\fB\-b\fR bright
-Set the target white brightness in cd/m^2
-.TP
-\fB\-g\fR gamma
-Set the target response curve advertised gamma (Def. 2.4)
-Use "\-gl" for L*a*b* curve
-Use "\-gs" for sRGB curve
-Use "\-g709" for REC 709 curve (should use \fB\-a\fR as well!)
-Use "\-g240" for SMPTE 240M curve (should use \fB\-a\fR as well!)
-Use "\-G2.4 \fB\-f0\fR" for BT.1886
-.TP
-\fB\-G\fR gamma
-Set the target response curve actual technical gamma
-.TP
-\fB\-f\fR [degree]
-Amount of black level accounted for with output offset (default all output offset)
-.TP
-\fB\-a\fR ambient
-Use viewing condition adjustment for ambient in Lux
-.TP
-\fB\-k\fR factor
-Amount to correct black hue, 0 = none, 1 = full, Default = Automatic
-.TP
-\fB\-A\fR rate
-Rate of blending from neutral to black point. Default 4.0
-.TP
-\fB\-B\fR blkbright
-Set the target black brightness in cd/m^2
-.TP
-\fB\-e\fR [n]
-Run n verify passes on final curves
-.TP
-\fB\-z\fR
-Run only verify pass on installed calibration curves
-.TP
-\fB\-P\fR ho,vo,ss[,vs]
-Position test window and scale it
-ho,vi: 0.0 = left/top, 0.5 = center, 1.0 = right/bottom etc.
-ss: 0.5 = half, 1.0 = normal, 2.0 = double etc.
-.TP
-\fB\-F\fR
-Fill whole screen with black background
-.TP
-\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
-\fB\-N\fR
-Disable initial calibration of instrument if possible
-.TP
-\fB\-H\fR
-Use high resolution spectrum mode (if available)
-.TP
-\fB\-X\fR file.ccmx
-Apply Colorimeter Correction Matrix
-.TP
-\fB\-X\fR file.ccss
-Use Colorimeter Calibration Spectral Samples for calibration
-.TP
-\fB\-Q\fR observ
-Choose CIE Observer for spectrometer or CCSS colorimeter data:
-1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2, 1964_10c
-.TP
-\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
-\fB\-M\fR "command"
-Invoke shell "command" each time a color is measured
-.TP
-\fB\-W\fR n|h|x
-Override serial port flow control: n = none, h = HW, x = Xon/Xoff
-.TP
-\fB\-D\fR [level]
-Print debug diagnostics to stderr
-.TP
-inoutfile
-Base name for created or updated .cal and .icc output files
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Usage requested
-usage: dispcal [options] outfile
+Calibrate a Display
+.SH SYNOPSIS
+.B dispcal 
+.RB [options]\ outfile
 .TP
 \fB\-v\fR [n]
 Verbose mode
diff --git a/debian/man/dispread.1 b/debian/man/dispread.1
index dbf1776..a19b8c7 100644
--- a/debian/man/dispread.1
+++ b/debian/man/dispread.1
@@ -1,110 +1,12 @@
 .\" 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"
+.TH READ "1" "September 2014" "dispread" "User Commands"
 .SH NAME
 Read \- Read a Display.
 .SH DESCRIPTION
-Read a Display, Version 1.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Usage requested
-usage: dispread [options] outfile
-.TP
-\fB\-v\fR
-Verbose mode
-.HP
-\fB\-display\fR displayname Choose X11 display name
-.TP
-\fB\-d\fR n[,m]
-Choose the display n from the following list (default 1)
-Optionally choose different display m for VideoLUT access
-.IP
-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)
-.TP
-\fB\-c\fR listno
-Set communication port from the following list (default 1)
-.IP
-** No ports found **
-.TP
-\fB\-p\fR
-Use telephoto mode (ie. for a projector) (if available)
-.TP
-\fB\-k\fR file.cal
-Load calibration file into display while reading
-.TP
-\fB\-K\fR file.cal
-Apply calibration file to test values while reading
-.TP
-\fB\-s\fR
-Save spectral information (default don't save)
-.TP
-\fB\-P\fR ho,vo,ss[,vs]
-Position test window and scale it
-ho,vi: 0.0 = left/top, 0.5 = center, 1.0 = right/bottom etc.
-ss: 0.5 = half, 1.0 = normal, 2.0 = double etc.
-.TP
-\fB\-F\fR
-Fill whole screen with black background
-.TP
-\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
-\fB\-N\fR
-Disable initial calibration of instrument if possible
-.TP
-\fB\-H\fR
-Use high resolution spectrum mode (if available)
-.TP
-\fB\-w\fR
-Disable normalisation of white to Y = 100
-.TP
-\fB\-X\fR file.ccmx
-Apply Colorimeter Correction Matrix
-.TP
-\fB\-X\fR file.ccss
-Use Colorimeter Calibration Spectral Samples for calibration
-.TP
-\fB\-Q\fR observ
-Choose CIE Observer for spectrometer or CCSS colorimeter data:
-1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2, 1964_10c
-.TP
-\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
-\fB\-M\fR "command"
-Invoke shell "command" each time a color is measured
-.TP
-\fB\-W\fR n|h|x
-Override serial port flow control: n = none, h = HW, x = Xon/Xoff
-.TP
-\fB\-D\fR [level]
-Print debug diagnostics to stderr
-.TP
-outfile
-Base name for input[ti1]/output[ti3] file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Usage requested
-usage: dispread [options] outfile
+Read a Display
+.SH SYNOPSIS
+.B dispread
+.RB [options]\ outfile
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/dispwin.1 b/debian/man/dispwin.1
index 9781182..c4c7594 100644
--- a/debian/man/dispwin.1
+++ b/debian/man/dispwin.1
@@ -1,88 +1,12 @@
 .\" 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"
+.TH TEST "1" "September 2014" "dispwin" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Unknown flag '\-\-help'
-usage: dispwin [options] [calfile]
-.TP
-\fB\-v\fR
-Verbose mode
-.HP
-\fB\-display\fR displayname Choose X11 display name
-.TP
-\fB\-d\fR n[,m]
-Choose the display n from the following list (default 1)
-Optionally choose different display m for Video LUT access
-.IP
-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)
-.TP
-\fB\-P\fR ho,vo,ss[,vs]
-Position test window and scale it
-.TP
-\fB\-F\fR
-Fill whole screen with black background
-.TP
-\fB\-i\fR
-Run forever with random values
-.TP
-\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
-\fB\-f\fR
-Test grey ramp fade
-.TP
-\fB\-r\fR
-Test just Video LUT loading & Beeps
-.TP
-\fB\-n\fR
-Test native output (rather than through Video LUT and C.M.)
-.TP
-\fB\-s\fR filename
-Save the currently loaded Video LUT to 'filename'
-.TP
-\fB\-c\fR
-Load a linear display calibration
-.TP
-\fB\-V\fR
-Verify that calfile/profile cal. is currently loaded in LUT
-.TP
-\fB\-I\fR
-Install profile for display and use it's calibration
-.TP
-\fB\-U\fR
-Un\-install profile for display
-.TP
-\fB\-S\fR d
-Specify the install/uninstall scope for OS X [nlu] or X11/Vista [lu]
-d is one of: n = network, l = local system, u = user (default)
-.TP
-\fB\-L\fR
-Load installed profiles cal. into Video LUT
-.TP
-\fB\-X\fR
-Run in daemon loader mode for given X11 server
-.TP
-\fB\-D\fR [level]
-Print debug diagnostics to stderr
-.TP
-calfile
-Load calibration (.cal or .icc) into Video LUT
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Unknown flag '\-\-version'
-usage: dispwin [options] [calfile]
+Test display patch window, Set Video LUTs, Install profiles
+.SH SYNOPSIS
+.B dispwin
+.RB [options]\ [calfile]
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/extracticc.1 b/debian/man/extracticc.1
index 5bf0a00..9d5adad 100644
--- a/debian/man/extracticc.1
+++ b/debian/man/extracticc.1
@@ -1,19 +1,12 @@
 .\" 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"
+.TH EXTRACT "1" "September 2014" "extracticc" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Too few parameters
-usage: extracticc  [\-v] infile.tif/jpg outfile.icc
-.TP
-\fB\-v\fR
-Verbose
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Too few parameters
-usage: extracticc  [\-v] infile.tif/jpg outfile.icc
+Extract an ICC profile from a TIFF or JPEG file
+.SH SYNOPSIS
+.B extracticc
+.RB [\-v]\ infile.(tif|jpg)\ outfile.icc
 .TP
 \fB\-v\fR
 Verbose
diff --git a/debian/man/extractttag.1 b/debian/man/extractttag.1
index 9bc01dc..eac947a 100644
--- a/debian/man/extractttag.1
+++ b/debian/man/extractttag.1
@@ -1,25 +1,12 @@
 .\" 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"
+.TH EXTRACT "1" "September 2014" "extractttag" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Too few parameters
-usage: extractttag  [\-v] infile.icc outfile
-.TP
-\fB\-v\fR
-Verbose
-.TP
-\fB\-t\fR tag
-Extract this tag rather than default 'targ'
-.TP
-\fB\-c\fR
-Extract calibration file from 'targ' tag
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Too few parameters
-usage: extractttag  [\-v] infile.icc outfile
+Extract a text tag from an ICC profile
+.SH SYNOPSIS
+.B extractttag
+.RB [\-v]\ infile.icc\ outfile
 .TP
 \fB\-v\fR
 Verbose
diff --git a/debian/man/fakeCMY.1 b/debian/man/fakeCMY.1
index 91d02f9..6509ad6 100644
--- a/debian/man/fakeCMY.1
+++ b/debian/man/fakeCMY.1
@@ -1,28 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "fakeCMY" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: fakeCMY [option] profile.icm fake.ti3
-Diagnostic: Unknown flag
-.TP
-\fB\-v\fR
-verbose
-.TP
-\fB\-r\fR res
-set surface point resolution (default 3)
-.TP
-\fB\-l\fR tlimit
-set total ink limit, 0 \- 400% (estimate by default)
-.TP
-\fB\-L\fR klimit
-set black ink limit, 0 \- 100% (estimate by default)
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: fakeCMY [option] profile.icm fake.ti3
-Diagnostic: Unknown flag
+Create a fake CMY data file from a CMYK profile
+.SH SYNOPSIS
+.B fakeCMY
+.RB [option]\ profile.icm\ fake.ti3
 .TP
 \fB\-v\fR
 verbose
diff --git a/debian/man/fakeread.1 b/debian/man/fakeread.1
index 337fe45..1af12e0 100644
--- a/debian/man/fakeread.1
+++ b/debian/man/fakeread.1
@@ -1,101 +1,12 @@
 .\" 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"
+.TH FAKE "1" "September 2014" "fakeread" "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
+Fake test chart reader \- lookup values in ICC/MPP profile
+.SH SYNOPSIS
+.B fakeread
+.RB [\-options]\ profile.[icc|mpp|ti3]\ outfile
 .TP
 \fB\-v\fR [n]
 Verbose mode [level]
diff --git a/debian/man/greytiff.1 b/debian/man/greytiff.1
index 137686c..f1b71d6 100644
--- a/debian/man/greytiff.1
+++ b/debian/man/greytiff.1
@@ -1,23 +1,12 @@
 .\" 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"
+.TH CONVERT "1" "September 2014" "greytiff" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: greytiff [\-v level] profile.icm infile.tif outfile.tif
-.TP
-\fB\-v\fR
-Verbose
-.TP
-\fB\-p\fR
-Use slow precise correction
-.TP
-\fB\-j\fR
-Use CIECAM02
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: greytiff [\-v level] profile.icm infile.tif outfile.tif
+Convert a TIFF file to monochrome using an ICC device profile
+.SH SYNOPSIS
+.B greytiff 
+.RB [\-v\ level]\ profile.icm\ infile.tif\ outfile.tif
 .TP
 \fB\-v\fR
 Verbose
diff --git a/debian/man/iccdump.1 b/debian/man/iccdump.1
index 6c75135..e508f13 100644
--- a/debian/man/iccdump.1
+++ b/debian/man/iccdump.1
@@ -1,26 +1,12 @@
 .\" 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"
+.TH DUMP "1" "September 2014" "iccdump" "User Commands"
 .SH NAME
 Dump \- Dump an ICC file in human readable form.
 .SH DESCRIPTION
-Dump an ICC file in human readable form, V2.17
-Author: Graeme W. Gill
-usage: iccdump [\-v level] [\-t tagname] [\-s] infile
-.TP
-\fB\-v\fR level
-Verbose level 1\-3 (default 2)
-.TP
-\fB\-t\fR tag
-Dump this tag only (can be used multiple times)
-.TP
-\fB\-s\fR
-Search for embedded profile
-.TP
-\fB\-i\fR
-Check V4 ID value
-.PP
-Author: Graeme W. Gill
-usage: iccdump [\-v level] [\-t tagname] [\-s] infile
+Dump an ICC file in human readable form
+.SH SYNOPSIS
+.B iccdump
+.RB [\-v\ level]\ [\-t\ tagname]\ [\-s]\ infile
 .TP
 \fB\-v\fR level
 Verbose level 1\-3 (default 2)
diff --git a/debian/man/iccgamut.1 b/debian/man/iccgamut.1
index b83978a..2aa40ff 100644
--- a/debian/man/iccgamut.1
+++ b/debian/man/iccgamut.1
@@ -1,104 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "iccgamut" "User Commands"
 .SH NAME
 Create \- Create Lab/Jab gamut plot.
 .SH DESCRIPTION
-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
-.TP
-\fB\-v\fR
-Verbose
-.TP
-\fB\-d\fR sres
-Surface resolution details 1.0 \- 50.0
-.TP
-\fB\-w\fR
-emit VRML .wrl file as well as CGATS .gam file
-.TP
-\fB\-n\fR
-Don't add VRML axes or white/black point
-.TP
-\fB\-k\fR
-Add VRML markers for prim. & sec. "cusp" points
-.TP
-\fB\-f\fR function
-f = forward*, b = backwards
-.TP
-\fB\-i\fR intent
-p = perceptual, r = relative colorimetric,
-s = saturation, a = absolute (default), d = profile default
-.TP
-\fB\-p\fR oride
-l = Lab_PCS (default), j = CIECAM02 Appearance Jab
-.TP
-\fB\-o\fR order
-n = normal (priority: lut > matrix > monochrome)
-r = reverse (priority: monochrome > matrix > lut)
-.TP
-\fB\-l\fR tlimit
-set total ink limit, 0 \- 400% (estimate by default)
-.TP
-\fB\-L\fR klimit
-set black ink limit, 0 \- 100% (estimate by default)
-.TP
-\fB\-c\fR viewcond
-set viewing conditions for CIECAM02,
-either an enumerated choice, or a series of parameter:value changes
-.IP
-pp \- Practical Reflection Print (ISO\-3664 P2)
-pe \- Print evaluation environment (CIE 116\-1995)
-pc \- Critical print evaluation environment (ISO\-3664 P1)
-mt \- Monitor in typical work environment
-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
-ob \- Original scene \- Bright Outdoors
-cx \- Cut Sheet Transparencies on a viewing box
-.TP
-s:surround
-n = auto, a = average, m = dim, d = dark,
-c = transparency (default average)
-.TP
-w:X:Y:Z
-Adapted white point as XYZ (default media white)
-.TP
-w:x:y
-Adapted white point as x, y
-.TP
-a:adaptation
-Adaptation luminance in cd.m^2 (default 50.0)
-.TP
-b:background
-Background % of image luminance (default 20)
-.TP
-l:imagewhite
-Image white in cd.m^2 if surround = auto (default 250)
-.TP
-f:flare
-Flare light % of image luminance (default 0)
-.TP
-g:glare
-Flare light % of ambient (default 1)
-.TP
-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
-Create special cube surface topology plot
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: iccgamut [options] profile
-Diagnostic: Unknown flag
+Create Lab/Jab gamut plot
+.SH SYNOPSIS
+.B iccgamut
+.RB [options]\ profile
 .TP
 \fB\-v\fR
 Verbose
diff --git a/debian/man/icclu.1 b/debian/man/icclu.1
index 5a2c08f..5cccdde 100644
--- a/debian/man/icclu.1
+++ b/debian/man/icclu.1
@@ -1,39 +1,12 @@
 .\" 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"
+.TH TRANSLATE "1" "September 2014" "icclu" "User Commands"
 .SH NAME
 Translate \- Translate colors through an ICC profile.
 .SH DESCRIPTION
-Translate colors through an ICC profile, V2.17
-Author: Graeme W. Gill
-usage: icclu [\-v level] [\-f func] [\-i intent] [\-o order] profile
-.TP
-\fB\-v\fR level
-Verbosity level 0 \- 2 (default = 1)
-.TP
-\fB\-f\fR function
-f = forward, b = backwards, g = gamut, p = preview
-.TP
-\fB\-i\fR intent
-p = perceptual, r = relative colorimetric,
-s = saturation, a = absolute
-.TP
-\fB\-p\fR oride
-x = XYZ_PCS, l = Lab_PCS, y = Yxy,
-.TP
-\fB\-o\fR order
-n = normal (priority: lut > matrix > monochrome)
-r = reverse (priority: monochrome > matrix > lut)
-.TP
-\fB\-s\fR scale
-Scale device range 0.0 \- scale rather than 0.0 \- 1.0
-.IP
-The colors to be translated should be fed into standard input,
-one input color per line, white space separated.
-A line starting with a # will be ignored.
-A line not starting with a number will terminate the program.
-.PP
-Author: Graeme W. Gill
-usage: icclu [\-v level] [\-f func] [\-i intent] [\-o order] profile
+Translate colors through an ICC profile
+.SH SYNOPSIS
+.B icclu
+.RB [\-v\ level]\ [\-f\ func]\ [\-i\ intent]\ [\-o\ order]\ profile
 .TP
 \fB\-v\fR level
 Verbosity level 0 \- 2 (default = 1)
diff --git a/debian/man/illumread.1 b/debian/man/illumread.1
index 078ae66..aaec8c3 100644
--- a/debian/man/illumread.1
+++ b/debian/man/illumread.1
@@ -1,46 +1,12 @@
 .\" 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"
+.TH MEASURE "1" "September 2014" "illumread" "User Commands"
 .SH NAME
 Measure \- Measure an illuminant.
 .SH DESCRIPTION
-Measure an illuminant, Version 1.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: illumread [\-options] output.sp
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-S\fR
-Plot spectrum for each reading
-.TP
-\fB\-c\fR listno
-Choose instrument from the following list (default 1)
-.IP
-** No ports found **
-.TP
-\fB\-N\fR
-Disable initial calibration of instrument if possible
-.TP
-\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
-\fB\-D\fR [level]
-Print debug diagnostics to stderr
-.TP
-illuminant.sp
-File to save measurement to
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: illumread [\-options] output.sp
+Measure an illuminant
+.SH SYNOPSIS
+.B illumread
+.RB [\-options]\ output.sp
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/invprofcheck.1 b/debian/man/invprofcheck.1
index f61e35e..60d897b 100644
--- a/debian/man/invprofcheck.1
+++ b/debian/man/invprofcheck.1
@@ -1,50 +1,12 @@
 .\" 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"
+.TH CHECK "1" "September 2014" "invprofcheck" "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.6.3
-Author: Graeme W. Gill
-usage: invprofcheck [\-] profile.icm
-.TP
-\fB\-v\fR [level]
-verbosity level (default 1), 2 to print each DE
-.TP
-\fB\-l\fR limit
-set total ink limit (estimate by default)
-.TP
-\fB\-L\fR klimit
-set black channel ink limit (estimate by default)
-.TP
-\fB\-h\fR
-high res test (27)
-.TP
-\fB\-u\fR
-Ultra high res test (61)
-.TP
-\fB\-R\fR res
-Specific grid resolution
-.TP
-\fB\-c\fR
-Show CIE94 delta E values
-.TP
-\fB\-k\fR
-Show CIEDE2000 delta E values
-.TP
-\fB\-w\fR
-create VRML visualisation (profile.wrl)
-.TP
-\fB\-x\fR
-Use VRML axes
-.TP
-\fB\-e\fR
-Color vectors according to delta E
-.TP
-profile.icm
-Profile to check
-.PP
-Author: Graeme W. Gill
-usage: invprofcheck [\-] profile.icm
+Check fwd to bwd relative transfer of an ICC file
+.SH SYNOPSIS
+.B invprofcheck
+.RB [\-]\ profile.icm
 .TP
 \fB\-v\fR [level]
 verbosity level (default 1), 2 to print each DE
diff --git a/debian/man/kodak2ti3.1 b/debian/man/kodak2ti3.1
index 78db11d..45abd06 100644
--- a/debian/man/kodak2ti3.1
+++ b/debian/man/kodak2ti3.1
@@ -1,29 +1,12 @@
 .\" 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"
+.TH CONVERT "1" "September 2014" "kodak2ti3" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: kodak2ti3 [\-v] [\-l limit] infile outfile
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-l\fR limit
-set ink limit, 0 \- 400%
-.TP
-\fB\-r\fR filename
-Use an alternate 928 patch reference file
-.TP
-infile
-Base name for input.pat file
-.TP
-outfile
-Base name for output.ti3 file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: kodak2ti3 [\-v] [\-l limit] infile outfile
+Convert Kodak raw printer profile data to Argyll print data
+.SH SYNOPSIS
+.B kodak2ti3
+.RB [\-v]\ [\-l\ limit]\ infile\ outfile
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/mppcheck.1 b/debian/man/mppcheck.1
index 51cfdc7..1cd6b16 100644
--- a/debian/man/mppcheck.1
+++ b/debian/man/mppcheck.1
@@ -1,34 +1,12 @@
 .\" 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"
+.TH CHECK "1" "September 2014" "mppcheck" "User Commands"
 .SH NAME
 Check \- Check Model Printer Profile.
 .SH DESCRIPTION
-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
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-c\fR
-Show CIE94 delta E values
-.TP
-\fB\-k\fR
-Show CIEDE2000 delta E values
-.TP
-\fB\-s\fR
-Check spectral model too
-.TP
-\fB\-y\fR
-Detail each value
-.TP
-values.ti3
-Test values to check against
-.IP
-profile.mpp Profile to check
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: debian/tmp/usr/bin/mppcheck [\-v] [\-c] [\-s] [\-y] values.ti3 profile.mpp
+Check Model Printer Profile
+.SH SYNOPSIS
+.B mppcheck
+.RB [\-v]\ [\-c]\ [\-s]\ [\-y]\ values.ti3\ profile.mpp
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/mpplu.1 b/debian/man/mpplu.1
index 2f9fdcd..5651f26 100644
--- a/debian/man/mpplu.1
+++ b/debian/man/mpplu.1
@@ -1,62 +1,12 @@
 .\" 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"
+.TH TRANSLATE "1" "September 2014" "" "User Commands"
 .SH NAME
 Translate \- Translate colors through an MPP profile.
 .SH DESCRIPTION
-Translate colors through an MPP profile, V1.00
-Author: Graeme W. Gill
-usage: mpplu [\-v] [\-f func] [\-i intent] [\-o order] profile
-.TP
-\fB\-v\fR
-Verbose
-.TP
-\fB\-f\fR function
-f = forward, b = backwards
-.TP
-\fB\-p\fR oride
-x = XYZ_PCS, l = Lab_PCS, y = Yxy, s = spectral,
-.TP
-\fB\-l\fR limit
-override default ink limit, 1 \- N00%
-.TP
-\fB\-i\fR illum
-Choose illuminant for print/transparency spectral data:
-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\-u\fR
-Use Fluorescent Whitening Agent compensation
-.TP
-\fB\-g\fR
-Create gamut output
-.TP
-\fB\-w\fR
-Create gamut VRML as well
-.TP
-\fB\-n\fR
-Don't add VRML axes
-.TP
-\fB\-a\fR n
-Gamut transparency level
-.TP
-\fB\-d\fR n
-Gamut surface detail level
-.TP
-\fB\-t\fR num
-Invoke debugging test code "num" 1..n
-1 \- check partial derivative for device input
-2 \- create overlap diagnostic VRML gamut surface
-.IP
-The colors to be translated should be fed into stdin,
-one input color per line, white space separated.
-A line starting with a # will be ignored.
-A line not starting with a number will terminate the program.
-.PP
-Author: Graeme W. Gill
-usage: mpplu [\-v] [\-f func] [\-i intent] [\-o order] profile
+Translate colors through an MPP profile
+.SH SYNOPSIS
+.B mpplu
+.RB [\-v]\ [\-f\ func]\ [\-i\ intent]\ [\-o\ order]\ profile
 .TP
 \fB\-v\fR
 Verbose
diff --git a/debian/man/mppprof.1 b/debian/man/mppprof.1
index f0c129b..13a18ef 100644
--- a/debian/man/mppprof.1
+++ b/debian/man/mppprof.1
@@ -1,35 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "mppprof" "User Commands"
 .SH NAME
 Create \- Create Model Printer Profile.
 .SH DESCRIPTION
-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
-\fB\-v\fR [level] Verbose mode
-.HP
-\fB\-q\fR [lmhus] Quality \- Low, Medium (def), High, Ultra, Simple
-.TP
-\fB\-l\fR limit
-override default ink limit, 1 \- n00%
-.TP
-\fB\-s\fR
-Generate spectral model too
-.TP
-\fB\-m\fR
-Generate ink mixing model
-.HP
-\fB\-y\fR [level] Verify profile, 2 = read/write verify
-.TP
-\fB\-L\fR
-Output Lab values
-.TP
-outfile
-Base name for input.ti3/output.mpp file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: debian/tmp/usr/bin/mppprof [options] outfile
+Create Model Printer Profile
+.SH SYNOPSIS
+.B mppprof
+.RB [options]\ outfile
 .HP
 \fB\-v\fR [level] Verbose mode
 .HP
diff --git a/debian/man/oeminst.1 b/debian/man/oeminst.1
index 28de472..ea56505 100644
--- a/debian/man/oeminst.1
+++ b/debian/man/oeminst.1
@@ -1,33 +1,12 @@
 .\" 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"
+.TH INSTALL "1" "September 2014" "oeminst" "User Commands"
 .SH NAME
 Install \- List information about the FILEs.
 .SH DESCRIPTION
-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 [level]
-Verbose
-.TP
-\fB\-n\fR
-Don't install, show where files would be installed
-.TP
-\fB\-c\fR
-Don't install, save files to current directory
-.TP
-\fB\-S\fR d
-Specify the install scope u = user (def.), l = local system]
-.TP
-infile
-setup.exe CD install file(s) or .dll(s) containing install files
-.TP
-infile.[edr|ccss|ccmx]
-EDR file(s) to translate and install or CCSS or CCMX files to install
-If no file is provided, oeminst will look for the install CD.
-.PP
-Author: Graeme W. Gill, licensed under the GPL Version 2 or later
-usage: oeminst [\-options] [infile(s)]
+Install OEM data files
+.SH SYNOPSIS
+.B oeminst
+.RB [\-options]\ [infile(s)]
 .TP
 \fB\-v\fR [level]
 Verbose
diff --git a/debian/man/printcal.1 b/debian/man/printcal.1
index 5680462..38038d6 100644
--- a/debian/man/printcal.1
+++ b/debian/man/printcal.1
@@ -1,88 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "printcal" "User Commands"
 .SH NAME
 Create \- Create printer calibration.
 .SH DESCRIPTION
-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
-.PP
-usage: debian/tmp/usr/bin/printcal [\-options] [prevcal] inoutfile
-.TP
-\fB\-v\fR verbosity
-Verbose mode
-.TP
-\fB\-p\fR
-Plot graphs.
-.TP
-\fB\-i\fR
-Initial calibration, set targets, create .cal
-.TP
-\fB\-r\fR
-Re\-calibrate against previous .cal and create new .cal
-.TP
-\fB\-e\fR
-Verify against previous .cal
-.TP
-\fB\-I\fR
-Create imitation target from .ti3 and null calibration
-.TP
-\fB\-d\fR
-Go through the motions but don't write any files
-.TP
-\fB\-s\fR smoothing
-Extra curve smoothing (default 1.0)
-.HP
-\fB\-A\fR manufacturer Set the manufacturer description string
-.TP
-\fB\-M\fR model
-Set the model description string
-.TP
-\fB\-D\fR description
-Set the profile Description string
-.TP
-\fB\-C\fR copyright
-Set the copyright string
-.TP
-\fB\-x\fR# percent
-Set initial maximum device % target (override auto)
-.TP
-\fB\-m\fR# percent
-Set initial dev target to % of auto maximum
-.TP
-\fB\-n\fR# deltaE
-Set initial white minimum deltaE target
-.TP
-\fB\-t\fR# percent
-Set initial 50% transfer curve percentage target
-.TP
-# = c, r, 0
-First channel
-.TP
-m, g, 1
-Second channel
-.TP
-y, b, 2
-Third channel
-.TP
-k,
-3   Fourth channel, etc.
-.TP
-\fB\-a\fR
-Create an Adobe Photoshop .AMP file as well as a .cal
-.TP
-prevcal
-Base name of previous .cal file for recal or verify.
-.TP
-inoutname
-Base name of input .ti3 file, output .cal file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Too few arguments, got 1 expect at least 2
-.PP
-usage: debian/tmp/usr/bin/printcal [\-options] [prevcal] inoutfile
+Create printer calibration
+.SH SYNOPSIS
+.B printcal
+.RB [\-options]\ [prevcal]\ inoutfile
 .TP
 \fB\-v\fR verbosity
 Verbose mode
diff --git a/debian/man/printtarg.1 b/debian/man/printtarg.1
index f8e21d9..59ad2ba 100644
--- a/debian/man/printtarg.1
+++ b/debian/man/printtarg.1
@@ -1,136 +1,12 @@
 .\" 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"
+.TH GENERATE "1" "September 2014" "printarg" "User Commands"
 .SH NAME
 Generate \- Generate Target PostScrip file.
 .SH DESCRIPTION
-Generate Target PostScrip file, Version 1.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Unknown flag
-.PP
-usage: printtarg [\-v] [\-i instr] [\-r] [\-s] [\-p size] basename
-.TP
-\fB\-v\fR
-Verbose mode
-.HP
-\fB\-i\fR 20 | 22 | 41 | 51 | SS | i1 | CM Select target instrument (default DTP41)
-.IP
-20 = DTP20, 22 = DTP22, 41 = DTP41, 51 = DTP51,
-SS = SpectroScan, i1 = i1Pro, CM = ColorMunki
-.TP
-\fB\-h\fR
-Use hexagon patches for SS, double density for CM
-.TP
-\fB\-a\fR scale
-Scale patch size and spacers by factor (e.g. 0.857 or 1.5 etc.)
-.TP
-\fB\-A\fR scale
-Scale spacers by additional factor (e.g. 0.857 or 1.5 etc.)
-.TP
-\fB\-r\fR
-Don't randomize patch location
-.TP
-\fB\-s\fR
-Create a scan image recognition (.cht) file
-.TP
-\fB\-S\fR
-Same as \fB\-s\fR, but don't generate wide orientation strip.
-.TP
-\fB\-c\fR
-Force colored spacers
-.TP
-\fB\-b\fR
-Force B&W spacers
-.TP
-\fB\-n\fR
-Force no spacers
-.TP
-\fB\-f\fR
-Create PostScript DeviceN Color fallback
-.TP
-\fB\-w\fR g|r|s|n
-White colorspace encoding DeviceGray (def), DeviceRGB, Separation or DeviceN
-.TP
-\fB\-k\fR g|c|s|n
-Black colorspace encoding DeviceGray (def), DeviceCMYK, Separation or DeviceN
-.TP
-\fB\-o\fR k|r|n
-CMY colorspace encoding DefiveCMYK (def), inverted DeviceRGB or DeviceN
-.TP
-\fB\-e\fR
-Output EPS compatible file
-.TP
-\fB\-t\fR [res]
-Output 8 bit TIFF raster file, optional res DPI (default 100)
-.TP
-\fB\-T\fR [res]
-Output 16 bit TIFF raster file, optional res DPI (default 100)
-.TP
-\fB\-C\fR
-Don't use TIFF compression
-.TP
-\fB\-N\fR
-Use TIFF alpha N channels more than 4
-.TP
-\fB\-D\fR
-Dither 8 bit TIFF values down from 16 bit
-.TP
-\fB\-Q\fR nbits
-Quantize test values to fit in nbits
-.TP
-\fB\-R\fR rsnum
-Use given random start number
-.TP
-\fB\-K\fR file.cal
-Apply printer calibration to patch values and include in .ti2
-.TP
-\fB\-I\fR file.cal
-Include calibration in .ti2 (but don't apply it)
-.TP
-\fB\-x\fR pattern
-Use given strip indexing pattern (Default = "A\-Z, A\-Z")
-.TP
-\fB\-y\fR pattern
-Use given patch indexing pattern (Default = "0\-9,@\-9,@\-9;1\-999")
-.TP
-\fB\-m\fR margin
-Set a page margin in mm (default 6.0 mm)
-.TP
-\fB\-M\fR margin
-Set a page margin in mm and include it in TIFF
-.TP
-\fB\-P\fR
-Don't limit strip length
-.TP
-\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]
-A4R      [297.0 x 210.0 mm]
-A3       [297.0 x 420.0 mm] (default)
-A2       [420.0 x 594.0 mm]
-Letter   [215.9 x 279.4 mm]
-LetterR  [279.4 x 215.9 mm]
-Legal    [215.9 x 355.6 mm]
-4x6      [101.6 x 152.4 mm]
-11x17    [279.4 x 431.8 mm]
-.TP
-\fB\-p\fR WWWxHHH
-Custom size, WWW mm wide by HHH mm high
-.TP
-basname
-Base name for input(.ti1), output(.ti2) and output(.ps/.eps/.tif)
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.IP
-Diagnostic: Unknown flag
-.PP
-usage: printtarg [\-v] [\-i instr] [\-r] [\-s] [\-p size] basename
+Generate Target PostScrip file
+.SH SYNOPSIS
+.B printtarg
+.RB [\-v]\ [\-i\ instr]\ [\-r]\ [\-s]\ [\-p\ size]\ basename
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/profcheck.1 b/debian/man/profcheck.1
index d290f68..683786a 100644
--- a/debian/man/profcheck.1
+++ b/debian/man/profcheck.1
@@ -1,66 +1,12 @@
 .\" 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"
+.TH CHECK "1" "September 2014" "profcheck" "User Commands"
 .SH NAME
 Check \- Check accuracy of ICC profile.
 .SH DESCRIPTION
 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
-\fB\-v\fR [level]
-Verbosity level (default 1), 2 to print each DE
-.TP
-\fB\-c\fR
-Show CIE94 delta E values
-.TP
-\fB\-k\fR
-Show CIEDE2000 delta E values
-.TP
-\fB\-w\fR
-create VRML visualisation (iccprofile.wrl)
-.TP
-\fB\-x\fR
-Use VRML axes
-.TP
-\fB\-m\fR
-Make VRML lines a minimum of 0.5
-.TP
-\fB\-e\fR
-Color vectors according to delta E
-.HP
-\fB\-d\fR devval1,deval2,devvalN
-.IP
-Specify a device value to sort against
-.TP
-\fB\-p\fR
-Sort device value by PCS (Lab) target
-.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:
-.IP
-1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
-.TP
-\fB\-I\fR intent
-r = relative colorimetric, a = absolute (default)
-.TP
-data.ti3
-Test data file
-.TP
-iccprofile.icm
-Profile to check against
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: profcheck [\-options] data.ti3 iccprofile.icm
+.SH SYNOPSIS
+.B profcheck
+.RB [\-options]\ data.ti3\ iccprofile.icm
 .TP
 \fB\-v\fR [level]
 Verbosity level (default 1), 2 to print each DE
diff --git a/debian/man/refine.1 b/debian/man/refine.1
index 18845db..8c05df5 100644
--- a/debian/man/refine.1
+++ b/debian/man/refine.1
@@ -1,64 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "refine" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Too few arguments
-usage: refine [\-options] cietarget ciecurrent [outdevicc] [inabs] outabs
-.TP
-\fB\-v\fR
-Verbose
-.TP
-\fB\-c\fR
-Create initial abstract correction profile
-.TP
-\fB\-g\fR
-Don't impose output device gamut limit
-.TP
-\fB\-r\fR res
-Set abstract profile clut resolution (default 33)
-.TP
-\fB\-d\fR factor
-Override default damping factor (default 0.950000, then 0.700000)
-.TP
-\fB\-R\fR
-Aim for white point relative match rather than absolute
-.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:
-.IP
-1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
-.TP
-cietarget
-Target CIE or spectral values, CGATS file (e.g. .ti3)
-.TP
-ciecurrent
-Actual CIE or spectral values, CGATS file (e.g. .ti3)
-.TP
-[outdevicc]
-Output device ICC profile to set gamut limit (not used if \fB\-g\fR)
-.TP
-[inabs]
-Previous abstract correction ICC profile (not used if \fB\-c\fR)
-.TP
-outabs
-Created/refined abstract correction ICC profile
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-Diagnostic: Too few arguments
-usage: refine [\-options] cietarget ciecurrent [outdevicc] [inabs] outabs
+.SH SYNOPSIS
+.B refine
+.RB [\-options]\ cietarget\ ciecurrent\ [outdevicc]\ [inabs]\ outabs
 .TP
 \fB\-v\fR
 Verbose
diff --git a/debian/man/revfix.1 b/debian/man/revfix.1
index e741657..b6cc94c 100644
--- a/debian/man/revfix.1
+++ b/debian/man/revfix.1
@@ -1,54 +1,12 @@
 .\" 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"
+.TH INVERT "1" "September 2014" "revfix" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: revfix [\-options] iccin iccout
-.TP
-\fB\-v\fR
-Verbose
-.TP
-\fB\-0\fR
-Process perceptual
-.TP
-\fB\-1\fR
-Process absolute/relative colorimetric
-.TP
-\fB\-2\fR
-Process saturation
-.TP
-\fB\-r\fR res
-Override BtoA1 Clut res
-.TP
-\fB\-k\fR [ezhxr]
-e = same K as existing BtoA table (def)
-z = zero, h = 0.5 K, x = max K, r = ramp K
-.HP
-\fB\-k\fR p stle stpo enle enpo shape
-.IP
-p = curve parameters
-stle: K level at White 0.0 \- 1.0
-stpo: start point of transition Wh 0.0 \- Bk 1.0
-enpo: End point of transition Wh 0.0 \- Bk 1.0
-enle: K level at Black 0.0 \- 1.0
-shape: 1.0 = straight, 0.0\-1.0 concave, 1.0\-2.0 convex
-.TP
-\fB\-K\fR parameters
-Same as \fB\-k\fR, but target is K locus rather than K value itself
-.TP
-\fB\-l\fR tlimit
-set total ink limit, 0 \- 400% (estimate by default)
-.TP
-\fB\-L\fR klimit
-set black ink limit, 0 \- 100% (estimate by default)
-.TP
-\fB\-p\fR absprof
-Include abstract profile in output tables
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: revfix [\-options] iccin iccout
+.SH SYNOPSIS
+.B revfix
+.RB [\-options]\ iccin\ iccout
 .TP
 \fB\-v\fR
 Verbose
diff --git a/debian/man/scanin.1 b/debian/man/scanin.1
index 663c69b..43c1026 100644
--- a/debian/man/scanin.1
+++ b/debian/man/scanin.1
@@ -1,133 +1,32 @@
 .\" 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"
+.TH SCANIN, "1" "September 2014" "scanin" "User Commands"
 .SH NAME
 Scanin, \- Scanin.
 .SH DESCRIPTION
 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]
-.IP
-:\- inputs 'input.tif' and outputs scanner 'input.ti3', or
-.PP
-usage: scanin \fB\-g\fR [options] input.tif recogout.cht [diag.tif]
-.IP
-:\- outputs file 'recogout.cht', or
-.PP
-usage: scanin \fB\-o\fR [options] input.tif recogin.cht [diag.tif]
-.IP
-:\- outputs file 'input.val', or
-.PP
-usage: scanin \fB\-c\fR [options] input.tif recogin.cht scanprofile.[icc|mpp] pbase [diag.tif]
-.IP
-:\- inputs pbase.ti2 and outputs printer pbase.ti3, or
-.PP
-usage: scanin \fB\-r\fR [options] input.tif recogin.cht pbase [diag.tif]
-.IP
-:\- inputs pbase.ti2+.ti3 and outputs pbase.ti3
-.TP
-\fB\-g\fR
-Generate a chart reference (.cht) file
-.TP
-\fB\-o\fR
-Output patch values in .val file
-.TP
-\fB\-c\fR
-Use image to measure color to convert printer pbase .ti2 to .ti3
-.TP
-\fB\-ca\fR
-Same as \fB\-c\fR, but accumulates more values to pbase .ti3
-from subsequent pages
-.TP
-\fB\-r\fR
-Replace device values in pbase .ti2/.ti3
-Default is to create a scanner .ti3 file
-.TP
-\fB\-F\fR x1,y1,x2,y2,x3,y3,x4,y4
-Don't auto recognize, locate using four fiducual marks
-.TP
-\fB\-p\fR
-Compensate for perspective distortion
-.TP
-\fB\-a\fR
-Recognise chart in normal orientation only (\fB\-A\fR fallback as is)
-Default is to recognise all possible chart angles
-.TP
-\fB\-m\fR
-Return true mean (default is robust mean)
-.TP
-\fB\-G\fR gamma
-Approximate gamma encoding of image
-.TP
-\fB\-v\fR [n]
-Verbosity level 0\-9
-.TP
-\fB\-d\fR [ihvglLIcrsonap]
-Generate diagnostic output (try \fB\-dipn\fR)
-.TP
-i
-diag \- B&W of input image
-.TP
-h
-diag \- Horizontal edge/tick detection
-.TP
-v
-diag \- Vertical edge/tick detection
-.TP
-g
-diag \- Groups detected
-.TP
-l
-diag \- Lines detected
-.TP
-L
-diag \- All lines detected
-.TP
-I
-diag \- lines used to improve fit
-.TP
-c
-diag \- lines perspective corrected
-.TP
-r
-diag \- lines rotated
-.TP
-s
-diag \- diagnostic sample boxes rotated
-.TP
-o
-diag \- sample box outlines
-.TP
-n
-diag \- sample box names
-.TP
-a
-diag \- sample box areas
-.TP
-p
-diag \- pixel areas sampled
-.HP
-\fB\-O\fR outputfile Override the default output filename & extension.
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-.PP
-usage: scanin [options] input.tif recogin.cht valin.cie [diag.tif]
+.SH SYNOPSIS
+.B scanin
+.RB [options]\ input.tif\ recogin.cht\ valin.cie\ [diag.tif]
 .IP
 :\- inputs 'input.tif' and outputs scanner 'input.ti3', or
 .PP
-usage: scanin \fB\-g\fR [options] input.tif recogout.cht [diag.tif]
+.B scanin
+.RB \fB\-g\fR [options]\ input.tif\ recogout.cht\ [diag.tif]
 .IP
 :\- outputs file 'recogout.cht', or
 .PP
-usage: scanin \fB\-o\fR [options] input.tif recogin.cht [diag.tif]
+.B scanin
+.RB \fB\-o\fR [options]\ input.tif\ recogin.cht\ [diag.tif]
 .IP
 :\- outputs file 'input.val', or
 .PP
-usage: scanin \fB\-c\fR [options] input.tif recogin.cht scanprofile.[icc|mpp] pbase [diag.tif]
+.B scanin
+.RB \fB\-c\fR [options]\ input.tif\ recogin.cht\  scanprofile.[icc|mpp]\ pbase\ [diag.tif]
 .IP
 :\- inputs pbase.ti2 and outputs printer pbase.ti3, or
 .PP
-usage: scanin \fB\-r\fR [options] input.tif recogin.cht pbase [diag.tif]
+.B scanin
+.RB \fB\-r\fR [options]\ input.tif\ recogin.cht\ pbase\ [diag.tif]
 .IP
 :\- inputs pbase.ti2+.ti3 and outputs pbase.ti3
 .TP
diff --git a/debian/man/spec2cie.1 b/debian/man/spec2cie.1
index 9bd7068..79f23b7 100644
--- a/debian/man/spec2cie.1
+++ b/debian/man/spec2cie.1
@@ -1,5 +1,5 @@
 .\" 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"
+.TH CONVERT "1" "September 2014" "spec2cie" "User Commands"
 .SH NAME
 Convert \- Convert spectral .ti3 file.
 .SH SYNOPSIS
@@ -7,46 +7,9 @@ Convert \- Convert spectral .ti3 file.
 [\fIoptions\fR] \fIinput.ti3 output.ti3\fR
 .SH DESCRIPTION
 Convert spectral .ti3 file, Version 1.6.3
-Author: Gerhard Fuernkranz, licensed under the AGPL Version 3
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-I\fR illum
-Override actual instrument illuminant in .ti3 file:
-.IP
-A, C, D50, D50M2, D65, F5, F8, F10 or file.sp
-(only used in conjunction with \fB\-f\fR)
-.TP
-\fB\-f\fR [illum]
-Use Fluorescent Whitening Agent compensation [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:
-A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp
-.TP
-\fB\-o\fR observ
-Choose CIE Observer for spectral data:
-.IP
-1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
-.TP
-\fB\-n\fR
-Don't output spectral values
-.TP
-\fB\-p\fR
-Plot each values spectrum
-.TP
-input.ti3
-Measurement file
-.TP
-output.ti3
-Converted measurement file
-.PP
-Author: Gerhard Fuernkranz, licensed under the AGPL Version 3
-.PP
-Usage: spec2cie [options] input.ti3 output.ti3
+.SH SYNOPSIS
+.B spec2cie
+.RB [options]\ input.ti3\ output.ti3
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/specplot.1 b/debian/man/specplot.1
index b794adc..d4426f3 100644
--- a/debian/man/specplot.1
+++ b/debian/man/specplot.1
@@ -1,33 +1,12 @@
 .\" 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"
+.TH PLOT "1" "September 2014" "specplot" "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: specplot [infile.sp]
-.TP
-\fB\-v\fR
-verbose
-.TP
-\fB\-c\fR
-combine multiple files into one plot
-.TP
-\fB\-z\fR
-don't make range cover zero
-.TP
-\fB\-u\fR level
-plot effect of adding estimated UV level
-.TP
-\fB\-U\fR
-plot effect of adding range of estimated UV level
-.TP
-[infile.sp ...]
-spectrum files to plot
-default is all built in illuminants
-.PP
-Author: Graeme W. Gill
-usage: specplot [infile.sp]
+.SH SYNOPSIS
+.B specplot
+.RB [infile.sp]
 .TP
 \fB\-v\fR
 verbose
diff --git a/debian/man/splitti3.1 b/debian/man/splitti3.1
index f08b866..4be8b4e 100644
--- a/debian/man/splitti3.1
+++ b/debian/man/splitti3.1
@@ -1,38 +1,12 @@
 .\" 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"
+.TH SPLIT "1" "September 2014" "splitcgats" "User Commands"
 .SH NAME
 Split \- Split a .ti3 into two.
 .SH DESCRIPTION
 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
-\fB\-v\fR
-Verbose \- print each patch value
-.TP
-\fB\-n\fR no
-Put no sets in first file, and balance in second file.
-.TP
-\fB\-p\fR percent
-Put percent% sets in first file, and balance in second file. (def. 50%)
-.TP
-\fB\-w\fR
-Put white patches in both files.
-.TP
-\fB\-r\fR seed
-Use given random seed.
-.TP
-input.ti3
-File to be split up.
-.TP
-output1.ti3
-First output file
-.TP
-output2.ti3
-Second output file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: splitcgats [\-options] input.ti3 output1.ti3 output2.ti3
+.SH SYNOPSIS
+.B splitcgats
+.RB [\-options]\ input.ti3\ output1.ti3\ output2.ti3
 .TP
 \fB\-v\fR
 Verbose \- print each patch value
diff --git a/debian/man/spotread.1 b/debian/man/spotread.1
index fea84c6..050f708 100644
--- a/debian/man/spotread.1
+++ b/debian/man/spotread.1
@@ -1,130 +1,12 @@
 .\" 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"
+.TH MEASURE "1" "September 2014" "spotread" "User Commands"
 .SH NAME
 Measure \- Read Print Spot values.
 .SH DESCRIPTION
 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]
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-s\fR
-Print spectrum for each reading
-.TP
-\fB\-S\fR
-Plot spectrum for each reading
-.TP
-\fB\-c\fR listno
-Set communication port from the following list (default 1)
-.IP
-** No ports found **
-.TP
-\fB\-t\fR
-Use transmission measurement mode
-.TP
-\fB\-e\fR
-Use emissive measurement mode (absolute results)
-.TP
-\fB\-eb\fR
-Use display white brightness relative measurement mode
-.TP
-\fB\-ew\fR
-Use display white point relative chromatically adjusted mode
-.TP
-\fB\-p\fR
-Use telephoto measurement mode (absolute results)
-.TP
-\fB\-pb\fR
-Use projector white brightness relative measurement mode
-.TP
-\fB\-pw\fR
-Use projector white point relative chromatically adjusted mode
-.TP
-\fB\-a\fR
-Use ambient measurement mode (absolute results)
-.TP
-\fB\-f\fR
-Use ambient flash measurement mode (absolute results)
-.TP
-\fB\-I\fR illum
-Set simulated instrument illumination using FWA (def \fB\-i\fR illum):
-M0, M1, M2, A, C, D50, D50M2, D65, F5, F8, F10 or file.sp]
-.TP
-\fB\-i\fR illum
-Choose illuminant for computation of CIE XYZ from spectral data & FWA:
-A, C, D50 (def.), D50M2, D65, F5, F8, F10 or file.sp
-.TP
-\fB\-Q\fR observ
-Choose CIE Observer for spectral data or CCSS instrument:
-1931_2 (def), 1964_10, S&B 1955_2, shaw, J&V 1978_2
-(Choose FWA during operation)
-.TP
-\fB\-F\fR filter
-Set filter configuration (if aplicable):
-.TP
-n
-None
-.TP
-p
-Polarising filter
-.TP
-6
-D65
-.TP
-u
-U.V. Cut
-.TP
-\fB\-E\fR extrafilterfile
-Apply extra filter compensation file
-.TP
-\fB\-x\fR
-Display Yxy instead of Lab
-.TP
-\fB\-h\fR
-Display LCh instead of Lab
-.TP
-\fB\-V\fR
-Show running average and std. devation from ref.
-.TP
-\fB\-T\fR
-Display correlated color temperatures and CRI
-.TP
-\fB\-N\fR
-Disable auto calibration of instrument
-.TP
-\fB\-H\fR
-Start in high resolution spectrum mode (if available)
-.TP
-\fB\-X\fR file.ccmx
-Apply Colorimeter Correction Matrix
-.TP
-\fB\-X\fR file.ccss
-Use Colorimeter Calibration Spectral Samples for calibration
-.TP
-\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
-\fB\-W\fR n|h|x
-Override serial port flow control: n = none, h = HW, x = Xon/Xoff
-.TP
-\fB\-D\fR [level]
-Print debug diagnostics to stderr
-.TP
-logfile
-Optional file to save reading results as text
-.PP
-Author: Graeme W. Gill, licensed under the GPL Version 2 or later
-Diagnostic: Flag \fB\-\-\fR not recognised
-usage: spotread [\-options] [logfile]
+.SH SYNOPSIS
+.B spotread
+.RB [\-options]\ [logfile]
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/synthcal.1 b/debian/man/synthcal.1
index d63ef55..5fce9da 100644
--- a/debian/man/synthcal.1
+++ b/debian/man/synthcal.1
@@ -1,52 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "synthcal" "User Commands"
 .SH NAME
 Create \- Create a synthetic calibration file.
 .SH DESCRIPTION
 Create a synthetic calibration file, Version 1.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: synthcal [\-options] outfile
-.TP
-\fB\-t\fR N
-i = input, o = output, d = display (default)
-.TP
-\fB\-d\fR col_comb
-choose colorant combination from the following (default 3):
-0: Print grey
-1: Video grey
-2: Print RGB
-3: Video RGB
-4: CMYK
-5: CMY
-6: CMYK + Light CM
-7: CMYK + Light CMK
-8: CMYK + Red + Blue
-9: CMYK + Orange + Green
-10: CMYK + Light CMK + Light Light K
-11: CMYK + Orange + Green + Light CM
-12: CMYK + Light CM + Medium CM
-.TP
-\fB\-D\fR colorant
-Add or delete colorant from combination:
-(Use \-?? to list known colorants)
-.TP
-\fB\-o\fR o1,o2,o3,
-Set non\-linear curve offset (default 0.0)
-.TP
-\fB\-s\fR s1,s2,s3,
-Set non\-linear curve scale (default 1.0)
-.TP
-\fB\-p\fR p1,p2,p3,
-Set non\-linear curve powers (default 1.0)
-.TP
-\fB\-E\fR description
-Set the profile dEscription string
-.TP
-outfile
-Base name for output .cal file
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: synthcal [\-options] outfile
+.SH SYNOPSIS
+.B synthcal
+.RB [\-options]\ outfile
 .TP
 \fB\-t\fR N
 i = input, o = output, d = display (default)
diff --git a/debian/man/synthread.1 b/debian/man/synthread.1
index 444071e..9a52806 100644
--- a/debian/man/synthread.1
+++ b/debian/man/synthread.1
@@ -1,52 +1,12 @@
 .\" 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"
+.TH SYNTHETIC "1" "September 2014" "synthread" "User Commands"
 .SH NAME
 Synthetic \- Synthetic device model test chart reader.
 .SH DESCRIPTION
 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
-.TP
-\fB\-v\fR
-Verbose mode
-.TP
-\fB\-p\fR
-Use separation profile
-.TP
-\fB\-l\fR
-Construct and output in Lab rather than XYZ
-.TP
-\fB\-i\fR p1,p2,p3,
-Set input channel curve powers (default 1.0)
-.TP
-\fB\-k\fR x1:y1,x2:y2,x3:y2
-Set input channel inflection points (default 0.5,0.5)
-.TP
-\fB\-o\fR p1,p2,p3,
-Set output channel curve powers (default 1.0)
-.TP
-\fB\-r\fR level
-Add average random deviation of <level>% to input device values (after sep.)
-.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\-b\fR L,a,b
-Scale black point to target Lab value
-.TP
-[separation.icm]
-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
-Error 'Unrecognised flag'
-usage: synthread [\-v] [\-s] [separation.icm] profile.[icc|mpp|ti3] outfile
+.SH SYNOPSIS
+.B synthread
+.RB [\-v]\ [\-s]\ [separation.icm]\ profile.[icc|mpp|ti3]\ outfile
 .TP
 \fB\-v\fR
 Verbose mode
diff --git a/debian/man/targen.1 b/debian/man/targen.1
index 89e5b95..6ad7229 100644
--- a/debian/man/targen.1
+++ b/debian/man/targen.1
@@ -1,121 +1,12 @@
 .\" 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"
+.TH GENERATE "1" "September 2014" "targen" "User Commands"
 .SH NAME
 Generate \- Generate Target deviceb test chart color values.
 .SH DESCRIPTION
 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
-Diagnostic: Usage requested
-.TP
-\fB\-v\fR [level]
-Verbose mode [optional level 1..N]
-.TP
-\fB\-d\fR col_comb
-choose colorant combination from the following:
-0: Print grey
-1: Video grey
-2: Print RGB
-3: Video RGB
-4: CMYK
-5: CMY
-6: CMYK + Light CM
-7: CMYK + Light CMK
-8: CMYK + Red + Blue
-9: CMYK + Orange + Green
-10: CMYK + Light CMK + Light Light K
-11: CMYK + Orange + Green + Light CM
-12: CMYK + Light CM + Medium CM
-.TP
-\fB\-D\fR colorant
-Add or delete colorant from combination:
-(Use \-?? to list known colorants)
-.TP
-\fB\-G\fR
-Generate good optimized points rather than Fast
-.TP
-\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
-\fB\-g\fR steps
-Grey axis RGB or CMY steps (default 0)
-.TP
-\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)
-.TP
-\fB\-t\fR
-Use incremental far point for full spread
-.TP
-\fB\-r\fR
-Use device space random for full spread
-.TP
-\fB\-R\fR
-Use perceptual space random for full spread
-.TP
-\fB\-q\fR
-Use device space\-filling quasi\-random for full spread
-.TP
-\fB\-Q\fR
-Use perceptual space\-filling quasi\-random for full spread
-.TP
-\fB\-i\fR
-Use device space body centered cubic grid for full spread
-.TP
-\fB\-I\fR
-Use perceptual space body centered cubic grid for full spread
-.TP
-\fB\-a\fR angle
-Simplex grid angle 0.0 \- 0.5 for B.C.C. grid, default 0.333300
-.TP
-\fB\-A\fR adaptation
-Degree of adaptation of OFPS 0.0 \- 1.0 (default 0.1, \fB\-c\fR profile used 1.0)
-.TP
-\fB\-l\fR ilimit
-Total ink limit in % (default = none)
-.TP
-\fB\-p\fR power
-Optional power\-like value applied to all device values.
-.TP
-\fB\-c\fR profile
-Optional device ICC or MPP pre\-conditioning profile filename
-(Use "none" to turn off any conditioning)
-.TP
-\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
-\fB\-w\fR
-Dump diagnostic outfilel.wrl file (Lab locations)
-.TP
-\fB\-W\fR
-Dump diagnostic outfiled.wrl file (Device locations)
-.TP
-outfile
-Base name for output(.ti1)
-.PP
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: targen [options] outfile
-.IP
-Diagnostic: Usage requested
+.SH SYNOPSIS
+.B targen
+.RB [options]\ outfile
 .TP
 \fB\-v\fR [level]
 Verbose mode [optional level 1..N]
diff --git a/debian/man/tiffgamut.1 b/debian/man/tiffgamut.1
index 23713fe..760c72f 100644
--- a/debian/man/tiffgamut.1
+++ b/debian/man/tiffgamut.1
@@ -1,95 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "tiffgamut" "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.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
-\fB\-v\fR
-Verbose
-.TP
-\fB\-d\fR sres
-Surface resolution details 1.0 \- 50.0
-.TP
-\fB\-w\fR
-emit VRML .wrl file as well as CGATS .gam file
-.TP
-\fB\-n\fR
-Don't add VRML axes or white/black point
-.TP
-\fB\-k\fR
-Add markers for prim. & sec. "cusp" points
-.TP
-\fB\-f\fR perc
-Filter by popularity, perc = percent to use
-.TP
-\fB\-i\fR intent
-p = perceptual, r = relative colorimetric,
-s = saturation, a = absolute (default), d = profile default
-.TP
-\fB\-p\fR oride
-l = Lab_PCS (default), j = CIECAM02 Appearance Jab
-.TP
-\fB\-o\fR order
-n = normal (priority: lut > matrix > monochrome)
-r = reverse (priority: monochrome > matrix > lut)
-.TP
-\fB\-c\fR viewcond
-set appearance mode and viewing conditions for CIECAM02,
-either an enumerated choice, or a parameter:value changes
-.IP
-pp \- Practical Reflection Print (ISO\-3664 P2)
-pe \- Print evaluation environment (CIE 116\-1995)
-pc \- Critical print evaluation environment (ISO\-3664 P1)
-mt \- Monitor in typical work environment
-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
-ob \- Original scene \- Bright Outdoors
-cx \- Cut Sheet Transparencies on a viewing box
-.TP
-s:surround
-n = auto, a = average, m = dim, d = dark,
-c = transparency (default average)
-.TP
-w:X:Y:Z
-Adapted white point as XYZ (default media white)
-.TP
-w:x:y
-Adapted white point as x, y
-.TP
-a:adaptation
-Adaptation luminance in cd.m^2 (default 50.0)
-.TP
-b:background
-Background % of image luminance (default 20)
-.TP
-l:imagewhite
-Image white in cd.m^2 if surround = auto (default 250)
-.TP
-f:flare
-Flare light % of image luminance (default 0)
-.TP
-g:glare
-Flare light % of ambient (default 1)
-.TP
-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.
-.PP
-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 ...]
+.SH SYNOPSIS
+.B tiffgamut
+.RB [\-v\ level]\ [profile.icm\ |\ embedded.tif/jpg]\ infile1.tif/jpg\ [infile2.tif/jpg\ ...]
 .TP
 \fB\-v\fR
 Verbose
diff --git a/debian/man/timage.1 b/debian/man/timage.1
index 7a30c33..2ac441a 100644
--- a/debian/man/timage.1
+++ b/debian/man/timage.1
@@ -1,38 +1,12 @@
 .\" 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"
+.TH CREATE "1" "September 2014" "timage" "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
+.SH SYNOPSIS
+.B timage
+.RB [\-options]\ outfile.tif
 .TP
 \fB\-t\fR
 Generate rectangular gamut boundary test chart
diff --git a/debian/man/txt2ti3.1 b/debian/man/txt2ti3.1
index 07d22b7..f0c44c4 100644
--- a/debian/man/txt2ti3.1
+++ b/debian/man/txt2ti3.1
@@ -1,40 +1,12 @@
 .\" 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"
+.TH CONVERT "1" "September 2014" "txt2ti3" "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.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-error: Unknown flag
-usage: txt2ti3 [\-v] [\-l limit] [devfile] infile [specfile] outbase
-.TP
-\fB\-2\fR
-Create dummy .ti2 file as well
-.TP
-\fB\-l\fR limit
-set ink limit, 0 \- 400% (default max in file)
-.TP
-\fB\-d\fR
-Set type of device as Display, not Output
-.TP
-\fB\-i\fR
-Set type of device as Input, not Output
-.TP
-[devfile]
-Input Device CMYK target file (typically file.txt)
-.TP
-infile
-Input CIE, Spectral or Device & Spectral file (typically file.txt)
-.TP
-[specfile]
-Input Spectral file (typically file.txt)
-.TP
-outbasename
-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] outbase
+.SH SYNOPSIS
+.B txt2ti3
+.RB [\-v]\ [\-l\ limit]\ [devfile]\ infile\ [specfile]\ outbase
 .TP
 \fB\-2\fR
 Create dummy .ti2 file as well
diff --git a/debian/man/viewgam.1 b/debian/man/viewgam.1
index ea27eca..83afd63 100644
--- a/debian/man/viewgam.1
+++ b/debian/man/viewgam.1
@@ -1,49 +1,12 @@
 .\" 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"
+.TH VIEW "1" "September 2014" "viewgam" "User Commands"
 .SH NAME
 View \- View gamuts.
 .SH DESCRIPTION
 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
-.TP
-\fB\-c\fR color
-Color to make gamut, r = red, g = green, b = blue
-c = cyan, m = magenta, y = yellow, e = grey, w = white
-n = natural color
-.TP
-\fB\-t\fR trans
-Set transparency from 0.0 (opaque) to 1.0 (invisible)
-.TP
-\fB\-w\fR
-Show as a wireframe
-.TP
-\fB\-s\fR
-Show as a solid surace
-.TP
-infile.gam
-Name of .gam file
-Repeat above for each input file
-.TP
-\fB\-n\fR
-Don't add Lab axes
-.TP
-\fB\-k\fR
-Add markers for prim. & sec. "cusp" points
-.TP
-\fB\-i\fR
-Compute and print intersecting volume of first 2 gamuts
-.TP
-\fB\-I\fR isect.gam
-Same as \fB\-i\fR, but save intersection gamut to isect.gam
-.TP
-outfile.wrl
-Name of output .wrl file
-.PP
-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
+.SH SYNOPSIS
+.B viewgam
+.RB { [\-c\ color]\ [\-t\ trans]\ [\-w|s]\ infile.gam }\ ...\ outfile.wrl
 .TP
 \fB\-c\fR color
 Color to make gamut, r = red, g = green, b = blue
diff --git a/debian/man/xicclu.1 b/debian/man/xicclu.1
index 98fdeff..b5aa7e9 100644
--- a/debian/man/xicclu.1
+++ b/debian/man/xicclu.1
@@ -1,169 +1,12 @@
 .\" 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"
+.TH LOOKUP "1" "September 2014" "xicclu" "User Commands"
 .SH NAME
 Lookup \- Translate colors through an xicc.
 .SH DESCRIPTION
 Lookup ICC or CAL colors, Version 1.6.3
-Author: Graeme W. Gill, licensed under the AGPL Version 3
-usage: xicclu [\-options] profile_or_cal
-Diagnostic: Unknown flag
-.TP
-\fB\-v\fR level
-Verbosity level 0 \- 2 (default = 1)
-.TP
-\fB\-g\fR
-Plot slice instead of looking colors up. (Default white to black)
-.TP
-\fB\-G\fR s:L:a:b
-Override plot slice start with Lab or Jab co\-ordinate
-.TP
-\fB\-G\fR e:L:a:b
-Override plot slice end with Lab or Jab co\-ordinate
-.TP
-\fB\-f\fR function
-f = forward, b = backwards, g = gamut, p = preview
-if = inverted forward, ib = inverted backwards
-.TP
-\fB\-i\fR intent
-a = absolute, r = relative colorimetric
-p = perceptual, s = saturation
-.TP
-\fB\-o\fR order
-n = normal (priority: lut > matrix > monochrome)
-r = reverse (priority: monochrome > matrix > lut)
-.TP
-\fB\-p\fR oride
-x = XYZ_PCS, X = XYZ * 100, l = Lab_PCS, L = LCh, y = Yxy
-j = CIECAM02 Appearance Jab, J = CIECAM02 Appearance JCh
-.TP
-\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.)
-l = extra PCS input is portion of K locus
-v = extra PCS input is K target value
-.HP
-\fB\-k\fR p stle stpo enpo enle shape
-.IP
-stle: K level at White 0.0 \- 1.0
-stpo: start point of transition Wh 0.0 \- Bk 1.0
-enpo: End point of transition Wh 0.0 \- Bk 1.0
-enle: K level at Black 0.0 \- 1.0
-shape: 1.0 = straight, 0.0\-1.0 concave, 1.0\-2.0 convex
-.HP
-\fB\-k\fR q stle0 stpo0 enpo0 enle0 shape0 stle2 stpo2 enpo2 enle2 shape2
-.IP
-Transfer extra PCS input to dual curve limits
-.TP
-\fB\-K\fR parameters
-Same as \fB\-k\fR, but target is K locus rather than K value itself
-.TP
-\fB\-l\fR tlimit
-set total ink limit, 0 \- 400% (estimate by default)
-.TP
-\fB\-L\fR klimit
-set black ink limit, 0 \- 100% (estimate by default)
-.TP
-\fB\-a\fR
-show actual target values if clipped
-.TP
-\fB\-u\fR
-warn if output PCS is outside the spectrum locus
-.TP
-\fB\-m\fR
-merge output processing into clut
-.TP
-\fB\-b\fR
-use CAM Jab for clipping
-.TP
-\fB\-c\fR viewcond
-set viewing conditions for CIECAM97s,
-either an enumerated choice, or a parameter:value changes
-.IP
-pp \- Practical Reflection Print (ISO\-3664 P2)
-pe \- Print evaluation environment (CIE 116\-1995)
-pc \- Critical print evaluation environment (ISO\-3664 P1)
-mt \- Monitor in typical work environment
-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
-ob \- Original scene \- Bright Outdoors
-cx \- Cut Sheet Transparencies on a viewing box
-.TP
-s:surround
-n = auto, a = average, m = dim, d = dark,
-c = transparency (default average)
-.TP
-w:X:Y:Z
-Adapted white point as XYZ (default media white, Abs: D50)
-.TP
-w:x:y
-Adapted white point as x, y
-.TP
-a:adaptation
-Adaptation luminance in cd.m^2 (default 50.0)
-.TP
-b:background
-Background % of image luminance (default 20)
-.TP
-l:imagewhite
-Image white in cd.m^2 if surround = auto (default 250)
-.TP
-f:flare
-Flare light % of image luminance (default 0)
-.TP
-g:glare
-Flare light % of ambient (default 1)
-.TP
-g:X:Y:Z
-Flare color as XYZ (default media white, Abs: D50)
-.TP
-g:x:y
-Flare color as x, y
-.IP
-The colors to be translated should be fed into standard in,
-one input color per line, white space separated.
-A line starting with a # will be ignored.
-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_or_cal
-Diagnostic: Unknown flag
+.SH SYNOPSIS
+.B xicclu
+.RB [\-options]\ profile_or_cal
 .TP
 \fB\-v\fR level
 Verbosity level 0 \- 2 (default = 1)
diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch
index a2cc91a..2ca1ae4 100644
--- a/debian/patches/15_jam.patch
+++ b/debian/patches/15_jam.patch
@@ -6,16 +6,13 @@ 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 @@
- }
+--- trunk.orig/Jamtop	2014-09-07 20:15:02.520225484 +0200
++++ trunk/Jamtop	2014-09-07 20:15:43.909089670 +0200
+@@ -109,12 +109,16 @@
  
  # See if we have a system TIFF library.
--if ! $(BUILTIN_TIFF) && $(UNIX) {
+ 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 ] {
@@ -24,32 +21,24 @@ Index: trunk/Jamtop
  		 || [ 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/lib/i386-linux-gnu : libtiff.so ]
++		 || [ GLOB /usr/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 @@
- 		}
+@@ -124,6 +128,7 @@
  	}
  }
-+}
  
++
  # 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
+--- trunk.orig/Jambase	2014-09-07 20:15:02.520225484 +0200
++++ trunk/Jambase	2014-09-07 20:15:02.512225317 +0200
 @@ -880,7 +880,7 @@
  
  	# UNIX defaults
@@ -68,20 +57,12 @@ Index: trunk/Jambase
  	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
+@@ -971,7 +971,7 @@
+ 	RMDIR			?= $(RM) ;
+ 	RSH				?= rsh ;
+ 	SED				?= sed ;
+-	SHELLHEADER		?= "#!/bin/sh" ;
++	SHELLHEADER		?= "#!/bin/bash" ;
+ 	SHELLMODE		?= 755 ;
+ 	SLASH			?= / ;
+ 	STDHDRS			?= /usr/include ;
diff --git a/debian/patches/15_jam.patch.org b/debian/patches/15_jam.patch.org
new file mode 100644
index 0000000..f50b17a
--- /dev/null
+++ b/debian/patches/15_jam.patch.org
@@ -0,0 +1,96 @@
+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-07 20:09:37.013428228 +0200
++++ trunk/Jamtop	2014-09-07 20:09:37.005428060 +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-07 20:09:37.013428228 +0200
++++ trunk/Jambase	2014-09-07 20:10:45.770864145 +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	?= ;
+@@ -971,7 +971,7 @@
+ 	RMDIR			?= $(RM) ;
+ 	RSH				?= rsh ;
+ 	SED				?= sed ;
+-	SHELLHEADER		?= "#!/bin/sh" ;
++	SHELLHEADER		?= "#!/bin/bash" ;
+ 	SHELLMODE		?= 755 ;
+ 	SLASH			?= / ;
+ 	STDHDRS			?= /usr/include ;
+Index: trunk/imdi/Makefile
+===================================================================
+--- trunk.orig/imdi/Makefile	2014-09-07 20:09:37.013428228 +0200
++++ trunk/imdi/Makefile	2014-09-07 20:09:37.005428060 +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/rules b/debian/rules
index 0f3d8ec..92d1baa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 # hardening
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--no-undefined
 
@@ -32,7 +32,7 @@ override_dh_auto_clean:
 	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
+	dh_auto_clean
 
 override_dh_auto_install:
 	jam $(JAMCMDLINE) dirs
@@ -40,38 +40,33 @@ override_dh_auto_install:
 	rm $(CURDIR)/debian/tmp/usr/bin/License.txt
 
 override_dh_installdocs:
-	dh_installdocs --link-doc=argyll-doc
+#	mkdir -p $(CURDIR)/doc/html
+#	mv -f $(CURDIR)/doc/* $(CURDIR)/doc/html
+	dh_installdocs -A --link-doc=argyll-doc
+	mkdir -p $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html
+	mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.html $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/
+	mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.jpg $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/
+	mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/SG_*.txt $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/
+	mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.gif $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/
+	mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.xls $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/
+	mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/*.zip $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/
+	mv -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/ccmxs $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/html/
 	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
-
+	rm -f $(CURDIR)/debian/argyll-doc/usr/share/doc/argyll-doc/afiles
 
 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 }')
-
-#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 $<)
-
 override_dh_strip:
 	dh_strip --dbg-package=argyll-dbg
 
 build-manpages:
+	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="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