Refresh patches

4 files changed, 142 insertions, 8 deletions

diff --git a/debian/argyll-doc.doc-base b/debian/argyll-doc.doc-base
index 962b063..11a7dac 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
+Index: /usr/share/doc/argyll-doc/ArgyllDoc.html.gz
 Files: /usr/share/doc/argyll-doc/*.html
diff --git a/debian/copyright b/debian/copyright
index a378f6f..57c4f15 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact:  Graeme W. Gill <Graeme@argyllcms.com>
 Source: http://www.argyllcms.com/
 
 Files: *
-Copyright: 1995-2010 Graeme W. Gill <Graeme@argyllcms.com>
+Copyright: 1995-2015 Graeme W. Gill <Graeme@argyllcms.com>
 License: AGPL-3
 
 Files: icc/*
@@ -19,16 +19,20 @@ Copyright: 1994-1998 SunSoft, Inc
            1994-2014 Graeme W. Gill <Graeme@argyllcms.com>
 License: Expat
 
-Files: jcnf/yajl/*
-Copyright: 2007-2009 Lloyd Hilaiel
+Files: yajl/yajl_tree.*
+Copyright: 2010-2011 Florian Forster <ff@octo.it>
+License: BSD-3
+
+Files: yajl/*
+Copyright: 2007-2014 Lloyd Hilaiel
 License: BSD-3
 
-Files: jpg/*
+Files: jpeg/*
 Copyright: 1991-2012 Thomas G. Lane
            1991-2012 Guido Vollbeding
 License: libjpeg
 
-Files: jpg/ansi2knr.c
+Files: jpeg/ansi2knr.c
 Copyright: 1989-2000 Aladdin Enterprises
 License: GPL-1
 
diff --git a/debian/patches/100_spelling.patch b/debian/patches/100_spelling.patch
index fc6894a..078136c 100644
--- a/debian/patches/100_spelling.patch
+++ b/debian/patches/100_spelling.patch
@@ -7,6 +7,40 @@ Index: trunk/spectro/dispcal.c
 ===================================================================
 --- trunk.orig/spectro/dispcal.c
 +++ trunk/spectro/dispcal.c
+@@ -1937,7 +1937,7 @@ int main(int argc, char *argv[]) {
+ 			/* Serial port flow control */
+ 			} else if (argv[fa][1] == 'W') {
+ 				fa = nfa;
+-				if (na == NULL) usage(0,"Paramater expected following -W");
++				if (na == NULL) usage(0,"Parameter expected following -W");
+ 				if (na[0] == 'n' || na[0] == 'N')
+ 					fc = fc_none;
+ 				else if (na[0] == 'h' || na[0] == 'H')
+@@ -1960,13 +1960,13 @@ int main(int argc, char *argv[]) {
+ 			/* Black point correction amount */
+ 			} else if (argv[fa][1] == 'k') {
+ 				fa = nfa;
+-				if (na == NULL) usage(0,"Paramater expected following -k");
++				if (na == NULL) usage(0,"Parameter expected following -k");
+ 				bkcorrect = atof(na);
+ 				if (bkcorrect < 0.0 || bkcorrect > 1.0) usage(0,"-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(0,"Paramater expected following -A");
++				if (na == NULL) usage(0,"Parameter expected following -A");
+ 				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 */
+@@ -1996,7 +1996,7 @@ int main(int argc, char *argv[]) {
+ 			/* COM port  */
+ 			} else if (argv[fa][1] == 'c') {
+ 				fa = nfa;
+-				if (na == NULL) usage(0,"Paramater expected following -c");
++				if (na == NULL) usage(0,"Parameter expected following -c");
+ 				comport = atoi(na);
+ 				if (comport < 1 || comport > 50) usage(0,"-c parameter %d out of range",comport);
+ 
 @@ -3059,7 +3059,7 @@ int main(int argc, char *argv[]) {
  			/* Black level adjustment */
  			/* Due to the possibility of the channel offsets not being even, */
@@ -428,7 +462,7 @@ Index: trunk/profile/printcal.c
  			}
  
 -			/* Sort the channel acording to device value */ 
-+			/* Sort the channel according to device value */ 
++			/* Sort the channel according to device value */
  			/* For a consistent result for identical device values, */
  			/* secondary sort by inverse CIE value */
  //#define HEAP_COMPARE(A,B) ((A).dev < (B).dev)
@@ -497,3 +531,99 @@ Index: trunk/xicc/xspect.c
  void xsp_setUV(xspect *out, xspect *in, double uvlevel) {
  	int i, xs, xe;
  	double ww, avg;
+Index: trunk/spectro/ccxxmake.c
+===================================================================
+--- trunk.orig/spectro/ccxxmake.c
++++ trunk/spectro/ccxxmake.c
+@@ -395,7 +395,7 @@ int main(int argc, char *argv[]) {
+ 			/* COM port  */
+ 			} else if (argv[fa][1] == 'c') {
+ 				fa = nfa;
+-				if (na == NULL) usage(0,"Paramater expected following -c");
++				if (na == NULL) usage(0,"Parameter expected following -c");
+ 				comno = atoi(na);
+ 				if (comno < 1 || comno > 40) usage(0,"-c parameter %d out of range",comno);
+ 
+@@ -495,7 +495,7 @@ int main(int argc, char *argv[]) {
+ 			/* Serial port flow control */
+ 			} else if (argv[fa][1] == 'W') {
+ 				fa = nfa;
+-				if (na == NULL) usage(0,"Paramater expected following -W");
++				if (na == NULL) usage(0,"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/ccwin.c
+===================================================================
+--- trunk.orig/spectro/ccwin.c
++++ trunk/spectro/ccwin.c
+@@ -686,7 +686,7 @@ int ddebug						/* >0 to print debug sta
+ 		return NULL;
+ 	}
+ 
+-	debugr("new_ccwin: return sucessfully\n");
++	debugr("new_ccwin: return successfully\n");
+ 
+ 	return p;
+ }
+Index: trunk/spectro/dispread.c
+===================================================================
+--- trunk.orig/spectro/dispread.c
++++ trunk/spectro/dispread.c
+@@ -409,7 +409,7 @@ int main(int argc, char *argv[]) {
+ 			/* COM port  */
+ 			} else if (argv[fa][1] == 'c') {
+ 				fa = nfa;
+-				if (na == NULL) usage(0,"Paramater expected following -c");
++				if (na == NULL) usage(0,"Parameter expected following -c");
+ 				comport = atoi(na);
+ 				if (comport < 1 || comport > 50) usage(0,"-c parameter %d out of range",comport);
+ 
+Index: trunk/spectro/fakeread.c
+===================================================================
+--- trunk.orig/spectro/fakeread.c
++++ trunk/spectro/fakeread.c
+@@ -811,7 +811,7 @@ int main(int argc, char *argv[])
+ 
+ 		/* We're assuming that the input space has a perfect black point... */
+ 
+-		/* Lookup the ouput black point in XYZ PCS. We're assuming monotonicity.. */
++		/* Lookup the output black point in XYZ PCS. We're assuming monotonicity.. */
+ 		bp[0] = bp[1] = bp[2] = 0.0;
+ 		oluo->lookup(oluo, bp, bp);
+ 
+@@ -824,7 +824,7 @@ int main(int argc, char *argv[])
+ 		             bt1886 == 1 ? egamma : tgamma, bt1886 == 1 ? 1 : 0);
+ 
+ 		if (verb)
+-			printf("Gamma Curve: Using ouput black offset proportion %f\n",outoprop);
++			printf("Gamma Curve: Using output black offset proportion %f\n",outoprop);
+ 
+ 		if (bt1886 == 1) {		/* Using effective gamma */
+ 			if (verb)
+Index: trunk/profile/invprofcheck.c
+===================================================================
+--- trunk.orig/profile/invprofcheck.c
++++ trunk/profile/invprofcheck.c
+@@ -96,7 +96,7 @@ void usage(void) {
+ 	fprintf(stderr," -k           Show CIEDE2000 delta E values\n");
+ 	fprintf(stderr," -w           create %s visualisation (profile%s)\n",vrml_format(),vrml_ext());
+ 	fprintf(stderr," -x           Use %s axes\n",vrml_format());
+-	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/profcheck.c
+===================================================================
+--- trunk.orig/profile/profcheck.c
++++ trunk/profile/profcheck.c
+@@ -59,7 +59,7 @@ usage(void) {
+ 	fprintf(stderr," -w              create %s visualisation (iccprofile%s)\n",vrml_format(),vrml_ext());
+ 	fprintf(stderr," -x              Use %s axes\n",vrml_format());
+ 	fprintf(stderr," -m              Make %s lines a minimum of 0.5\n",vrml_format());
+-	fprintf(stderr," -e              Color vectors acording to delta E\n");
++	fprintf(stderr," -e              Color vectors according to delta E\n");
+ 	fprintf(stderr," -h              Plot a histogram of delta E's\n");
+ 	fprintf(stderr," -s              Sort output by delta E\n");
+ 	fprintf(stderr," -P N.NN         Create a pruned .ti3 with points less or equal to N.NN delta E\n");
diff --git a/debian/patches/series b/debian/patches/series
index 96849a3..5ac0fd1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 #110_dispwin_segfault.patch
-#100_spelling.patch
+100_spelling.patch
 15_jam.patch
 #20_hurd_PATH_MAX.patch
 #120_usb-db_new.patch