Merge branch 'release/2.0.0+repack-1'2.0.0+repack-1

11 files changed, 168 insertions, 140 deletions

diff --git a/debian/changelog b/debian/changelog
index 3860758..67295e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+argyll (2.0.0+repack-1) unstable; urgency=medium
+
+  * Switch from repack to Files-Excluded.
+  * Refresh patches.
+  * Change to my new email address.
+  * debian/changelog:
+    - Remove trailing whitespaces.
+  * debian/control:
+    - Remove duplicates Priority fields.
+    - Requested versions are lesser as there are in old-stable:
+      + Remove dpkg amd dpkg-dev from (Build|Pre)-Depends.
+      + Remove versions from Recommend udev.
+      + Remove Replaces & Breaks argyll from argyll-ref.
+  * debian/rules:
+    - Add script to remove executable flag from upstream source.
+  * Declare compliance with Debian Policy 4.1.2.0 (No changes needed).
+  * Change to secure URI.
+    - Homepage in debian/copyright, debian/watch and debian/control.
+  * debian/patches/0130_openssl.patch:
+    - Switch from SSLv23_client_method to TLS_client_method (Closes: #871427).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 01 Dec 2017 10:35:30 +0100
+
 argyll (1.9.2+repack-2) unstable; urgency=medium
 
   * New README.source to explain the branching model used.
@@ -11,7 +34,7 @@ argyll (1.9.2+repack-2) unstable; urgency=medium
     - For better handling replace dpkg-parsechangelog with SOURCE_DATE_EPOCH
       from pkg-info.mk.
   * New patch 0130_openssl.patch:
-    - Enable all ssl connections since openssl provides only connetions with 
+    - Enable all ssl connections since openssl provides only connetions with
       TLS1.2 or greater (Closes: #871427).
   * Use the automatic debug symbol packages:
     - Remove argyll-dbg section from debian/control.
@@ -51,7 +74,7 @@ argyll (1.8.3+repack-2) unstable; urgency=medium
   * debian/control:
     - Transition libpng: Change Build-Depends from libpng16-dev to libpng-dev
       (Closes: #810178).
-    - Transition libusb: Change Build-Depends from libusb-dev to 
+    - Transition libusb: Change Build-Depends from libusb-dev to
       libusb-1.0-0-dev (Closes: #810398).
     - Set priority of argyll-ref to extra.
   * Rename patches.
@@ -179,7 +202,7 @@ argyll (1.6.3-4) unstable; urgency=medium
 argyll (1.6.3-3) unstable; urgency=medium
 
   * debian/control:
-    - Replace Architecture: any with linux-any to prevent KFreeBSD-* and 
+    - Replace Architecture: any with linux-any to prevent KFreeBSD-* and
       hurd-i386 from build during unusable usb system (Closes: #762773).
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sun, 05 Oct 2014 19:31:16 +0200
@@ -188,7 +211,7 @@ argyll (1.6.3-2) unstable; urgency=medium
 
   * debian/control:
     - Bump Standards-Version to 3.9.6 (no changes required).
-    - Add Replaces: argyll (<< 1.6.3-1) and 
+    - Add Replaces: argyll (<< 1.6.3-1) and
       Breaks (<< 1.6.3-1) to argyll-ref (Closes: #762780).
     - At argyll move argyll-doc from Depends to Suggests (Closes: #762850).
     - Remove from Build-Depends libusbhid-dev [kfreebsd-any].
@@ -242,7 +265,7 @@ argyll (1.6.3-1) unstable; urgency=medium
         Useless. Only linked to argyll & icc-utils.
       + libimdi0 & libimdi-dev
         Useless. Only linked to argyll & icc-utils.
-    - Move documentation to new package argyll-doc 
+    - Move documentation to new package argyll-doc
       and symlink into the other packages.
     - Add Pre-Depends:
       * dpkg (>= 1.17.5) for use of the dpkg-maintscript-helper.
diff --git a/debian/control b/debian/control
index 407baf4..87ca9c9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,10 @@
 Source: argyll
 Section: graphics
 Priority: optional
-Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Standards-Version: 4.0.1
+Maintainer: Jörg Frings-Fürst <debian@jff.email>
+Standards-Version: 4.1.2.0
 Build-Depends:
  debhelper (>= 10),
- dpkg-dev (>= 1.17.0),
  jam,
  libjpeg-dev,
  libpng-dev,
@@ -21,16 +20,14 @@ Build-Depends:
  x11proto-scrnsaver-dev,
  x11proto-xf86vidmode-dev,
  zlib1g-dev
-Homepage: http://www.argyllcms.com/
+Homepage: https://www.argyllcms.com/
 Vcs-Git: git://anonscm.debian.org/collab-maint/argyll.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/argyll.git
 
 Package: argyll
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}, argyll-ref
-Pre-Depends:
- dpkg (>= 1.17.5)
-Recommends: libpam-systemd [linux-any], udev (>= 196) [linux-any]
+Recommends: libpam-systemd [linux-any], udev [linux-any]
 Suggests: argyll-doc, colord, gir1.2-colordgtk-1.0
 Description: Color Management System, calibrator and profiler
  Argyll is an experimental, open source, ICC compatible color management
@@ -48,12 +45,7 @@ Description: Color Management System, calibrator and profiler
 
 Package: argyll-ref
 Architecture: all
-Priority: extra
 Depends: ${misc:Depends}
-Pre-Depends:
- dpkg (>= 1.17.5)
-Replaces: argyll (<< 1.6.3-1)
-Breaks: argyll (<< 1.6.3-1)
 Description: Color Management System, calibrator and profiler (data files)
  Argyll is an experimental, open source, ICC compatible color management
  system. It supports accurate ICC profile creation for scanners, CMYK
@@ -64,10 +56,7 @@ Description: Color Management System, calibrator and profiler (data files)
 Package: argyll-doc
 Architecture: all
 Section: doc
-Priority: extra
 Depends: ${misc:Depends}
-Pre-Depends:
- dpkg (>= 1.17.5)
 Description: Color Management System, calibrator and profiler (documentation)
  Argyll is an experimental, open source, ICC compatible color management
  system. It supports accurate ICC profile creation for scanners, CMYK
diff --git a/debian/copyright b/debian/copyright
index 3dd2dcb..d2c43af 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,14 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ArgyllCMS
 Upstream-Contact:  Graeme W. Gill <Graeme@argyllcms.com>
-Source: http://www.argyllcms.com/
+Source: https://www.argyllcms.com/
+Files-Excluded: yajl/yajl_test.exe
+                yajl/yajl_test.obj
+                usb/bin/*
+                jpeg/*
+                tiff/*
+                zlib/*
+                png/*
 
 Files: *
 Copyright: 1995-2016 Graeme W. Gill <Graeme@argyllcms.com>
@@ -147,7 +154,7 @@ License: public-domain
 Files: debian/*
 Copyright: 2006-2008 Christian Marillat <marillat@debian.org>
            2008-2010 Roland Mas <lolando@debian.org>
-           2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net>
+           2014-2017 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-3+
 
 License: AGPL-3
diff --git a/debian/files b/debian/files
deleted file mode 100644
index f651ec4..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-argyll_1.9.2+repack-2_source.buildinfo graphics optional
diff --git a/debian/patches/0001_jam.patch b/debian/patches/0001_jam.patch
index 69156bd..b0469f3 100644
--- a/debian/patches/0001_jam.patch
+++ b/debian/patches/0001_jam.patch
@@ -47,7 +47,7 @@ Index: trunk/Jamtop
  
  # Tell standalone libraries that they are part of Argyll:
  DEFINES += ARGYLLCMS ;
-@@ -139,17 +140,82 @@ rule CheckForLibrary {
+@@ -152,17 +153,82 @@ rule CheckForLibrary {
  	}
  
  	if ! $(BUILTIN_$(UCASE)) && $(UNIX) {
diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch
index c65916b..9797224 100644
--- a/debian/patches/0100_spelling.patch
+++ b/debian/patches/0100_spelling.patch
@@ -7,7 +7,7 @@ Index: trunk/spectro/dispcal.c
 ===================================================================
 --- trunk.orig/spectro/dispcal.c
 +++ trunk/spectro/dispcal.c
-@@ -1942,7 +1942,7 @@ int main(int argc, char *argv[]) {
+@@ -1985,7 +1985,7 @@ int main(int argc, char *argv[]) {
  			/* Serial port flow control */
  			} else if (argv[fa][1] == 'W') {
  				fa = nfa;
@@ -16,7 +16,7 @@ Index: trunk/spectro/dispcal.c
  				if (na[0] == 'n' || na[0] == 'N')
  					fc = fc_None;
  				else if (na[0] == 'h' || na[0] == 'H')
-@@ -1965,13 +1965,13 @@ int main(int argc, char *argv[]) {
+@@ -2008,13 +2008,13 @@ int main(int argc, char *argv[]) {
  			/* Black point correction amount */
  			} else if (argv[fa][1] == 'k') {
  				fa = nfa;
@@ -32,7 +32,7 @@ Index: trunk/spectro/dispcal.c
  				x.nbrate = atof(na);
  				if (x.nbrate < 0.05 || x.nbrate > 20.0) usage(0,"-A parameter must be between 0.05 and 20.0");
  			/* Black brightness */
-@@ -2004,7 +2004,7 @@ int main(int argc, char *argv[]) {
+@@ -2047,7 +2047,7 @@ int main(int argc, char *argv[]) {
  			/* COM port  */
  			} else if (argv[fa][1] == 'c') {
  				fa = nfa;
@@ -41,7 +41,7 @@ Index: trunk/spectro/dispcal.c
  				comport = atoi(na);
  				if (comport < 1 || comport > 50) usage(0,"-c parameter %d out of range",comport);
  
-@@ -3068,7 +3068,7 @@ int main(int argc, char *argv[]) {
+@@ -3111,7 +3111,7 @@ int main(int argc, char *argv[]) {
  			/* Black level adjustment */
  			/* Due to the possibility of the channel offsets not being even, */
  			/* we use the largest of the XYZ values after they have been */
@@ -54,7 +54,7 @@ Index: trunk/spectro/spotread.c
 ===================================================================
 --- trunk.orig/spectro/spotread.c
 +++ trunk/spectro/spotread.c
-@@ -497,7 +497,7 @@ int main(int argc, char *argv[]) {
+@@ -509,7 +509,7 @@ int main(int argc, char *argv[]) {
  			/* COM port  */
  			} else if (argv[fa][1] == 'c') {
  				fa = nfa;
@@ -63,7 +63,7 @@ Index: trunk/spectro/spotread.c
  				{
  					comport = atoi(na);
  					if (comport < 1 || comport > 40) usage("-c parameter %d out of range",comport);
-@@ -506,7 +506,7 @@ int main(int argc, char *argv[]) {
+@@ -518,7 +518,7 @@ int main(int argc, char *argv[]) {
  			/* Display type */
  			} else if (argv[fa][1] == 'y') {
  				fa = nfa;
@@ -72,7 +72,7 @@ Index: trunk/spectro/spotread.c
  				dtype = na[0];
  
  #ifndef SALONEINSTLIB
-@@ -514,7 +514,7 @@ int main(int argc, char *argv[]) {
+@@ -526,7 +526,7 @@ int main(int argc, char *argv[]) {
  			} else if (argv[fa][1] == 'I') {
  
  				fa = nfa;
@@ -81,7 +81,7 @@ Index: trunk/spectro/spotread.c
  				if (strcmp(na, "A") == 0
  				 || strcmp(na, "M0") == 0) {
  					tillum_set = spec = 1;
-@@ -562,7 +562,7 @@ int main(int argc, char *argv[]) {
+@@ -574,7 +574,7 @@ int main(int argc, char *argv[]) {
  			/* Spectral Illuminant type for XYZ computation */
  			} else if (argv[fa][1] == 'i') {
  				fa = nfa;
@@ -90,7 +90,7 @@ Index: trunk/spectro/spotread.c
  				if (strcmp(na, "A") == 0) {
  					illum_set = spec = 1;
  					illum = icxIT_A;
-@@ -611,7 +611,7 @@ int main(int argc, char *argv[]) {
+@@ -623,7 +623,7 @@ int main(int argc, char *argv[]) {
  			/* Spectral Observer type */
  			} else if (argv[fa][1] == 'Q') {
  				fa = nfa;
@@ -99,7 +99,7 @@ Index: trunk/spectro/spotread.c
  				if (strcmp(na, "1931_2") == 0) {			/* Classic 2 degree */
  					obType = icxOT_CIE_1931_2;
  				} else if (strcmp(na, "1964_10") == 0) {	/* Classic 10 degree */
-@@ -693,7 +693,7 @@ int main(int argc, char *argv[]) {
+@@ -712,7 +712,7 @@ int main(int argc, char *argv[]) {
  			/* Filter configuration */
  			} else if (argv[fa][1] == 'F') {
  				fa = nfa;
@@ -108,7 +108,7 @@ Index: trunk/spectro/spotread.c
  				if (na[0] == 'n' || na[0] == 'N')
  					fe = inst_opt_filter_none;
  				else if (na[0] == 'p' || na[0] == 'P')
-@@ -708,13 +708,13 @@ int main(int argc, char *argv[]) {
+@@ -727,13 +727,13 @@ int main(int argc, char *argv[]) {
  			/* Extra filter compensation file */
  			} else if (argv[fa][1] == 'E') {
  				fa = nfa;
@@ -124,7 +124,7 @@ Index: trunk/spectro/spotread.c
  				if (na[0] == 'N')
  					calstd = xcalstd_none;
  				else if (na[0] == 'A')
-@@ -724,7 +724,7 @@ int main(int argc, char *argv[]) {
+@@ -743,7 +743,7 @@ int main(int argc, char *argv[]) {
  				else if (na[0] == 'G')
  					calstd = xcalstd_gmdi;
  				else
@@ -133,7 +133,7 @@ Index: trunk/spectro/spotread.c
  
  			/* Show Yxy */
  			} else if (argv[fa][1] == 'x') {
-@@ -1432,7 +1432,7 @@ int main(int argc, char *argv[]) {
+@@ -1479,7 +1479,7 @@ int main(int argc, char *argv[]) {
  
  		/* Or something is wrong with instrument capabilities */
  		} else {
@@ -146,7 +146,7 @@ Index: trunk/spectro/colorhug.c
 ===================================================================
 --- trunk.orig/spectro/colorhug.c
 +++ trunk/spectro/colorhug.c
-@@ -212,7 +212,7 @@ colorhug_command(colorhug *p,
+@@ -213,7 +213,7 @@ colorhug_command(colorhug *p,
  
  	a1logd(p->log,8,"colorhug_command: Read %d bytes and %d read\n",xrbytes,rbytes);
  	if (rbytes >= 2) {
@@ -159,16 +159,7 @@ Index: trunk/spectro/dispwin.c
 ===================================================================
 --- trunk.orig/spectro/dispwin.c
 +++ trunk/spectro/dispwin.c
-@@ -2766,7 +2766,7 @@ int dispwin_install_profile(dispwin *p,
- 
- /* Un-Install a display profile */
- /* Return nz if failed, */
--/* 1 if not sucessfully deleted */
-+/* 1 if not successfully deleted */
- /* 2 if profile not found */
- int dispwin_uninstall_profile(dispwin *p, char *fname, p_scope scope) {
- 	debugr2((errout,"dispwin_uninstall_profile '%s'\n", fname));
-@@ -5038,7 +5038,7 @@ int ddebug						/* >0 to print debug sta
+@@ -5234,7 +5234,7 @@ int ddebug						/* >0 to print debug sta
  		vinfo = XGetVisualInfo(p->mydisplay, VisualIDMask, &template, &nitems); 
  
  		if (nitems < 1) {
@@ -177,20 +168,11 @@ Index: trunk/spectro/dispwin.c
  			dispwin_del(p);
  			return NULL;
  		}
-@@ -5630,7 +5630,7 @@ int ddebug						/* >0 to print debug sta
- 		p->native = native &= ~2;
- 	}
- 
--	debugr("new_dispwin: return sucessfully\n");
-+	debugr("new_dispwin: return successfully\n");
- 	return p;
- }
- 
 Index: trunk/spectro/dtp51.c
 ===================================================================
 --- trunk.orig/spectro/dtp51.c
 +++ trunk/spectro/dtp51.c
-@@ -680,7 +680,7 @@ dtp51_interp_error(inst *pp, int ec) {
+@@ -681,7 +681,7 @@ dtp51_interp_error(inst *pp, int ec) {
  		case DTP51_INVALID_STEP:
  			return "Invalid step";
  		case DTP51_NO_DATA_AVAILABLE:
@@ -203,7 +185,7 @@ Index: trunk/spectro/dtp92.c
 ===================================================================
 --- trunk.orig/spectro/dtp92.c
 +++ trunk/spectro/dtp92.c
-@@ -357,7 +357,7 @@ dtp92_init_coms(inst *pp, baud_rate br,
+@@ -358,7 +358,7 @@ dtp92_init_coms(inst *pp, baud_rate br,
  					if ((ev = dtp92_command(p, tbuf, buf, MAX_MES_SIZE, 6.0)) != inst_ok)
  						error("Writing offset drift value failed");
  					else
@@ -212,7 +194,7 @@ Index: trunk/spectro/dtp92.c
  				} else {
  					printf("No command written\n");
  				}
-@@ -371,7 +371,7 @@ dtp92_init_coms(inst *pp, baud_rate br,
+@@ -372,7 +372,7 @@ dtp92_init_coms(inst *pp, baud_rate br,
  		return inst_coms_fail;
  	}
  
@@ -221,7 +203,7 @@ Index: trunk/spectro/dtp92.c
  
  	p->gotcoms = 1;
  	return inst_ok;
-@@ -941,7 +941,7 @@ dtp92_interp_error(inst *pp, int ec) {
+@@ -942,7 +942,7 @@ dtp92_interp_error(inst *pp, int ec) {
  		case DTP92_NO_DATA_AVAILABLE:
  			return "No data available";
  		case DTP92_MISSING_PARAMETER:
@@ -234,7 +216,7 @@ Index: trunk/spectro/hidio.c
 ===================================================================
 --- trunk.orig/spectro/hidio.c
 +++ trunk/spectro/hidio.c
-@@ -739,7 +739,7 @@ icoms_hid_read(icoms *p,
+@@ -742,7 +742,7 @@ icoms_hid_read(icoms *p,
  	{
  		unsigned char *rbuf2;
  
@@ -247,7 +229,7 @@ Index: trunk/spectro/huey.c
 ===================================================================
 --- trunk.orig/spectro/huey.c
 +++ trunk/spectro/huey.c
-@@ -81,7 +81,7 @@ static int icoms2huey_err(int se, int to
+@@ -82,7 +82,7 @@ static int icoms2huey_err(int se, int to
  /* i1Display command codes */
  /* B = byte (8bit), S = short (16bit), W = word (32bit), A = string */
  /* U = unused byte, - = no arguments/results */
@@ -260,7 +242,7 @@ Index: trunk/spectro/i1pro_imp.c
 ===================================================================
 --- trunk.orig/spectro/i1pro_imp.c
 +++ trunk/spectro/i1pro_imp.c
-@@ -2700,7 +2700,7 @@ int *pinstmsec) {	/* Return instrument l
+@@ -2701,7 +2701,7 @@ int *pinstmsec) {	/* Return instrument l
  			break;
  	}
  
@@ -269,7 +251,7 @@ Index: trunk/spectro/i1pro_imp.c
  
  	/* Compute overall delay */
  	dispmsec = (int)(samp[i].sec * 1000.0 + 0.5);				/* Display update time */
-@@ -3153,7 +3153,7 @@ i1pro_code i1pro_imp_measure(
+@@ -3154,7 +3154,7 @@ i1pro_code i1pro_imp_measure(
  		}
  	}
  	
@@ -278,7 +260,7 @@ Index: trunk/spectro/i1pro_imp.c
  	if (user_trig)
  		return I1PRO_USER_TRIG;
  	return ev; 
-@@ -3815,7 +3815,7 @@ i1pro_code i1pro_imp_meas_refrate(
+@@ -3816,7 +3816,7 @@ i1pro_code i1pro_imp_meas_refrate(
  			}
  		}
  	} else {
@@ -287,7 +269,7 @@ Index: trunk/spectro/i1pro_imp.c
  	}
  
  	return I1PRO_RD_NOREFR_FOUND; 
-@@ -3910,7 +3910,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -3911,7 +3911,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
  		return I1PRO_OK;
  	}
  
@@ -296,7 +278,7 @@ Index: trunk/spectro/i1pro_imp.c
  	s->dark_valid = 1;
  	s->ddate = m->caldate;
  
-@@ -3955,7 +3955,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -3956,7 +3956,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
  		return I1PRO_OK;
  	}
  
@@ -305,7 +287,7 @@ Index: trunk/spectro/i1pro_imp.c
  	s->cal_valid = 1;
  	s->cfdate = m->caldate;
  
-@@ -4310,7 +4310,7 @@ i1pro_code i1pro_save_calibration(i1pro
+@@ -4312,7 +4312,7 @@ i1pro_code i1pro_save_calibration(i1pro
  		write_doubles(&x, fp, s->idark_data[3]-1, m->nraw+1);
  	}
  
@@ -331,7 +313,7 @@ Index: trunk/spectro/ss.c
 ===================================================================
 --- trunk.orig/spectro/ss.c
 +++ trunk/spectro/ss.c
-@@ -374,7 +374,7 @@ ss_init_coms(inst *pp, baud_rate br, flo
+@@ -375,7 +375,7 @@ ss_init_coms(inst *pp, baud_rate br, flo
  
  	p->gotcoms = 1;
  
@@ -340,7 +322,7 @@ Index: trunk/spectro/ss.c
  
  	return inst_ok;
  }
-@@ -1743,7 +1743,7 @@ ss_interp_error(inst *pp, int ec) {
+@@ -1744,7 +1744,7 @@ ss_interp_error(inst *pp, int ec) {
  		case ss_et_FilterOutOfPos:
  			return "Filter wheel out of position";
  		case ss_et_SendTimeout:
@@ -349,7 +331,7 @@ Index: trunk/spectro/ss.c
  		case ss_et_DriveError:
  			return "Data drive defect";
  		case ss_et_MeasDisabled:
-@@ -1863,7 +1863,7 @@ ss_interp_error(inst *pp, int ec) {
+@@ -1864,7 +1864,7 @@ ss_interp_error(inst *pp, int ec) {
  		case ss_et_BadHexEncoding:
  			return "Message received from instrument has bad Hex encoding";
  		case ss_et_RecBufferOverun:
@@ -362,7 +344,7 @@ Index: trunk/spectro/ss_imp.c
 ===================================================================
 --- trunk.orig/spectro/ss_imp.c
 +++ trunk/spectro/ss_imp.c
-@@ -216,7 +216,7 @@ static int h2b(ss *p, char c) {
+@@ -217,7 +217,7 @@ static int h2b(ss *p, char c) {
  	return 0;
  }
  
@@ -454,7 +436,7 @@ Index: trunk/spectro/munki_imp.c
 ===================================================================
 --- trunk.orig/spectro/munki_imp.c
 +++ trunk/spectro/munki_imp.c
-@@ -1904,7 +1904,7 @@ int *pinstmsec) {    /* Return instrumen
+@@ -1905,7 +1905,7 @@ int *pinstmsec) {    /* Return instrumen
  			break;
  	}
  
@@ -463,7 +445,7 @@ Index: trunk/spectro/munki_imp.c
  
  	/* Compute overall delay and subtract patch change delay */
  	dispmsec = (int)(samp[i].sec * 1000.0 + 0.5);
-@@ -2385,7 +2385,7 @@ munki_code munki_imp_measure(
+@@ -2386,7 +2386,7 @@ munki_code munki_imp_measure(
  	if (nvals > 0)
  		vals[0].duration = duration;	/* Possible flash duration */
  	
@@ -472,7 +454,7 @@ Index: trunk/spectro/munki_imp.c
  	if (user_trig)
  		return MUNKI_USER_TRIG;
  	return ev; 
-@@ -3046,7 +3046,7 @@ munki_code munki_imp_meas_refrate(
+@@ -3047,7 +3047,7 @@ munki_code munki_imp_meas_refrate(
  			}
  		}
  	} else {
@@ -481,7 +463,7 @@ Index: trunk/spectro/munki_imp.c
  	}
  
  	return MUNKI_RD_NOREFR_FOUND; 
-@@ -3260,7 +3260,7 @@ munki_code munki_save_calibration(munki
+@@ -3262,7 +3262,7 @@ munki_code munki_save_calibration(munki
  		write_doubles(&x, fp, s->idark_data[3]-1, m->nraw+1);
  	}
  
@@ -490,7 +472,7 @@ Index: trunk/spectro/munki_imp.c
  	write_ints(&x, fp, (int *)&x.chsum, 1);
  
  	if (fclose(fp) != 0)
-@@ -6425,7 +6425,7 @@ munki_code munki_create_hr(munki *p, int
+@@ -6429,7 +6429,7 @@ munki_code munki_create_hr(munki *p, int
  	int i, j, jj, k, cx, sx;
  	munki_fc coeff[40][16];	/* Existing filter cooefficients */
  	int nwav1;					/* Number of filters */
@@ -499,7 +481,7 @@ Index: trunk/spectro/munki_imp.c
  	double wl_step1;
  	munki_xp xp[41];			/* Crossover points each side of filter */
  	munki_code ev = MUNKI_OK;
-@@ -8733,7 +8733,7 @@ munki_readmeasurement(
+@@ -8737,7 +8737,7 @@ munki_readmeasurement(
  
  	top = extra + m->c_inttime * nmeas;
  
@@ -685,7 +667,7 @@ Index: trunk/link/collink.c
 ===================================================================
 --- trunk.orig/link/collink.c
 +++ trunk/link/collink.c
-@@ -1110,7 +1110,7 @@ void devip_devop(void *cntx, double *out
+@@ -1122,7 +1122,7 @@ void devip_devop(void *cntx, double *out
  			}
  			/* We've got the input profile PCS' at this point. */
  
@@ -694,7 +676,7 @@ Index: trunk/link/collink.c
  			/* output, copy it into locus[], which will be given to the inverse */
  			/* lookup function, else the inverse lookup will generate a K using */
  			/* the curve parameters. */  
-@@ -1192,7 +1192,7 @@ void devip_devop(void *cntx, double *out
+@@ -1204,7 +1204,7 @@ void devip_devop(void *cntx, double *out
  			if (p->verb)
  #endif
  			{
@@ -703,7 +685,7 @@ Index: trunk/link/collink.c
      		    p->in.wp[0],p->in.wp[1],p->in.wp[2],pcsv[0], pcsv[1], pcsv[2],dd);
  				fflush(stdout);
  			}
-@@ -1242,7 +1242,7 @@ void devip_devop(void *cntx, double *out
+@@ -1254,7 +1254,7 @@ void devip_devop(void *cntx, double *out
  		if (p->nhack == 2) {
  			/* Ideally we would create a 4D PCSK -> PCSK gamut mapping */
  			/* to smoothly and accurately cope with the changing source */
@@ -712,7 +694,7 @@ Index: trunk/link/collink.c
  			/* In practice we're going to simply interpolated between */
  			/* two extremes: unrestricted gamut and K only black gamut. */
  			double map0[3], map1[3];
-@@ -4737,7 +4737,7 @@ main(int argc, char *argv[]) {
+@@ -4807,7 +4807,7 @@ main(int argc, char *argv[]) {
  		}
  
  		if (li.verb)
@@ -738,7 +720,7 @@ Index: trunk/spectro/dispsup.c
 ===================================================================
 --- trunk.orig/spectro/dispsup.c
 +++ trunk/spectro/dispsup.c
-@@ -719,7 +719,7 @@ static int disprd_read_imp(
+@@ -721,7 +721,7 @@ static int disprd_read_imp(
  		scb->serno = p->serno++;
  		scb->msec = msec_time();
  
@@ -747,7 +729,7 @@ Index: trunk/spectro/dispsup.c
  		                val.XYZ[0], val.XYZ[1], val.XYZ[2]);
  
  		scb->mtype = val.mtype;
-@@ -1239,7 +1239,7 @@ int disprd_ambient(
+@@ -1241,7 +1241,7 @@ int disprd_ambient(
  
  	/* Or something is wrong with instrument capabilities */
  	} else {
@@ -756,7 +738,7 @@ Index: trunk/spectro/dispsup.c
  		return 2;
  	}
  
-@@ -2342,7 +2342,7 @@ static int config_inst_displ(disprd *p)
+@@ -2344,7 +2344,7 @@ static int config_inst_displ(disprd *p)
  	/* Reset key meanings */
  	inst_reset_uih();
  
@@ -782,7 +764,7 @@ Index: trunk/profile/profout.c
 ===================================================================
 --- trunk.orig/profile/profout.c
 +++ trunk/profile/profout.c
-@@ -1103,7 +1103,7 @@ make_output_icc(
+@@ -1104,7 +1104,7 @@ make_output_icc(
  		if (iccver < icmVersion2_4) {
  			iccver = icmVersion2_4;		/* Need 2.4.0 for Display intents */
  			if (verb)
@@ -808,7 +790,7 @@ Index: trunk/xicc/xspect.c
 ===================================================================
 --- trunk.orig/xicc/xspect.c
 +++ trunk/xicc/xspect.c
-@@ -4530,7 +4530,7 @@ void xspect_plot10(xspect *sp, int n) {
+@@ -4454,7 +4454,7 @@ void xspect_plot10p(xspect *sp[10], int
  /* Given an emission spectrum, set the UV output to the given level. */
  /* The shape of the UV is taken from FWA1_stim, and the level is */
  /* with respect to the Y of the input spectrum. */
@@ -821,7 +803,7 @@ Index: trunk/spectro/ccxxmake.c
 ===================================================================
 --- trunk.orig/spectro/ccxxmake.c
 +++ trunk/spectro/ccxxmake.c
-@@ -398,7 +398,7 @@ int main(int argc, char *argv[]) {
+@@ -399,7 +399,7 @@ int main(int argc, char *argv[]) {
  			/* COM port  */
  			} else if (argv[fa][1] == 'c') {
  				fa = nfa;
@@ -830,7 +812,7 @@ Index: trunk/spectro/ccxxmake.c
  				comno = atoi(na);
  				if (comno < 1 || comno > 40) usage(0,"-c parameter %d out of range",comno);
  
-@@ -498,7 +498,7 @@ int main(int argc, char *argv[]) {
+@@ -508,7 +508,7 @@ int main(int argc, char *argv[]) {
  			/* Serial port flow control */
  			} else if (argv[fa][1] == 'W') {
  				fa = nfa;
@@ -839,7 +821,7 @@ Index: trunk/spectro/ccxxmake.c
  				if (na[0] == 'n' || na[0] == 'N')
  					fc = fc_None;
  				else if (na[0] == 'h' || na[0] == 'H')
-@@ -587,7 +587,7 @@ int main(int argc, char *argv[]) {
+@@ -597,7 +597,7 @@ int main(int argc, char *argv[]) {
  		strcat(outname, doccss ? ".ccss" : ".ccmx");
  
  	if (fakeseq && doccss)
@@ -848,7 +830,7 @@ Index: trunk/spectro/ccxxmake.c
  
  	printf("\n");
  
-@@ -803,7 +803,7 @@ int main(int argc, char *argv[]) {
+@@ -813,7 +813,7 @@ int main(int argc, char *argv[]) {
  						refs[i][2] = cols[i][2];
  					}
  					gotref = 1;
@@ -861,7 +843,7 @@ Index: trunk/spectro/dispread.c
 ===================================================================
 --- trunk.orig/spectro/dispread.c
 +++ trunk/spectro/dispread.c
-@@ -413,7 +413,7 @@ int main(int argc, char *argv[]) {
+@@ -414,7 +414,7 @@ int main(int argc, char *argv[]) {
  			/* COM port  */
  			} else if (argv[fa][1] == 'c') {
  				fa = nfa;
@@ -981,7 +963,7 @@ Index: trunk/spectro/ex1.c
 ===================================================================
 --- trunk.orig/spectro/ex1.c
 +++ trunk/spectro/ex1.c
-@@ -188,7 +188,7 @@ ex1_init_coms(inst *pp, baud_rate br, fl
+@@ -189,7 +189,7 @@ ex1_init_coms(inst *pp, baud_rate br, fl
  
  	p->gotcoms = 1;
  
@@ -990,7 +972,7 @@ Index: trunk/spectro/ex1.c
  
  	return inst_ok;
  }
-@@ -929,7 +929,7 @@ ex1_interp_native_error(ex1 *p, int ec)
+@@ -930,7 +930,7 @@ ex1_interp_native_error(ex1 *p, int ec)
  		case EX1_FLASH_MAP:
  			return "Flash map is incompatible with firmware";
  		case EX1_DEFERRED:
@@ -999,7 +981,7 @@ Index: trunk/spectro/ex1.c
  		default:
  			return NULL;
  	}
-@@ -1279,7 +1279,7 @@ static int ex1_save_calibration(ex1 *p)
+@@ -1280,7 +1280,7 @@ static int ex1_save_calibration(ex1 *p)
  	calf_wrspec(&x, p->sconf.idark[0]);
  	calf_wrspec(&x, p->sconf.idark[1]);
  
@@ -1008,7 +990,7 @@ Index: trunk/spectro/ex1.c
  	calf_wints(&x, (int *)(&x.chsum), 1);
  
  	if (calf_done(&x))
-@@ -1466,7 +1466,7 @@ static void dump_command(ex1 *p, ORD8 *b
+@@ -1467,7 +1467,7 @@ static void dump_command(ex1 *p, ORD8 *b
  	if (flags & EX1_FLAG_NACK)
  		a1logd(p->log, 0, "   Negative acknowldgement response\n");
  	if (flags & EX1_FLAG_EXPTN)
@@ -1017,7 +999,7 @@ Index: trunk/spectro/ex1.c
  	if (flags & EX1_FLAG_PVDEP)
  		a1logd(p->log, 0, "   Protocol version is deprecated request\n");
  
-@@ -1752,7 +1752,7 @@ int nd				/* nz to disable debug message
+@@ -1753,7 +1753,7 @@ int nd				/* nz to disable debug message
  	}
  
  	if (p->log->debug >= 8) { 
@@ -1098,7 +1080,7 @@ Index: trunk/spectro/xdg_bds.c
 ===================================================================
 --- trunk.orig/spectro/xdg_bds.c
 +++ trunk/spectro/xdg_bds.c
-@@ -873,7 +873,7 @@ char *xdg_errstr(xdg_error er) {
+@@ -879,7 +879,7 @@ char *xdg_errstr(xdg_error er) {
  		case xdg_nohome:
  			return "There is no $HOME";
  		case xdg_noalluserprofile:
@@ -1111,7 +1093,7 @@ Index: trunk/icc/icc.c
 ===================================================================
 --- trunk.orig/icc/icc.c
 +++ trunk/icc/icc.c
-@@ -1472,7 +1472,7 @@ static const char *string_TagSignature(i
+@@ -1481,7 +1481,7 @@ static const char *string_TagSignature(i
  		case icSigViewingCondDescTag:
  			return "Viewing Condition Description";
  		case icSigViewingConditionsTag:
@@ -1120,7 +1102,7 @@ Index: trunk/icc/icc.c
  
  		/* ArgyllCMS private tag: */
  		case icmSigAbsToRelTransSpace:
-@@ -5773,7 +5773,7 @@ int icmSetMultiLutTables(
+@@ -5785,7 +5785,7 @@ int icmSetMultiLutTables(
  			return icp->errc = 1;
  		}
  		if (pp[tn]->ttype != p->ttype) {
@@ -1232,7 +1214,7 @@ Index: trunk/rspl/rev.c
 ===================================================================
 --- trunk.orig/rspl/rev.c
 +++ trunk/rspl/rev.c
-@@ -5868,7 +5868,7 @@ int sdi						/* Sub-simplex dimensionali
+@@ -5872,7 +5872,7 @@ int sdi						/* Sub-simplex dimensionali
  			x->face = 0;
  
  #ifdef DEBUG
@@ -1241,7 +1223,7 @@ Index: trunk/rspl/rev.c
  		for (i = 0; i <= sdi; i++)
  			printf("%d ",vcmb[i]);
  		printf("\n");
-@@ -9733,7 +9733,7 @@ rspl *s
+@@ -10344,7 +10344,7 @@ rspl *s
  				vc.nilist = 0;
  				xlist = NULL;
  
@@ -1250,7 +1232,7 @@ Index: trunk/rspl/rev.c
  
  				/* The thinning may have deleted verticies from bxcell's that */
  				/* were not involved in the thinning, so go though all bxcells */
-@@ -9873,7 +9873,7 @@ rspl *s
+@@ -10484,7 +10484,7 @@ rspl *s
  //printf("~1 deleting vtx %d\n",vx->ix);
  								del_vtxrec_hash(&vc, vx->ix);
  								if (get_vtxrec(&vc, vx->ix) != NULL)
@@ -1259,7 +1241,7 @@ Index: trunk/rspl/rev.c
  							}
  #else /* !DELETE_SHAD */
  							/* Keep track of deleted verticies that are in this bx, */
-@@ -10554,7 +10554,7 @@ rspl *s
+@@ -11165,7 +11165,7 @@ rspl *s
  				}
  			}
  			printf("%d crossed triangles tested\n",notverts);
@@ -1272,7 +1254,7 @@ Index: trunk/spectro/munki.c
 ===================================================================
 --- trunk.orig/spectro/munki.c
 +++ trunk/spectro/munki.c
-@@ -113,7 +113,7 @@ munki_init_coms(inst *pp, baud_rate br,
+@@ -114,7 +114,7 @@ munki_init_coms(inst *pp, baud_rate br,
  		return munki_interp_code(p, icoms2munki_err(se));
  	}
  
@@ -1281,7 +1263,7 @@ Index: trunk/spectro/munki.c
  
  	p->gotcoms = 1;
  	return inst_ok;
-@@ -525,7 +525,7 @@ munki_interp_error(inst *pp, munki_code
+@@ -526,7 +526,7 @@ munki_interp_error(inst *pp, munki_code
  		case MUNKI_INT_CREATE_EEPROM_STORE:
  			return "Error in creating EEProm store";
  		case MUNKI_INT_NEW_RSPL_FAILED:
@@ -1294,7 +1276,7 @@ Index: trunk/spectro/i1pro.c
 ===================================================================
 --- trunk.orig/spectro/i1pro.c
 +++ trunk/spectro/i1pro.c
-@@ -119,7 +119,7 @@ i1pro_init_coms(inst *pp, baud_rate br,
+@@ -120,7 +120,7 @@ i1pro_init_coms(inst *pp, baud_rate br,
  		return i1pro_interp_code(p, icoms2i1pro_err(se));
  	}
  
@@ -1303,7 +1285,7 @@ Index: trunk/spectro/i1pro.c
  
  	p->gotcoms = 1;
  	return inst_ok;
-@@ -508,7 +508,7 @@ i1pro_interp_error(inst *pp, i1pro_code
+@@ -509,7 +509,7 @@ i1pro_interp_error(inst *pp, i1pro_code
  		case I1PRO_INT_EEPROM_DATA_MISSING:
  			return "EEProm data is missing";
  		case I1PRO_INT_NEW_RSPL_FAILED:
@@ -1329,7 +1311,7 @@ Index: trunk/plot/vrml.c
 ===================================================================
 --- trunk.orig/plot/vrml.c
 +++ trunk/plot/vrml.c
-@@ -642,7 +642,7 @@ double cc[3]	/* Surface color, cc == NUL
+@@ -646,7 +646,7 @@ double cc[3]	/* Surface color, cc == NUL
  		fprintf(s->fp,"            ]\n");
  		fprintf(s->fp,"          }\n");
  		fprintf(s->fp,"\n");
@@ -1421,7 +1403,7 @@ Index: trunk/spectro/smcube.c
 ===================================================================
 --- trunk.orig/spectro/smcube.c
 +++ trunk/spectro/smcube.c
-@@ -292,7 +292,7 @@ smcube_init_coms(inst *pp, baud_rate br,
+@@ -293,7 +293,7 @@ smcube_init_coms(inst *pp, baud_rate br,
  		}
  		amutex_unlock(p->lock);
  	}
@@ -1430,7 +1412,7 @@ Index: trunk/spectro/smcube.c
  
  	p->gotcoms = 1;
  
-@@ -1247,7 +1247,7 @@ smcube_get_idle_time(smcube *p, int *pit
+@@ -1248,7 +1248,7 @@ smcube_get_idle_time(smcube *p, int *pit
  	itime = read_ORD16_be(buf + 4);
  
  	if (!nd)
@@ -1439,7 +1421,7 @@ Index: trunk/spectro/smcube.c
  
  	if (pitime != NULL)
  		*pitime = itime;
-@@ -1292,11 +1292,11 @@ smcube_fact_measure(smcube *p, double *X
+@@ -1293,11 +1293,11 @@ smcube_fact_measure(smcube *p, double *X
  	XYZ[0] = IEEE754todouble(read_ORD32_be(buf + 4));
  	XYZ[1] = IEEE754todouble(read_ORD32_be(buf + 8));
  	XYZ[2] = IEEE754todouble(read_ORD32_be(buf + 12));
@@ -1453,7 +1435,7 @@ Index: trunk/spectro/smcube.c
  
  	return inst_ok;
  }
-@@ -1338,7 +1338,7 @@ smcube_poll_measure(smcube *p, double to
+@@ -1339,7 +1339,7 @@ smcube_poll_measure(smcube *p, double to
  	p->XYZ[0] = IEEE754todouble(read_ORD32_be(buf + 4));
  	p->XYZ[1] = IEEE754todouble(read_ORD32_be(buf + 8));
  	p->XYZ[2] = IEEE754todouble(read_ORD32_be(buf + 12));
@@ -1462,7 +1444,7 @@ Index: trunk/spectro/smcube.c
  
  	icmLab2XYZ(&icmD50_100, p->XYZ, p->XYZ);
  
-@@ -2065,7 +2065,7 @@ int static smcube_save_calibration(smcub
+@@ -2066,7 +2066,7 @@ int static smcube_save_calibration(smcub
  	calf_wtime_ts(&x, &p->gdate, 1);
  	calf_wdoubles(&x, p->goff, 3);
  
@@ -1475,7 +1457,7 @@ Index: trunk/spectro/kleink10.c
 ===================================================================
 --- trunk.orig/spectro/kleink10.c
 +++ trunk/spectro/kleink10.c
-@@ -728,7 +728,7 @@ int ix					/* Klein calibration index 1
+@@ -729,7 +729,7 @@ int ix					/* Klein calibration index 1
  
  	if (buf[0] != 'D' || buf[1] != '1') {
  		amutex_unlock(p->lock);
@@ -1484,7 +1466,7 @@ Index: trunk/spectro/kleink10.c
  		return inst_protocol_error;
  	}
  
-@@ -2067,7 +2067,7 @@ int *pinstmsec) {	/* Return instrument r
+@@ -2068,7 +2068,7 @@ int *pinstmsec) {	/* Return instrument r
  			break;
  	}
  
@@ -1497,7 +1479,7 @@ Index: trunk/spectro/i1d3.c
 ===================================================================
 --- trunk.orig/spectro/i1d3.c
 +++ trunk/spectro/i1d3.c
-@@ -2503,7 +2503,7 @@ i1d3_init_coms(inst *pp, baud_rate br, f
+@@ -2522,7 +2522,7 @@ i1d3_init_coms(inst *pp, baud_rate br, f
  		a1logd(p->log, 1, "i1d3_init_coms: failed with rv = 0x%x\n",ev);
  		return ev;
  	}
@@ -1506,7 +1488,7 @@ Index: trunk/spectro/i1d3.c
  
  	p->gotcoms = 1;
  	return inst_ok;
-@@ -3179,7 +3179,7 @@ int *pinstmsec) {    /* Return instrumen
+@@ -3198,7 +3198,7 @@ int *pinstmsec) {    /* Return instrumen
  			break;
  	}
  
@@ -1519,7 +1501,7 @@ Index: trunk/spectro/i1disp.c
 ===================================================================
 --- trunk.orig/spectro/i1disp.c
 +++ trunk/spectro/i1disp.c
-@@ -1359,7 +1359,7 @@ i1disp_read_refrate(
+@@ -1360,7 +1360,7 @@ i1disp_read_refrate(
  			*ref_rate = rrate;
  		return inst_ok;
  	} else {
@@ -1532,7 +1514,7 @@ Index: trunk/ccast/ccmdns.c
 ===================================================================
 --- trunk.orig/ccast/ccmdns.c
 +++ trunk/ccast/ccmdns.c
-@@ -458,7 +458,7 @@ static int init_receive_mDNS(SOCKET *pso
+@@ -352,7 +352,7 @@ static int init_socket_mDNS(SOCKET *psoc
  		DWORD tv;
  		tv = 100;
  		if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv)) < 0) {
@@ -1541,7 +1523,7 @@ Index: trunk/ccast/ccmdns.c
  			closesocket(sock);
  			return 1;
  		}
-@@ -469,7 +469,7 @@ static int init_receive_mDNS(SOCKET *pso
+@@ -363,7 +363,7 @@ static int init_socket_mDNS(SOCKET *psoc
  		tv.tv_sec = 0;
  		tv.tv_usec = 100 * 1000;
  		if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (const char*)&tv, sizeof(tv)) < 0) {
@@ -1554,7 +1536,7 @@ Index: trunk/spectro/spyd2.c
 ===================================================================
 --- trunk.orig/spectro/spyd2.c
 +++ trunk/spectro/spyd2.c
-@@ -2915,7 +2915,7 @@ spyd2_init_coms(inst *pp, baud_rate br,
+@@ -2916,7 +2916,7 @@ spyd2_init_coms(inst *pp, baud_rate br,
  		return spyd2_interp_code((inst *)p, icoms2spyd2_err(se));
  	}
  
@@ -1563,7 +1545,7 @@ Index: trunk/spectro/spyd2.c
  
  	p->gotcoms = 1;
  	return inst_ok;
-@@ -3372,9 +3372,9 @@ spyd2_interp_error(inst *pp, int ec) {
+@@ -3373,9 +3373,9 @@ spyd2_interp_error(inst *pp, int ec) {
  		case SPYD2_BADREADSIZE:
  			return "Didn't read expected amount of data";
  		case SPYD2_TRIGTIMEOUT:
@@ -1579,16 +1561,16 @@ Index: trunk/spectro/specbos.c
 ===================================================================
 --- trunk.orig/spectro/specbos.c
 +++ trunk/spectro/specbos.c
-@@ -340,7 +340,7 @@ specbos_init_coms(inst *pp, baud_rate br
+@@ -351,7 +351,7 @@ specbos_init_coms(inst *pp, baud_rate br
  		a1logd(p->log, 2, "specbos_init_coms: unrecognised model %04d\n",p->model);
  		return inst_unknown_model;
  	}
 -	a1logd(p->log, 2, "specbos_init_coms: init coms has suceeded\n");
 +	a1logd(p->log, 2, "specbos_init_coms: init coms has succeeded\n");
  
- 	p->gotcoms = 1;
- 
-@@ -1559,7 +1559,7 @@ char id[CALIDLEN]		/* Condition identifi
+ 	/* See if it's a 1501 or 1511 */
+ 	if (p->model == 1501) {
+@@ -1669,7 +1669,7 @@ char id[CALIDLEN]		/* Condition identifi
  	if ((ev = specbos_get_n_a_cals((inst *)p, &needed, &available)) != inst_ok)
  		return ev;
  
@@ -1601,7 +1583,7 @@ Index: trunk/plot/plot.c
 ===================================================================
 --- trunk.orig/plot/plot.c
 +++ trunk/plot/plot.c
-@@ -2434,7 +2434,7 @@ static void dprintf(char *fmt, ...) {
+@@ -2459,7 +2459,7 @@ static void dprintf(char *fmt, ...) {
  printf("~1 found NtQueryInformationProcess\n"); fflush(stdout);
  			if(NtQueryInformationProcess(GetCurrentProcess(), 0,
  			    &pbi, sizeof(pbi), &ulSize) >= 0 && ulSize == sizeof(pbi)) {
@@ -1614,7 +1596,7 @@ Index: trunk/spectro/dtp22.c
 ===================================================================
 --- trunk.orig/spectro/dtp22.c
 +++ trunk/spectro/dtp22.c
-@@ -277,7 +277,7 @@ dtp22_init_coms(inst *pp, baud_rate br,
+@@ -276,7 +276,7 @@ dtp22_init_coms(inst *pp, baud_rate br,
  		return inst_coms_fail;
  	}
  
@@ -1627,7 +1609,7 @@ Index: trunk/spectro/dtp41.c
 ===================================================================
 --- trunk.orig/spectro/dtp41.c
 +++ trunk/spectro/dtp41.c
-@@ -255,7 +255,7 @@ dtp41_init_coms(inst *pp, baud_rate br,
+@@ -256,7 +256,7 @@ dtp41_init_coms(inst *pp, baud_rate br,
  		return inst_coms_fail;
  	}
  
@@ -1653,7 +1635,7 @@ Index: trunk/spectro/rspec.c
 ===================================================================
 --- trunk.orig/spectro/rspec.c
 +++ trunk/spectro/rspec.c
-@@ -955,7 +955,7 @@ int calf_open(calf *x, a1log *log, char
+@@ -957,7 +957,7 @@ int calf_open(calf *x, a1log *log, char
  	}
  	xdg_free(cal_paths, no_paths);
  
@@ -1666,7 +1648,7 @@ Index: trunk/spectro/chartread.c
 ===================================================================
 --- trunk.orig/spectro/chartread.c
 +++ trunk/spectro/chartread.c
-@@ -1172,7 +1172,7 @@ printf("~1 using emis mode\n");
+@@ -1171,7 +1171,7 @@ a1log *log			/* verb, debug & error log
  
  		/* Or something is wrong with instrument capabilities */
  		} else {
@@ -1675,7 +1657,7 @@ Index: trunk/spectro/chartread.c
  			it->del(it);
  			return -1;
  		}
-@@ -1685,7 +1685,7 @@ printf("~1 using emis mode\n");
+@@ -1684,7 +1684,7 @@ a1log *log			/* verb, debug & error log
  	
  			/* Or something is wrong with instrument capabilities */
  			} else {
@@ -1710,3 +1692,29 @@ Index: trunk/profile/mppprof.c
  	}
  
  	/* create and write the cgats profile */
+Index: trunk/spectro/i1pro_imp.h
+===================================================================
+--- trunk.orig/spectro/i1pro_imp.h
++++ trunk/spectro/i1pro_imp.h
+@@ -437,7 +437,7 @@ void del_i1proimp(i1pro *p);
+ #define I1PRO_INT_SAVE_SUBT_MODE        0x65		/* Can't save calibration if in subt mode */
+ #define I1PRO_INT_NO_CAL_TO_SAVE        0x66		/* No calibration data to save */
+ #define I1PRO_INT_EEPROM_DATA_MISSING   0x67		/* EEProm data is missing */
+-#define I1PRO_INT_NEW_RSPL_FAILED       0x68		/* Creating RSPL object faild */
++#define I1PRO_INT_NEW_RSPL_FAILED       0x68		/* Creating RSPL object failed */
+ #define I1PRO_INT_CAL_SAVE              0x69		/* Unable to save calibration to file */
+ #define I1PRO_INT_CAL_RESTORE           0x6A		/* Unable to restore calibration from file */
+ #define I1PRO_INT_CAL_TOUCH             0x6B		/* Unable to touch calibration file */
+Index: trunk/spectro/munki_imp.h
+===================================================================
+--- trunk.orig/spectro/munki_imp.h
++++ trunk/spectro/munki_imp.h
+@@ -386,7 +386,7 @@ void del_munkiimp(munki *p);
+ #define MUNKI_INT_CIECONVFAIL 	        0x61		/* Creating spectral to CIE converted failed */
+ #define MUNKI_INT_MALLOC                0x62		/* Error in mallocing memory */
+ #define MUNKI_INT_CREATE_EEPROM_STORE   0x63		/* Error in creating EEProm store */
+-#define MUNKI_INT_NEW_RSPL_FAILED       0x64		/* Creating RSPL object faild */
++#define MUNKI_INT_NEW_RSPL_FAILED       0x64		/* Creating RSPL object failed */
+ #define MUNKI_INT_CAL_SAVE              0x65		/* Unable to save calibration to file */
+ #define MUNKI_INT_CAL_RESTORE           0x66		/* Unable to restore calibration from file */
+ #define MUNKI_INT_CAL_TOUCH             0x67        /* Unable to touch calibration file */
diff --git a/debian/patches/0105_dispwin_segfault.patch b/debian/patches/0105_dispwin_segfault.patch
index 8134301..3ead582 100644
--- a/debian/patches/0105_dispwin_segfault.patch
+++ b/debian/patches/0105_dispwin_segfault.patch
@@ -10,7 +10,7 @@ Index: trunk/spectro/dispwin.c
 ===================================================================
 --- trunk.orig/spectro/dispwin.c
 +++ trunk/spectro/dispwin.c
-@@ -6055,6 +6055,7 @@ main(int argc, char *argv[]) {
+@@ -6277,6 +6277,7 @@ main(int argc, char *argv[]) {
  
  			/* Display number */
  			else if (argv[fa][1] == 'd') {
diff --git a/debian/patches/0115_hurd_PATH_MAX.patch b/debian/patches/0115_hurd_PATH_MAX.patch
index 3775edc..86f338d 100644
--- a/debian/patches/0115_hurd_PATH_MAX.patch
+++ b/debian/patches/0115_hurd_PATH_MAX.patch
@@ -38,7 +38,7 @@ Index: trunk/spectro/usbio_lx.c
 ===================================================================
 --- trunk.orig/spectro/usbio_lx.c
 +++ trunk/spectro/usbio_lx.c
-@@ -33,6 +33,10 @@
+@@ -34,6 +34,10 @@
  #define poll_x poll
  #endif
  
@@ -68,7 +68,7 @@ Index: trunk/spectro/hidio.c
 ===================================================================
 --- trunk.orig/spectro/hidio.c
 +++ trunk/spectro/hidio.c
-@@ -100,6 +100,10 @@
+@@ -101,6 +101,10 @@
  #endif
  #endif
  
diff --git a/debian/patches/0130_openssl.patch b/debian/patches/0130_openssl.patch
index b938ddc..5e000ee 100644
--- a/debian/patches/0130_openssl.patch
+++ b/debian/patches/0130_openssl.patch
@@ -13,7 +13,7 @@ Index: trunk/ccast/ccpacket.c
  #else
  	// Want to use TLS_client_method(), but older OpenSSL doesn't have it...
 -	if ((p->ctx = SSL_CTX_new(TLSv1_client_method())) == NULL)
-+	if ((p->ctx = SSL_CTX_new(SSLv23_client_method())) == NULL)
++	if ((p->ctx = SSL_CTX_new(TLS_client_method())) == NULL)
  #endif
  	{
  		DBG((g_log,0, "connect ssl_ctx_new failed\n"))
diff --git a/debian/rules b/debian/rules
index fe01084..b2ea050 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,8 @@ CRDATE=$(shell LC_ALL=C date --utc --date='@$(SOURCE_DATE_EPOCH)' "+%a %b %d %T
 	dh $@
 
 override_dh_auto_build:
+	find $(CURDIR) -name "*" | xargs chmod -R -x+X
+	chmod a+x $(CURDIR)/debian/rules
 	jam $(JAMCMDLINE) all
 
 override_dh_auto_install:
diff --git a/debian/watch b/debian/watch
index 00b6fcc..8592949 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 version=4
 
 #opts="dversionmangle=s/\+repack\d+$//" http://www.argyllcms.com/downloadsrc.html Argyll_V(.*)_src\.zip
-opts=dversionmangle=s/\+repack(.*)// \
-http://www.argyllcms.com/downloadsrc.html Argyll_V(.*)_src\.zip debian debian/repack.sh
+opts=dversionmangle=s/\+repack(.*)//,repacksuffix=+repack,compression=xz \
+https://www.argyllcms.com/downloadsrc.html Argyll_V(.*)_src\.zip