remove unwanted windows binaries

4 files changed, 119 insertions, 295 deletions

diff --git a/debian/patches/100_spelling.patch b/debian/patches/100_spelling.patch
index c86f79c..fc6894a 100644
--- a/debian/patches/100_spelling.patch
+++ b/debian/patches/100_spelling.patch
@@ -3,80 +3,11 @@ Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Last-Update: 2014-09-06
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/icc/icc.c
-===================================================================
---- trunk.orig/icc/icc.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/icc/icc.c	2014-09-04 13:18:05.797221556 +0200
-@@ -1466,7 +1466,7 @@
- 		case icSigViewingCondDescTag:
- 			return "Viewing Condition Description";
- 		case icSigViewingConditionsTag:
--			return "Viewing Condition Paramaters";
-+			return "Viewing Condition Parameters";
- 		default:
- 			sprintf(buf,"Unrecognized - %s",tag2str(sig));
- 			return buf;
-Index: trunk/spectro/ccxxmake.c
-===================================================================
---- trunk.orig/spectro/ccxxmake.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/ccxxmake.c	2014-09-04 13:18:05.797221556 +0200
-@@ -358,7 +358,7 @@
- 			/* COM port  */
- 			} else if (argv[fa][1] == 'c') {
- 				fa = nfa;
--				if (na == NULL) usage("Paramater expected following -c");
-+				if (na == NULL) usage("Parameter expected following -c");
- 				comno = atoi(na);
- 				if (comno < 1 || comno > 40) usage("-c parameter %d out of range",comno);
- 
-@@ -452,7 +452,7 @@
- 			/* Serial port flow control */
- 			} else if (argv[fa][1] == 'W') {
- 				fa = nfa;
--				if (na == NULL) usage("Paramater expected following -W");
-+				if (na == NULL) usage("Parameter expected following -W");
- 				if (na[0] == 'n' || na[0] == 'N')
- 					fc = fc_none;
- 				else if (na[0] == 'h' || na[0] == 'H')
 Index: trunk/spectro/dispcal.c
 ===================================================================
---- trunk.orig/spectro/dispcal.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/dispcal.c	2014-09-04 13:18:05.801221640 +0200
-@@ -1698,7 +1698,7 @@
- 			/* Serial port flow control */
- 			} else if (argv[fa][1] == 'W') {
- 				fa = nfa;
--				if (na == NULL) usage("Paramater expected following -W");
-+				if (na == NULL) usage("Parameter expected following -W");
- 				if (na[0] == 'n' || na[0] == 'N')
- 					fc = fc_none;
- 				else if (na[0] == 'h' || na[0] == 'H')
-@@ -1721,13 +1721,13 @@
- 			/* Black point correction amount */
- 			} else if (argv[fa][1] == 'k') {
- 				fa = nfa;
--				if (na == NULL) usage("Paramater expected following -k");
-+				if (na == NULL) usage("Parameter expected following -k");
- 				bkcorrect = atof(na);
- 				if (bkcorrect < 0.0 || bkcorrect > 1.0) usage("-k parameter must be between 0.0 and 1.0");
- 			/* Neutral blend rate (power) */
- 			} else if (argv[fa][1] == 'A') {
- 				fa = nfa;
--				if (na == NULL) usage("Paramater expected following -A");
-+				if (na == NULL) usage("Parameter expected following -A");
- 				x.nbrate = atof(na);
- 				if (x.nbrate < 0.05 || x.nbrate > 20.0) usage("-A parameter must be between 0.05 and 20.0");
- 			/* Black brightness */
-@@ -1757,7 +1757,7 @@
- 			/* COM port  */
- 			} else if (argv[fa][1] == 'c') {
- 				fa = nfa;
--				if (na == NULL) usage("Paramater expected following -c");
-+				if (na == NULL) usage("Parameter expected following -c");
- 				comport = atoi(na);
- 				if (comport < 1 || comport > 50) usage("-c parameter %d out of range",comport);
- 
-@@ -2753,7 +2753,7 @@
+--- trunk.orig/spectro/dispcal.c
++++ trunk/spectro/dispcal.c
+@@ -3059,7 +3059,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 */
@@ -85,24 +16,11 @@ Index: trunk/spectro/dispcal.c
  			/* It's safer to set the black level a bit low, and then the */
  			/* calibration curves can bump the low ones up. */
  			if (c == '1') {
-Index: trunk/spectro/dispread.c
-===================================================================
---- trunk.orig/spectro/dispread.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/dispread.c	2014-09-04 13:18:05.801221640 +0200
-@@ -368,7 +368,7 @@
- 			/* COM port  */
- 			} else if (argv[fa][1] == 'c') {
- 				fa = nfa;
--				if (na == NULL) usage("Paramater expected following -c");
-+				if (na == NULL) usage("Parameter expected following -c");
- 				comport = atoi(na);
- 				if (comport < 1 || comport > 50) usage("-c parameter %d out of range",comport);
- 
 Index: trunk/spectro/spotread.c
 ===================================================================
---- trunk.orig/spectro/spotread.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/spotread.c	2014-09-04 13:18:05.801221640 +0200
-@@ -472,7 +472,7 @@
+--- trunk.orig/spectro/spotread.c
++++ trunk/spectro/spotread.c
+@@ -483,7 +483,7 @@ int main(int argc, char *argv[]) {
  			/* COM port  */
  			} else if (argv[fa][1] == 'c') {
  				fa = nfa;
@@ -111,7 +29,7 @@ Index: trunk/spectro/spotread.c
  				{
  					comport = atoi(na);
  					if (comport < 1 || comport > 40) usage("-c parameter %d out of range",comport);
-@@ -481,7 +481,7 @@
+@@ -492,7 +492,7 @@ int main(int argc, char *argv[]) {
  			/* Display type */
  			} else if (argv[fa][1] == 'y') {
  				fa = nfa;
@@ -120,7 +38,7 @@ Index: trunk/spectro/spotread.c
  				dtype = na[0];
  
  #ifndef SALONEINSTLIB
-@@ -489,7 +489,7 @@
+@@ -500,7 +500,7 @@ int main(int argc, char *argv[]) {
  			} else if (argv[fa][1] == 'I') {
  
  				fa = nfa;
@@ -128,17 +46,17 @@ Index: trunk/spectro/spotread.c
 +				if (na == NULL) usage("Parameter expected following -I");
  				if (strcmp(na, "A") == 0
  				 || strcmp(na, "M0") == 0) {
- 					spec = 1;
-@@ -528,7 +528,7 @@
+ 					tillum_set = spec = 1;
+@@ -539,7 +539,7 @@ int main(int argc, char *argv[]) {
  			/* Spectral Illuminant type for XYZ computation */
  			} else if (argv[fa][1] == 'i') {
  				fa = nfa;
 -				if (na == NULL) usage("Paramater expected following -i");
 +				if (na == NULL) usage("Parameter expected following -i");
  				if (strcmp(na, "A") == 0) {
- 					spec = 1;
+ 					illum_set = spec = 1;
  					illum = icxIT_A;
-@@ -568,7 +568,7 @@
+@@ -579,7 +579,7 @@ int main(int argc, char *argv[]) {
  			/* Spectral Observer type */
  			} else if (argv[fa][1] == 'Q') {
  				fa = nfa;
@@ -147,7 +65,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 */
-@@ -646,7 +646,7 @@
+@@ -657,7 +657,7 @@ int main(int argc, char *argv[]) {
  			/* Filter configuration */
  			} else if (argv[fa][1] == 'F') {
  				fa = nfa;
@@ -156,7 +74,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')
-@@ -661,7 +661,7 @@
+@@ -672,7 +672,7 @@ int main(int argc, char *argv[]) {
  			/* Extra filter compensation file */
  			} else if (argv[fa][1] == 'E') {
  				fa = nfa;
@@ -167,9 +85,9 @@ Index: trunk/spectro/spotread.c
  			/* Show Yxy */
 Index: trunk/spectro/colorhug.c
 ===================================================================
---- trunk.orig/spectro/colorhug.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/colorhug.c	2014-09-04 13:18:05.801221640 +0200
-@@ -210,7 +210,7 @@
+--- trunk.orig/spectro/colorhug.c
++++ trunk/spectro/colorhug.c
+@@ -212,7 +212,7 @@ colorhug_command(colorhug *p,
  
  	a1logd(p->log,8,"colorhug_command: Read %d bytes and %d read\n",xrbytes,rbytes);
  	if (rbytes >= 2) {
@@ -180,9 +98,9 @@ Index: trunk/spectro/colorhug.c
  				icoms_tohex(buf, rbytes - 2));
 Index: trunk/spectro/dispwin.c
 ===================================================================
---- trunk.orig/spectro/dispwin.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/dispwin.c	2014-09-04 13:18:05.805221723 +0200
-@@ -2727,7 +2727,7 @@
+--- trunk.orig/spectro/dispwin.c
++++ trunk/spectro/dispwin.c
+@@ -2734,7 +2734,7 @@ int dispwin_install_profile(dispwin *p,
  
  /* Un-Install a display profile */
  /* Return nz if failed, */
@@ -191,8 +109,8 @@ Index: trunk/spectro/dispwin.c
  /* 2 if profile not found */
  int dispwin_uninstall_profile(dispwin *p, char *fname, p_scope scope) {
  	debugr2((errout,"dispwin_uninstall_profile '%s'\n", fname));
-@@ -5089,7 +5089,7 @@
- 		p->native &= ~2;
+@@ -5123,7 +5123,7 @@ int ddebug						/* >0 to print debug sta
+ 		p->native = native &= ~2;
  	}
  
 -	debugr("new_dispwin: return sucessfully\n");
@@ -202,9 +120,9 @@ Index: trunk/spectro/dispwin.c
  
 Index: trunk/spectro/dtp51.c
 ===================================================================
---- trunk.orig/spectro/dtp51.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/dtp51.c	2014-09-04 13:18:05.805221723 +0200
-@@ -678,7 +678,7 @@
+--- trunk.orig/spectro/dtp51.c
++++ trunk/spectro/dtp51.c
+@@ -678,7 +678,7 @@ dtp51_interp_error(inst *pp, int ec) {
  		case DTP51_INVALID_STEP:
  			return "Invalid step";
  		case DTP51_NO_DATA_AVAILABLE:
@@ -215,9 +133,9 @@ Index: trunk/spectro/dtp51.c
  		case DTP51_LAMP_FAILURE:
 Index: trunk/spectro/dtp92.c
 ===================================================================
---- trunk.orig/spectro/dtp92.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/dtp92.c	2014-09-04 13:18:05.805221723 +0200
-@@ -888,7 +888,7 @@
+--- trunk.orig/spectro/dtp92.c
++++ trunk/spectro/dtp92.c
+@@ -928,7 +928,7 @@ dtp92_interp_error(inst *pp, int ec) {
  		case DTP92_NO_DATA_AVAILABLE:
  			return "No data available";
  		case DTP92_MISSING_PARAMETER:
@@ -228,9 +146,9 @@ Index: trunk/spectro/dtp92.c
  		case DTP92_NEEDS_OFFSET_CAL:
 Index: trunk/spectro/hidio.c
 ===================================================================
---- trunk.orig/spectro/hidio.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/hidio.c	2014-09-04 13:18:05.805221723 +0200
-@@ -726,7 +726,7 @@
+--- trunk.orig/spectro/hidio.c
++++ trunk/spectro/hidio.c
+@@ -739,7 +739,7 @@ icoms_hid_read(icoms *p,
  	{
  		unsigned char *rbuf2;
  
@@ -241,9 +159,9 @@ Index: trunk/spectro/hidio.c
  			return ICOM_SYS;
 Index: trunk/spectro/huey.c
 ===================================================================
---- trunk.orig/spectro/huey.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/huey.c	2014-09-04 13:18:05.805221723 +0200
-@@ -81,7 +81,7 @@
+--- trunk.orig/spectro/huey.c
++++ trunk/spectro/huey.c
+@@ -81,7 +81,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 */
@@ -254,9 +172,9 @@ Index: trunk/spectro/huey.c
  /* rbuf[-2] is continuation byte */
 Index: trunk/spectro/i1pro_imp.c
 ===================================================================
---- trunk.orig/spectro/i1pro_imp.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/i1pro_imp.c	2014-09-04 13:18:05.809221806 +0200
-@@ -3691,7 +3691,7 @@
+--- trunk.orig/spectro/i1pro_imp.c
++++ trunk/spectro/i1pro_imp.c
+@@ -3757,7 +3757,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
  		return I1PRO_OK;
  	}
  
@@ -265,7 +183,7 @@ Index: trunk/spectro/i1pro_imp.c
  	s->dark_valid = 1;
  	s->ddate = m->caldate;
  
-@@ -3736,7 +3736,7 @@
+@@ -3802,7 +3802,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
  		return I1PRO_OK;
  	}
  
@@ -276,9 +194,9 @@ Index: trunk/spectro/i1pro_imp.c
  
 Index: trunk/spectro/madvrwin.c
 ===================================================================
---- trunk.orig/spectro/madvrwin.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/madvrwin.c	2014-09-04 13:18:05.809221806 +0200
-@@ -582,7 +582,7 @@
+--- trunk.orig/spectro/madvrwin.c
++++ trunk/spectro/madvrwin.c
+@@ -602,7 +602,7 @@ int ii = 0;
  	}
  #endif
  
@@ -289,9 +207,9 @@ Index: trunk/spectro/madvrwin.c
  }
 Index: trunk/spectro/ss.c
 ===================================================================
---- trunk.orig/spectro/ss.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/ss.c	2014-09-04 13:18:05.809221806 +0200
-@@ -1787,7 +1787,7 @@
+--- trunk.orig/spectro/ss.c
++++ trunk/spectro/ss.c
+@@ -1786,7 +1786,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:
@@ -302,9 +220,9 @@ Index: trunk/spectro/ss.c
  	}
 Index: trunk/spectro/ss_imp.c
 ===================================================================
---- trunk.orig/spectro/ss_imp.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/ss_imp.c	2014-09-04 13:18:05.809221806 +0200
-@@ -216,7 +216,7 @@
+--- trunk.orig/spectro/ss_imp.c
++++ trunk/spectro/ss_imp.c
+@@ -216,7 +216,7 @@ static int h2b(ss *p, char c) {
  	return 0;
  }
  
@@ -315,9 +233,9 @@ Index: trunk/spectro/ss_imp.c
  
 Index: trunk/spectro/webwin.c
 ===================================================================
---- trunk.orig/spectro/webwin.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/webwin.c	2014-09-04 13:18:05.809221806 +0200
-@@ -513,7 +513,7 @@
+--- trunk.orig/spectro/webwin.c
++++ trunk/spectro/webwin.c
+@@ -408,7 +408,7 @@ int ddebug						/* >0 to print debug sta
  		msec_sleep(50);
  	}
  
@@ -328,9 +246,9 @@ Index: trunk/spectro/webwin.c
  }
 Index: trunk/xicc/cv.c
 ===================================================================
---- trunk.orig/xicc/cv.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/xicc/cv.c	2014-09-04 13:18:05.809221806 +0200
-@@ -100,7 +100,7 @@
+--- trunk.orig/xicc/cv.c
++++ trunk/xicc/cv.c
+@@ -101,7 +101,7 @@ main(int argc, char *argv[]) {
  
  	printf("There are %d parameters:\n",np); fflush(stdout);
  	for (i = 0; i < np; i++) {
@@ -341,9 +259,9 @@ Index: trunk/xicc/cv.c
  	/* Display the result */
 Index: trunk/spectro/ss_imp.h
 ===================================================================
---- trunk.orig/spectro/ss_imp.h	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/ss_imp.h	2014-09-04 13:18:05.809221806 +0200
-@@ -720,7 +720,7 @@
+--- trunk.orig/spectro/ss_imp.h
++++ trunk/spectro/ss_imp.h
+@@ -720,7 +720,7 @@ void ss_add_string(struct _ss *p, char *
  /* - - - - - - - - - - - - - - - - - - - - - */
  /* ANSWER: */
  
@@ -354,9 +272,9 @@ Index: trunk/spectro/ss_imp.h
  /* Remove a Spectrolino answer enum from the revieve buffer, */
 Index: trunk/imdi/cctiff.c
 ===================================================================
---- trunk.orig/imdi/cctiff.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/imdi/cctiff.c	2014-09-04 13:18:05.809221806 +0200
-@@ -32,7 +32,7 @@
+--- trunk.orig/imdi/cctiff.c
++++ trunk/imdi/cctiff.c
+@@ -36,7 +36,7 @@
  	Add flag to ignore inkname mismatches.
  
  
@@ -365,7 +283,7 @@ Index: trunk/imdi/cctiff.c
  	planes from input to output, rather than simply ignoring them.
  
  
-@@ -1934,11 +1934,11 @@
+@@ -1942,11 +1942,11 @@ main(int argc, char *argv[]) {
  
  		if (wh != NULL) {
  			printf("Output TIFF file '%s'\n",out_name);
@@ -381,9 +299,9 @@ Index: trunk/imdi/cctiff.c
  				printf("Output raster file description: '%s'\n",wdesc);
 Index: trunk/imdi/imdi.h
 ===================================================================
---- trunk.orig/imdi/imdi.h	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/imdi/imdi.h	2014-09-04 13:18:05.809221806 +0200
-@@ -38,7 +38,7 @@
+--- trunk.orig/imdi/imdi.h
++++ trunk/imdi/imdi.h
+@@ -38,7 +38,7 @@ struct _imdi {
  
  	/* Note that once an imdi is created, multiple can call interp() without */
  	/* interfering with each other, allowing parallel execution. */
@@ -394,9 +312,9 @@ Index: trunk/imdi/imdi.h
  
 Index: trunk/spectro/munki_imp.c
 ===================================================================
---- trunk.orig/spectro/munki_imp.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/munki_imp.c	2014-09-04 13:18:05.813221888 +0200
-@@ -6358,7 +6358,7 @@
+--- trunk.orig/spectro/munki_imp.c
++++ trunk/spectro/munki_imp.c
+@@ -6391,7 +6391,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 */
@@ -407,9 +325,9 @@ Index: trunk/spectro/munki_imp.c
  	munki_code ev = MUNKI_OK;
 Index: trunk/target/printtarg.c
 ===================================================================
---- trunk.orig/target/printtarg.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/target/printtarg.c	2014-09-04 13:18:05.813221888 +0200
-@@ -2946,7 +2946,7 @@
+--- trunk.orig/target/printtarg.c
++++ trunk/target/printtarg.c
+@@ -2953,7 +2953,7 @@ char *argv[];
  	double sscale = 1.0;	/* Spacer size scale */
  	int rand = 1;
  	int qbits = 0;			/* Quantization bits */
@@ -420,9 +338,9 @@ Index: trunk/target/printtarg.c
  	double tiffres = 100.0;	/* TIFF resolution in DPI */
 Index: trunk/gamut/nearsmth.c
 ===================================================================
---- trunk.orig/gamut/nearsmth.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/gamut/nearsmth.c	2014-09-04 13:18:05.813221888 +0200
-@@ -259,7 +259,7 @@
+--- trunk.orig/gamut/nearsmth.c
++++ trunk/gamut/nearsmth.c
+@@ -261,7 +261,7 @@ double dxratio		/* Depth expansion ratio
  	double va, vr = 0.0, vl, vd, vv = 0.0;
  
  	/* Absolute, Delta E^2 between test point and destination closest */
@@ -431,29 +349,20 @@ Index: trunk/gamut/nearsmth.c
  	/* so weight as per average of these */
  	a_o = w->a.o;
  	va = wdesq(dtp, aodv, a_o, a_o, a_o, SUM_POW);
-@@ -1299,7 +1299,7 @@
- 	return 0;
- }
- 
--/* Tweak weights acording to extra cmy cusp flags or rel override */
-+/* Tweak weights according to extra cmy cusp flags or rel override */
- void tweak_weights(gammapweights out[14], int dst_cmymap, int rel_oride)  {
- 	int i;
- 
-@@ -3508,7 +3508,7 @@
+@@ -3598,7 +3598,7 @@ static void create_influence_plot(nearsm
  	swdiag = new_rspl(RSPL_NOFLAGS, 3, 3);	/* Allocate 3D -> 3D */
  	swdiag->fit_rspl(swdiag, RSPL_NOFLAGS, fpnts, nmpts, NULL, NULL, gres, NULL, NULL, 1.0, avgdev, NULL);
  
 -	/* Now create a plot of the sci_gam with the vertexes colored acording to the */
 +	/* Now create a plot of the sci_gam with the vertexes colored according to the */
  	/* diagnostic map. */
- 	if ((wrl = new_vrml("sci_gam_wt.wrl", 1)) == NULL) {
- 		fprintf(stderr,"gamut map: new_vrml failed\n");
+ 	if ((wrl = new_vrml("sci_gam_wt", 1, vrml_lab)) == NULL) {
+ 		fprintf(stderr,"gamut map: new_vrml failed for '%s%s'\n","sci_gam_wt",vrm_ext());
 Index: trunk/gamut/nearsmth.h
 ===================================================================
---- trunk.orig/gamut/nearsmth.h	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/gamut/nearsmth.h	2014-09-04 13:18:05.813221888 +0200
-@@ -267,7 +267,7 @@
+--- trunk.orig/gamut/nearsmth.h
++++ trunk/gamut/nearsmth.h
+@@ -274,7 +274,7 @@ gammapweights *src1, double wgt1,
  gammapweights *src2, double wgt2
  );
  
@@ -464,9 +373,9 @@ Index: trunk/gamut/nearsmth.h
  #endif /* NEARSMTH_H */
 Index: trunk/imdi/cctiffo.c
 ===================================================================
---- trunk.orig/imdi/cctiffo.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/imdi/cctiffo.c	2014-09-04 13:18:05.813221888 +0200
-@@ -307,7 +307,7 @@
+--- trunk.orig/imdi/cctiffo.c
++++ trunk/imdi/cctiffo.c
+@@ -307,7 +307,7 @@ int pmtc
  		case PHOTOMETRIC_LOGLUV:
  			return "CIELog2Luv";
  	}
@@ -477,9 +386,9 @@ Index: trunk/imdi/cctiffo.c
  
 Index: trunk/imdi/greytiff.c
 ===================================================================
---- trunk.orig/imdi/greytiff.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/imdi/greytiff.c	2014-09-04 13:18:05.813221888 +0200
-@@ -131,7 +131,7 @@
+--- trunk.orig/imdi/greytiff.c
++++ trunk/imdi/greytiff.c
+@@ -132,7 +132,7 @@ int pmtc
  		case PHOTOMETRIC_LOGLUV:
  			return "CIELog2Luv";
  	}
@@ -490,9 +399,9 @@ Index: trunk/imdi/greytiff.c
  
 Index: trunk/link/collink.c
 ===================================================================
---- trunk.orig/link/collink.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/link/collink.c	2014-09-04 13:18:05.817221971 +0200
-@@ -899,7 +899,7 @@
+--- trunk.orig/link/collink.c
++++ trunk/link/collink.c
+@@ -1134,7 +1134,7 @@ void devip_devop(void *cntx, double *out
  			}
  			/* We've got the input profile PCS' at this point. */
  
@@ -501,7 +410,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. */  
-@@ -1039,7 +1039,7 @@
+@@ -1265,7 +1265,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 */
@@ -510,24 +419,11 @@ 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];
-Index: trunk/profile/invprofcheck.c
-===================================================================
---- trunk.orig/profile/invprofcheck.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/profile/invprofcheck.c	2014-09-04 13:18:05.817221971 +0200
-@@ -94,7 +94,7 @@
- 	fprintf(stderr," -k           Show CIEDE2000 delta E values\n");
- 	fprintf(stderr," -w           create VRML visualisation (profile.wrl)\n");
- 	fprintf(stderr," -x           Use VRML axes\n");
--	fprintf(stderr," -e           Color vectors acording to delta E\n");
-+	fprintf(stderr," -e           Color vectors according to delta E\n");
- 	fprintf(stderr," profile.icm  Profile to check\n");
- 	exit(1);
- }
 Index: trunk/profile/printcal.c
 ===================================================================
---- trunk.orig/profile/printcal.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/profile/printcal.c	2014-09-04 13:18:05.817221971 +0200
-@@ -1289,7 +1289,7 @@
+--- trunk.orig/profile/printcal.c
++++ trunk/profile/printcal.c
+@@ -1290,7 +1290,7 @@ int main(int argc, char *argv[]) {
  				icmXYZ2Lab(&wht, wp->Lab, wp->XYZ);
  			}
  
@@ -536,24 +432,11 @@ Index: trunk/profile/printcal.c
  			/* For a consistent result for identical device values, */
  			/* secondary sort by inverse CIE value */
  //#define HEAP_COMPARE(A,B) ((A).dev < (B).dev)
-Index: trunk/profile/profcheck.c
-===================================================================
---- trunk.orig/profile/profcheck.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/profile/profcheck.c	2014-09-04 13:18:05.817221971 +0200
-@@ -54,7 +54,7 @@
- 	fprintf(stderr," -w              create VRML visualisation (iccprofile.wrl)\n");
- 	fprintf(stderr," -x              Use VRML axes\n");
- 	fprintf(stderr," -m              Make VRML lines a minimum of 0.5\n");
--	fprintf(stderr," -e              Color vectors acording to delta E\n");
-+	fprintf(stderr," -e              Color vectors according to delta E\n");
- 	fprintf(stderr," -d devval1,deval2,devvalN\n");
- 	fprintf(stderr,"                 Specify a device value to sort against\n");
- 	fprintf(stderr," -p              Sort device value by PCS (Lab) target\n");
 Index: trunk/spectro/dispsup.c
 ===================================================================
---- trunk.orig/spectro/dispsup.c	2014-09-04 13:18:05.821222055 +0200
-+++ trunk/spectro/dispsup.c	2014-09-04 13:18:05.817221971 +0200
-@@ -604,7 +604,7 @@
+--- trunk.orig/spectro/dispsup.c
++++ trunk/spectro/dispsup.c
+@@ -707,7 +707,7 @@ static int disprd_read_imp(
  		scb->serno = p->serno++;
  		scb->msec = msec_time();
  
@@ -564,9 +447,9 @@ Index: trunk/spectro/dispsup.c
  		scb->mtype = val.mtype;
 Index: trunk/gamut/gammap.c
 ===================================================================
---- trunk.orig/gamut/gammap.c	2014-01-31 05:08:51.000000000 +0100
-+++ trunk/gamut/gammap.c	2014-09-04 13:21:15.557161603 +0200
-@@ -760,7 +760,7 @@
+--- trunk.orig/gamut/gammap.c
++++ trunk/gamut/gammap.c
+@@ -775,7 +775,7 @@ gammap *new_gammap(
  #endif
  			if (gmi->bph == gmm_clipBP) {
  
@@ -577,9 +460,9 @@ Index: trunk/gamut/gammap.c
  					t = (fabp[0] - dr_cs_wp[0])/(dr_cs_bp[0] - dr_cs_wp[0]);
 Index: trunk/profile/profout.c
 ===================================================================
---- trunk.orig/profile/profout.c	2014-01-31 05:09:02.000000000 +0100
-+++ trunk/profile/profout.c	2014-09-04 13:21:56.566012838 +0200
-@@ -1052,7 +1052,7 @@
+--- trunk.orig/profile/profout.c
++++ trunk/profile/profout.c
+@@ -1048,7 +1048,7 @@ make_output_icc(
  		if (iccver < icmVersion2_4) {
  			iccver = icmVersion2_4;		/* Need 2.4.0 for Display intents */
  			if (verb)
@@ -590,9 +473,9 @@ Index: trunk/profile/profout.c
  	if (wr_icco->set_version(wr_icco, iccver) != 0)
 Index: trunk/render/thscreen.c
 ===================================================================
---- trunk.orig/render/thscreen.c	2014-01-31 05:09:05.000000000 +0100
-+++ trunk/render/thscreen.c	2014-09-04 13:22:40.638927581 +0200
-@@ -396,7 +396,7 @@
+--- trunk.orig/render/thscreen.c
++++ trunk/render/thscreen.c
+@@ -624,7 +624,7 @@ thscreen *new_thscreen(
  	mrang = 65535.0/(t->oelev - 1.0); 
  	DBG(("new_thscreen() raw modulation rande = %f\n",mrang));
  
@@ -603,9 +486,9 @@ Index: trunk/render/thscreen.c
  		DBG(("new_thscreen() modulation adjusted for overlap = %f\n",mrang));
 Index: trunk/xicc/xspect.c
 ===================================================================
---- trunk.orig/xicc/xspect.c	2014-01-31 05:08:53.000000000 +0100
-+++ trunk/xicc/xspect.c	2014-09-04 13:23:27.695904152 +0200
-@@ -3462,7 +3462,7 @@
+--- trunk.orig/xicc/xspect.c
++++ trunk/xicc/xspect.c
+@@ -3583,7 +3583,7 @@ void xspect_plot(xspect *sp1, xspect *sp
  /* 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. */
diff --git a/debian/patches/110_dispwin_segfault.patch b/debian/patches/110_dispwin_segfault.patch
index 62c40ff..1e65a0d 100644
--- a/debian/patches/110_dispwin_segfault.patch
+++ b/debian/patches/110_dispwin_segfault.patch
@@ -8,9 +8,9 @@ Last-Update: 2014-09-14
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/spectro/dispwin.c
 ===================================================================
---- trunk.orig/spectro/dispwin.c	2014-09-10 16:05:36.633175564 +0200
-+++ trunk/spectro/dispwin.c	2014-09-10 16:06:16.781967935 +0200
-@@ -5493,6 +5493,7 @@
+--- trunk.orig/spectro/dispwin.c
++++ trunk/spectro/dispwin.c
+@@ -5547,6 +5547,7 @@ main(int argc, char *argv[]) {
  
  			/* Display number */
  			else if (argv[fa][1] == 'd') {
diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch
index ffd9e1b..358811f 100644
--- a/debian/patches/15_jam.patch
+++ b/debian/patches/15_jam.patch
@@ -4,70 +4,11 @@ Forwarded: http://www.freelists.org/post/argyllcms/Some-buildsystem-issues
 Last-Update: 2014-09-25
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/Jamtop
-===================================================================
---- trunk.orig/Jamtop	2014-09-28 14:35:52.016329546 +0200
-+++ trunk/Jamtop	2014-09-28 14:44:07.039261307 +0200
-@@ -109,12 +109,17 @@
- 
- # 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  [ 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 ] { 
-+	if    [ GLOB /usr/include : tiffio.h ]
-+	   || [ GLOB /usr/local/include : tiffio.h ]
-+	   || [ GLOB /usr/include/$(DEB_HOST_MULTIARCH) : 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/$(DEB_HOST_MULTIARCH) : libtiff.so ]
-+		 || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libtiff.a ]
-+		 || [ GLOB /usr/local/lib : libtiff.so ]
-+		 || [ GLOB /usr/local/lib : libtiff.a ] {
- 			echo "Using system TIFF library" ;
- 			TIFFLIB = ;
- 			TIFFINC = ;
-@@ -124,6 +129,7 @@
- 	}
- }
- 
-+
- # If nothing else, use Argyll supplied TIFF library
- if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) {
- 	echo "Using Argyll TIFF library" ;
-@@ -133,12 +139,16 @@
- 
- # See if we have a system JPEG library.
- if ! $(BUILTIN_JPEG) && $(UNIX) {
--	if [ GLOB /usr/include : jpeglib.h ] || [ GLOB /usr/local/include : jpeglib.h ] {
--		if  [ GLOB /usr/lib : libjpeg.so ] || [ GLOB /usr/lib : libjpeg.a ]
--		 || [ GLOB /usr/lib64 : libjpeg.so ] || [ GLOB /usr/lib64 : libjpeg.a ]
--		 || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ]
--		 || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ]
--		 || [ GLOB /usr/local/lib : libjpeg.so ] || [ GLOB /usr/local/lib : libjpeg.a ] {
-+	if    [ GLOB /usr/include : jpeglib.h ] 
-+	   || [ GLOB /usr/local/include : jpeglib.h ] {
-+		if    [ GLOB /usr/lib : libjpeg.so ] 
-+		   || [ GLOB /usr/lib : libjpeg.a ]
-+		   || [ GLOB /usr/lib64 : libjpeg.so ] 
-+		   || [ GLOB /usr/lib64 : libjpeg.a ]
-+		   || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libjpeg.so ]
-+		   || [ GLOB /usr/lib/$(DEB_HOST_MULTIARCH) : libjpeg.a ]
-+		   || [ GLOB /usr/local/lib : libjpeg.so ] 
-+		   || [ GLOB /usr/local/lib : libjpeg.a ] {
- 			echo "Using system JPEG library" ;
- 			JPEGLIB = ;
- 			JPEGINC = ;
 Index: trunk/Jambase
 ===================================================================
---- trunk.orig/Jambase	2014-09-28 14:35:52.016329546 +0200
-+++ trunk/Jambase	2014-09-28 14:35:52.016329546 +0200
-@@ -880,7 +880,7 @@
+--- trunk.orig/Jambase
++++ trunk/Jambase
+@@ -941,7 +941,7 @@ else if $(UNIX)
  
  	# UNIX defaults
  
@@ -76,7 +17,7 @@ Index: trunk/Jambase
  	CCOPTFLAG		?= -O2 ;		
  	CCDEBUGFLAG		?= -g ;		
  	CCPROFFLAG		?= ;		
-@@ -890,7 +890,7 @@
+@@ -951,7 +951,7 @@ else if $(UNIX)
  	CHGRP			?= chgrp ;
  	CHOWN			?= chown ;
  	LEX				?= lex ;
@@ -85,7 +26,7 @@ Index: trunk/Jambase
  	LINKOPTFLAG		?= -O ;				# Affects creating .so's
  	LINKSTRIPFLAG	?= -s ;
  	LINKDEBUGFLAG	?= ;
-@@ -971,7 +971,7 @@
+@@ -1037,7 +1037,7 @@ else if $(UNIX)
  	RMDIR			?= $(RM) ;
  	RSH				?= rsh ;
  	SED				?= sed ;
diff --git a/debian/patches/series b/debian/patches/series
index 7c01f21..96849a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-110_dispwin_segfault.patch
-100_spelling.patch
+#110_dispwin_segfault.patch
+#100_spelling.patch
 15_jam.patch
-20_hurd_PATH_MAX.patch
-120_usb-db_new.patch
-25_kfreebsd.patch
+#20_hurd_PATH_MAX.patch
+#120_usb-db_new.patch
+#25_kfreebsd.patch