summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/01_autotools-support.diff233
-rw-r--r--debian/patches/100_spelling.patch616
-rw-r--r--debian/patches/10_spectro_inst.patch98
-rw-r--r--debian/patches/15_jam.patch87
-rw-r--r--debian/patches/series13
5 files changed, 964 insertions, 83 deletions
diff --git a/debian/patches/01_autotools-support.diff b/debian/patches/01_autotools-support.diff
index 8e0a6fe..13b7649 100644
--- a/debian/patches/01_autotools-support.diff
+++ b/debian/patches/01_autotools-support.diff
@@ -1,5 +1,7 @@
---- /dev/null
-+++ b/Makefile.shared
+Index: trunk/Makefile.shared
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/Makefile.shared 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,15 @@
+# Common CFLAGS for Argyll components
+
@@ -16,8 +18,10 @@
+ $(MAKE) -C $(@D) $(@F)
+./%.la:
+ $(MAKE) -C $(@D) $(@F)
---- /dev/null
-+++ b/config.h.in
+Index: trunk/config.h.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/config.h.in 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,95 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
@@ -114,8 +118,10 @@
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
---- /dev/null
-+++ b/Makefile.am
+Index: trunk/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,23 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -140,8 +146,10 @@
+
+
+EXTRA_DIST = Readme.txt ttbd.txt log.txt
---- /dev/null
-+++ b/configure.ac
+Index: trunk/configure.ac
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/configure.ac 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,133 @@
+AC_INIT([argyll], [1.3.7])
+AM_INIT_AUTOMAKE([1.9 foreign])
@@ -276,8 +284,10 @@
+ ucmm/Makefile])
+
+AC_OUTPUT
---- /dev/null
-+++ b/tweak/Makefile.am
+Index: trunk/tweak/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/tweak/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,11 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -290,8 +300,10 @@
+bin_PROGRAMS = refine
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/rspl/Makefile.am
+Index: trunk/rspl/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/rspl/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,15 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -308,8 +320,10 @@
+check_PROGRAMS = revbench c1 c1df t2d t2ddf t3d t3ddf tnd trnd
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/plot/Makefile.am
+Index: trunk/plot/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/plot/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,12 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -323,8 +337,10 @@
+libvrml_la_LIBADD = $(ICC_LIBS) ../numlib/libargyllnum.la
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/doc/Makefile.am
+Index: trunk/doc/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/doc/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,6 @@
+docdir = $(datadir)/doc/argyll
+
@@ -332,8 +348,10 @@
+ $(wildcard *.gif)
+
+EXTRA_DIST = $(doc_DATA)
---- /dev/null
-+++ b/numlib/Makefile.am
+Index: trunk/numlib/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/numlib/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,15 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -350,9 +368,11 @@
+ soboltest
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/spectro/Makefile.am
-@@ -0,0 +1,53 @@
+Index: trunk/spectro/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/spectro/Makefile.am 2014-09-01 21:41:09.629460471 +0200
+@@ -0,0 +1,54 @@
+include $(top_srcdir)/Makefile.shared
+
+privatelib_LTLIBRARIES = libinsttypes.la libconv.la libinst.la libinstapp.la libdisp.la
@@ -368,7 +388,8 @@
+ spyd2.c spyd2.h spyd2setup.h spyd2PLD.h huey.c huey.h \
+ usbio.c hidio.c pollem.c pollem.h icoms.h conv.h usbio.h \
+ hidio.h i1d3.h i1d3.c colorhug.c colorhug.h icoms.c \
-+ oemarch.h oemarch.c iusb.h vinflate.c inflate.c
++ oemarch.h oemarch.c iusb.h vinflate.c inflate.c \
++ specbos.c
+libinst_la_LIBADD = $(ICC_LIBS) ../numlib/libargyllnum.la \
+ ../libargyll.la ../rspl/librspl.la libconv.la
+
@@ -406,8 +427,10 @@
+ref_DATA = ccxx.ti1 SOtele.sp $(wildcard *.cal)
+
+EXTRA_DIST = Readme.txt
---- /dev/null
-+++ b/ref/Makefile.am
+Index: trunk/ref/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/ref/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,7 @@
+refdir = $(datadir)/color/argyll/ref
+
@@ -416,8 +439,10 @@
+ $(wildcard *.ti2)
+
+EXTRA_DIST = $(ref_DATA)
---- /dev/null
-+++ b/link/Makefile.am
+Index: trunk/link/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/link/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,11 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -430,8 +455,10 @@
+bin_PROGRAMS = collink pathplot
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/imdi/Makefile.am
+Index: trunk/imdi/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/imdi/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,40 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -473,8 +500,10 @@
+ ./imdi_make
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/scanin/Makefile.am
+Index: trunk/scanin/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/scanin/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,19 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -495,8 +524,10 @@
+ref_DATA = $(wildcard *.cht) $(wildcard *.cie) $(wildcard *.ti2)
+
+EXTRA_DIST = $(ref_DATA) License.txt Readme.txt
---- /dev/null
-+++ b/cgats/Makefile.am
+Index: trunk/cgats/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/cgats/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,9 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -507,8 +538,10 @@
+ cgatsstd.c
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/render/Makefile.am
+Index: trunk/render/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/render/Makefile.am 2014-09-01 21:40:52.561137062 +0200
@@ -0,0 +1,13 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -523,8 +556,10 @@
+check_PROGRAMS = timage
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/jcnf/Makefile.am
+Index: trunk/jcnf/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/jcnf/Makefile.am 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,15 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -541,8 +576,10 @@
+check_PROGRAMS = test
+
+EXTRA_DIST = Readme.txt
---- /dev/null
-+++ b/jcnf/yajl/Makefile.am
+Index: trunk/jcnf/yajl/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/jcnf/yajl/Makefile.am 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,13 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -557,14 +594,18 @@
+LDADD = ./libyajl.la
+
+check_PROGRAMS = yajl_test json_verify
---- /dev/null
-+++ b/h/Makefile.am
+Index: trunk/h/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/h/Makefile.am 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,3 @@
+EXTRA_DIST = Readme.txt copyright.h config.h sort.h llist.h xlist.h \
+ counters.h
+
---- /dev/null
-+++ b/icc/Makefile.am
+Index: trunk/icc/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/icc/Makefile.am 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,22 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -588,8 +629,10 @@
+ref_DATA = $(wildcard *.icm)
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/ucmm/Makefile.am
+Index: trunk/ucmm/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/ucmm/Makefile.am 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,9 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -600,8 +643,10 @@
+libucmm_la_LIBADD = $(ICC_LIBS) ../jcnf/libjcnf.la ../spectro/libconv.la
+
+LDADD = libucmm.la
---- /dev/null
-+++ b/xicc/Makefile.am
+Index: trunk/xicc/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/xicc/Makefile.am 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,28 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -631,8 +676,10 @@
+ ../gamut/libgammap.la ../target/libtarget.la
+
+EXTRA_DIST = xmono.c xmatrix.c xlut.c
---- /dev/null
-+++ b/target/Makefile.am
+Index: trunk/target/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/target/Makefile.am 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,28 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -662,8 +709,10 @@
+ref_DATA = $(wildcard *.ti2)
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/profile/Makefile.am
+Index: trunk/profile/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/profile/Makefile.am 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,27 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -692,8 +741,10 @@
+ref_DATA = $(wildcard *.sp)
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/gamut/Makefile.am
+Index: trunk/gamut/Makefile.am
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/gamut/Makefile.am 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,27 @@
+include $(top_srcdir)/Makefile.shared
+
@@ -722,8 +773,10 @@
+##ref_DATA = RefMediumGamut.gam
+
+EXTRA_DIST = License.txt Readme.txt
---- /dev/null
-+++ b/imdi/imdi_k.h
+Index: trunk/imdi/imdi_k.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/imdi/imdi_k.h 2014-09-01 21:40:52.565137138 +0200
@@ -0,0 +1,910 @@
+/* Integer Multi-Dimensional Interpolation */
+/* Declarations for all the generated kernel functions */
@@ -1635,8 +1688,10 @@
+
+int no_kfuncs = 891;
+
---- /dev/null
-+++ b/configure
+Index: trunk/configure
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/configure 2014-09-01 21:40:52.573137290 +0200
@@ -0,0 +1,15216 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
@@ -16854,8 +16909,10 @@
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
---- /dev/null
-+++ b/config.sub
+Index: trunk/config.sub
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/config.sub 2014-09-01 21:40:52.573137290 +0200
@@ -0,0 +1,1791 @@
+#! /bin/sh
+# Configuration validation subroutine script.
@@ -18648,8 +18705,10 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
---- /dev/null
-+++ b/aclocal.m4
+Index: trunk/aclocal.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/aclocal.m4 2014-09-01 21:40:52.577137366 +0200
@@ -0,0 +1,1073 @@
+# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
+
@@ -19724,8 +19783,10 @@
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
---- /dev/null
-+++ b/missing
+Index: trunk/missing
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/missing 2014-09-01 21:40:52.577137366 +0200
@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
@@ -19942,8 +20003,10 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
---- /dev/null
-+++ b/depcomp
+Index: trunk/depcomp
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/depcomp 2014-09-01 21:40:52.577137366 +0200
@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
@@ -20736,8 +20799,10 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
---- /dev/null
-+++ b/install-sh
+Index: trunk/install-sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/install-sh 2014-09-01 21:40:52.577137366 +0200
@@ -0,0 +1,527 @@
+#!/bin/sh
+# install - install a program, script, or datafile
@@ -21266,8 +21331,10 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
---- /dev/null
-+++ b/config.guess
+Index: trunk/config.guess
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/config.guess 2014-09-01 21:40:52.577137366 +0200
@@ -0,0 +1,1558 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
@@ -22827,8 +22894,10 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
---- /dev/null
-+++ b/m4/ltoptions.m4
+Index: trunk/m4/ltoptions.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/ltoptions.m4 2014-09-01 21:40:52.577137366 +0200
@@ -0,0 +1,384 @@
+# Helper functions for option handling. -*- Autoconf -*-
+#
@@ -23214,8 +23283,10 @@
+ [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+ [m4_define([_LTDL_TYPE], [convenience])])
---- /dev/null
-+++ b/m4/libtool.m4
+Index: trunk/m4/libtool.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/libtool.m4 2014-09-01 21:40:52.581137441 +0200
@@ -0,0 +1,7991 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
@@ -31208,8 +31279,10 @@
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+ [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
---- /dev/null
-+++ b/m4/ltversion.m4
+Index: trunk/m4/ltversion.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/ltversion.m4 2014-09-01 21:40:52.585137517 +0200
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
@@ -31234,8 +31307,10 @@
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
---- /dev/null
-+++ b/m4/ltsugar.m4
+Index: trunk/m4/ltsugar.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/ltsugar.m4 2014-09-01 21:40:52.585137517 +0200
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
@@ -31360,8 +31435,10 @@
+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
---- /dev/null
-+++ b/m4/lt~obsolete.m4
+Index: trunk/m4/lt~obsolete.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ trunk/m4/lt~obsolete.m4 2014-09-01 21:40:52.585137517 +0200
@@ -0,0 +1,98 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
diff --git a/debian/patches/100_spelling.patch b/debian/patches/100_spelling.patch
new file mode 100644
index 0000000..c86f79c
--- /dev/null
+++ b/debian/patches/100_spelling.patch
@@ -0,0 +1,616 @@
+Description: correct some typos
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Last-Update: 2014-09-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/icc/icc.c
+===================================================================
+--- trunk.orig/icc/icc.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/icc/icc.c 2014-09-04 13:18:05.797221556 +0200
+@@ -1466,7 +1466,7 @@
+ case icSigViewingCondDescTag:
+ return "Viewing Condition Description";
+ case icSigViewingConditionsTag:
+- return "Viewing Condition Paramaters";
++ return "Viewing Condition Parameters";
+ default:
+ sprintf(buf,"Unrecognized - %s",tag2str(sig));
+ return buf;
+Index: trunk/spectro/ccxxmake.c
+===================================================================
+--- trunk.orig/spectro/ccxxmake.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/ccxxmake.c 2014-09-04 13:18:05.797221556 +0200
+@@ -358,7 +358,7 @@
+ /* COM port */
+ } else if (argv[fa][1] == 'c') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -c");
++ if (na == NULL) usage("Parameter expected following -c");
+ comno = atoi(na);
+ if (comno < 1 || comno > 40) usage("-c parameter %d out of range",comno);
+
+@@ -452,7 +452,7 @@
+ /* Serial port flow control */
+ } else if (argv[fa][1] == 'W') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -W");
++ if (na == NULL) usage("Parameter expected following -W");
+ if (na[0] == 'n' || na[0] == 'N')
+ fc = fc_none;
+ else if (na[0] == 'h' || na[0] == 'H')
+Index: trunk/spectro/dispcal.c
+===================================================================
+--- trunk.orig/spectro/dispcal.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dispcal.c 2014-09-04 13:18:05.801221640 +0200
+@@ -1698,7 +1698,7 @@
+ /* Serial port flow control */
+ } else if (argv[fa][1] == 'W') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -W");
++ if (na == NULL) usage("Parameter expected following -W");
+ if (na[0] == 'n' || na[0] == 'N')
+ fc = fc_none;
+ else if (na[0] == 'h' || na[0] == 'H')
+@@ -1721,13 +1721,13 @@
+ /* Black point correction amount */
+ } else if (argv[fa][1] == 'k') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -k");
++ if (na == NULL) usage("Parameter expected following -k");
+ bkcorrect = atof(na);
+ if (bkcorrect < 0.0 || bkcorrect > 1.0) usage("-k parameter must be between 0.0 and 1.0");
+ /* Neutral blend rate (power) */
+ } else if (argv[fa][1] == 'A') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -A");
++ if (na == NULL) usage("Parameter expected following -A");
+ x.nbrate = atof(na);
+ if (x.nbrate < 0.05 || x.nbrate > 20.0) usage("-A parameter must be between 0.05 and 20.0");
+ /* Black brightness */
+@@ -1757,7 +1757,7 @@
+ /* COM port */
+ } else if (argv[fa][1] == 'c') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -c");
++ if (na == NULL) usage("Parameter expected following -c");
+ comport = atoi(na);
+ if (comport < 1 || comport > 50) usage("-c parameter %d out of range",comport);
+
+@@ -2753,7 +2753,7 @@
+ /* Black level adjustment */
+ /* Due to the possibility of the channel offsets not being even, */
+ /* we use the largest of the XYZ values after they have been */
+- /* scaled to be even acording to the white XYZ balance. */
++ /* scaled to be even according to the white XYZ balance. */
+ /* It's safer to set the black level a bit low, and then the */
+ /* calibration curves can bump the low ones up. */
+ if (c == '1') {
+Index: trunk/spectro/dispread.c
+===================================================================
+--- trunk.orig/spectro/dispread.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dispread.c 2014-09-04 13:18:05.801221640 +0200
+@@ -368,7 +368,7 @@
+ /* COM port */
+ } else if (argv[fa][1] == 'c') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -c");
++ if (na == NULL) usage("Parameter expected following -c");
+ comport = atoi(na);
+ if (comport < 1 || comport > 50) usage("-c parameter %d out of range",comport);
+
+Index: trunk/spectro/spotread.c
+===================================================================
+--- trunk.orig/spectro/spotread.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/spotread.c 2014-09-04 13:18:05.801221640 +0200
+@@ -472,7 +472,7 @@
+ /* COM port */
+ } else if (argv[fa][1] == 'c') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -c");
++ if (na == NULL) usage("Parameter expected following -c");
+ {
+ comport = atoi(na);
+ if (comport < 1 || comport > 40) usage("-c parameter %d out of range",comport);
+@@ -481,7 +481,7 @@
+ /* Display type */
+ } else if (argv[fa][1] == 'y') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -y");
++ if (na == NULL) usage("Parameter expected following -y");
+ dtype = na[0];
+
+ #ifndef SALONEINSTLIB
+@@ -489,7 +489,7 @@
+ } else if (argv[fa][1] == 'I') {
+
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -I");
++ if (na == NULL) usage("Parameter expected following -I");
+ if (strcmp(na, "A") == 0
+ || strcmp(na, "M0") == 0) {
+ spec = 1;
+@@ -528,7 +528,7 @@
+ /* Spectral Illuminant type for XYZ computation */
+ } else if (argv[fa][1] == 'i') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -i");
++ if (na == NULL) usage("Parameter expected following -i");
+ if (strcmp(na, "A") == 0) {
+ spec = 1;
+ illum = icxIT_A;
+@@ -568,7 +568,7 @@
+ /* Spectral Observer type */
+ } else if (argv[fa][1] == 'Q') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -Q");
++ if (na == NULL) usage("Parameter expected following -Q");
+ if (strcmp(na, "1931_2") == 0) { /* Classic 2 degree */
+ obType = icxOT_CIE_1931_2;
+ } else if (strcmp(na, "1964_10") == 0) { /* Classic 10 degree */
+@@ -646,7 +646,7 @@
+ /* Filter configuration */
+ } else if (argv[fa][1] == 'F') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -F");
++ if (na == NULL) usage("Parameter expected following -F");
+ if (na[0] == 'n' || na[0] == 'N')
+ fe = inst_opt_filter_none;
+ else if (na[0] == 'p' || na[0] == 'P')
+@@ -661,7 +661,7 @@
+ /* Extra filter compensation file */
+ } else if (argv[fa][1] == 'E') {
+ fa = nfa;
+- if (na == NULL) usage("Paramater expected following -E");
++ if (na == NULL) usage("Parameter expected following -E");
+ strncpy(filtername,na,MAXNAMEL-1); filtername[MAXNAMEL-1] = '\000';
+
+ /* Show Yxy */
+Index: trunk/spectro/colorhug.c
+===================================================================
+--- trunk.orig/spectro/colorhug.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/colorhug.c 2014-09-04 13:18:05.801221640 +0200
+@@ -210,7 +210,7 @@
+
+ a1logd(p->log,8,"colorhug_command: Read %d bytes and %d read\n",xrbytes,rbytes);
+ if (rbytes >= 2) {
+- a1logd(p->log,6,"colorhug_command: recieved cmd '%s' error '%s' args '%s'\n",
++ a1logd(p->log,6,"colorhug_command: received cmd '%s' error '%s' args '%s'\n",
+ inst_desc(buf[1]),
+ colorhug_interp_error((inst *) p, buf[0]),
+ icoms_tohex(buf, rbytes - 2));
+Index: trunk/spectro/dispwin.c
+===================================================================
+--- trunk.orig/spectro/dispwin.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dispwin.c 2014-09-04 13:18:05.805221723 +0200
+@@ -2727,7 +2727,7 @@
+
+ /* Un-Install a display profile */
+ /* Return nz if failed, */
+-/* 1 if not sucessfully deleted */
++/* 1 if not successfully deleted */
+ /* 2 if profile not found */
+ int dispwin_uninstall_profile(dispwin *p, char *fname, p_scope scope) {
+ debugr2((errout,"dispwin_uninstall_profile '%s'\n", fname));
+@@ -5089,7 +5089,7 @@
+ p->native &= ~2;
+ }
+
+- debugr("new_dispwin: return sucessfully\n");
++ debugr("new_dispwin: return successfully\n");
+ return p;
+ }
+
+Index: trunk/spectro/dtp51.c
+===================================================================
+--- trunk.orig/spectro/dtp51.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dtp51.c 2014-09-04 13:18:05.805221723 +0200
+@@ -678,7 +678,7 @@
+ case DTP51_INVALID_STEP:
+ return "Invalid step";
+ case DTP51_NO_DATA_AVAILABLE:
+- return "No data availble";
++ return "No data avaialble";
+ case DTP51_LAMP_MARGINAL:
+ return "Lamp marginal";
+ case DTP51_LAMP_FAILURE:
+Index: trunk/spectro/dtp92.c
+===================================================================
+--- trunk.orig/spectro/dtp92.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dtp92.c 2014-09-04 13:18:05.805221723 +0200
+@@ -888,7 +888,7 @@
+ case DTP92_NO_DATA_AVAILABLE:
+ return "No data available";
+ case DTP92_MISSING_PARAMETER:
+- return "Paramter is missing";
++ return "Parameter is missing";
+ case DTP92_CALIBRATION_DENIED:
+ return "Invalid calibration enable code";
+ case DTP92_NEEDS_OFFSET_CAL:
+Index: trunk/spectro/hidio.c
+===================================================================
+--- trunk.orig/spectro/hidio.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/hidio.c 2014-09-04 13:18:05.805221723 +0200
+@@ -726,7 +726,7 @@
+ {
+ unsigned char *rbuf2;
+
+- /* Create a copy of the data recieved with one more byte */
++ /* Create a copy of the data received with one more byte */
+ if ((rbuf2 = malloc(bsize + 1)) == NULL) {
+ a1loge(p->log, ICOM_SYS, "icoms_hid_read: malloc failed\n");
+ return ICOM_SYS;
+Index: trunk/spectro/huey.c
+===================================================================
+--- trunk.orig/spectro/huey.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/huey.c 2014-09-04 13:18:05.805221723 +0200
+@@ -81,7 +81,7 @@
+ /* i1Display command codes */
+ /* B = byte (8bit), S = short (16bit), W = word (32bit), A = string */
+ /* U = unused byte, - = no arguments/results */
+-/* The is a 7 byte command buffer and 6 response recieve buffer. */
++/* The is a 7 byte command buffer and 6 response receive buffer. */
+ /* :2 means the read is from a second 8 byte ep x81 read. */
+ /* cbuf[-] is command byte */
+ /* rbuf[-2] is continuation byte */
+Index: trunk/spectro/i1pro_imp.c
+===================================================================
+--- trunk.orig/spectro/i1pro_imp.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/i1pro_imp.c 2014-09-04 13:18:05.809221806 +0200
+@@ -3691,7 +3691,7 @@
+ return I1PRO_OK;
+ }
+
+- /* We've sucessfully restored the dark calibration */
++ /* We've successfully restored the dark calibration */
+ s->dark_valid = 1;
+ s->ddate = m->caldate;
+
+@@ -3736,7 +3736,7 @@
+ return I1PRO_OK;
+ }
+
+- /* We've sucessfully restored the calibration */
++ /* We've successfully restored the calibration */
+ s->cal_valid = 1;
+ s->cfdate = m->caldate;
+
+Index: trunk/spectro/madvrwin.c
+===================================================================
+--- trunk.orig/spectro/madvrwin.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/madvrwin.c 2014-09-04 13:18:05.809221806 +0200
+@@ -582,7 +582,7 @@
+ }
+ #endif
+
+- debugr("new_madvrwin: return sucessfully\n");
++ debugr("new_madvrwin: return successfully\n");
+
+ return p;
+ }
+Index: trunk/spectro/ss.c
+===================================================================
+--- trunk.orig/spectro/ss.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/ss.c 2014-09-04 13:18:05.809221806 +0200
+@@ -1787,7 +1787,7 @@
+ case ss_et_BadHexEncoding:
+ return "Message received from instrument has bad Hex encoding";
+ case ss_et_RecBufferOverun:
+- return "Message received from instrument would overflow recieve buffer";
++ return "Message received from instrument would overflow receive buffer";
+ default:
+ return "Unknown error code";
+ }
+Index: trunk/spectro/ss_imp.c
+===================================================================
+--- trunk.orig/spectro/ss_imp.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/ss_imp.c 2014-09-04 13:18:05.809221806 +0200
+@@ -216,7 +216,7 @@
+ return 0;
+ }
+
+-/* Return the first enum from the recieve buffer without removing it. */
++/* Return the first enum from the receive buffer without removing it. */
+ int ss_peek_ans(ss *p) {
+ int rv;
+
+Index: trunk/spectro/webwin.c
+===================================================================
+--- trunk.orig/spectro/webwin.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/webwin.c 2014-09-04 13:18:05.809221806 +0200
+@@ -513,7 +513,7 @@
+ msec_sleep(50);
+ }
+
+- debugr("new_webwin: return sucessfully\n");
++ debugr("new_webwin: return successfully\n");
+
+ return p;
+ }
+Index: trunk/xicc/cv.c
+===================================================================
+--- trunk.orig/xicc/cv.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/xicc/cv.c 2014-09-04 13:18:05.809221806 +0200
+@@ -100,7 +100,7 @@
+
+ printf("There are %d parameters:\n",np); fflush(stdout);
+ for (i = 0; i < np; i++) {
+- printf("Paramter %d = %f\n",i, params[i]); fflush(stdout);
++ printf("Parameter %d = %f\n",i, params[i]); fflush(stdout);
+ }
+
+ /* Display the result */
+Index: trunk/spectro/ss_imp.h
+===================================================================
+--- trunk.orig/spectro/ss_imp.h 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/ss_imp.h 2014-09-04 13:18:05.809221806 +0200
+@@ -720,7 +720,7 @@
+ /* - - - - - - - - - - - - - - - - - - - - - */
+ /* ANSWER: */
+
+-/* Return the first enum from the recieve buffer without removing it. */
++/* Return the first enum from the receive buffer without removing it. */
+ int ss_peek_ans(struct _ss *p);
+
+ /* Remove a Spectrolino answer enum from the revieve buffer, */
+Index: trunk/imdi/cctiff.c
+===================================================================
+--- trunk.orig/imdi/cctiff.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/imdi/cctiff.c 2014-09-04 13:18:05.809221806 +0200
+@@ -32,7 +32,7 @@
+ Add flag to ignore inkname mismatches.
+
+
+- Should add support for transfering any extra alpha
++ Should add support for transferring any extra alpha
+ planes from input to output, rather than simply ignoring them.
+
+
+@@ -1934,11 +1934,11 @@
+
+ if (wh != NULL) {
+ printf("Output TIFF file '%s'\n",out_name);
+- printf("Ouput raster file ICC colorspace is %s\n",icm2str(icmColorSpaceSignature,su.outs));
++ printf("Output raster file ICC colorspace is %s\n",icm2str(icmColorSpaceSignature,su.outs));
+ printf("Output TIFF file photometric is %s\n",Photometric2str(wphotometric));
+ } else {
+ printf("Output JPEG file '%s'\n",out_name);
+- printf("Ouput raster file ICC colorspace is %s\n",icm2str(icmColorSpaceSignature,su.outs));
++ printf("Output raster file ICC colorspace is %s\n",icm2str(icmColorSpaceSignature,su.outs));
+ printf("Output JPEG file colorspace is %s\n",JPEG_cspace2str(wj.jpeg_color_space));
+ if (wdesc != NULL)
+ printf("Output raster file description: '%s'\n",wdesc);
+Index: trunk/imdi/imdi.h
+===================================================================
+--- trunk.orig/imdi/imdi.h 2014-09-04 13:18:05.821222055 +0200
++++ trunk/imdi/imdi.h 2014-09-04 13:18:05.809221806 +0200
+@@ -38,7 +38,7 @@
+
+ /* Note that once an imdi is created, multiple can call interp() without */
+ /* interfering with each other, allowing parallel execution. */
+- void (*interp)(struct _imdi *s, void **outp, int outst, /* Ouput pointers and stride */
++ void (*interp)(struct _imdi *s, void **outp, int outst, /* Output pointers and stride */
+ void **inp, int inst, /* Input pointers and stride */
+ unsigned int npixels); /* Number of pixels */
+
+Index: trunk/spectro/munki_imp.c
+===================================================================
+--- trunk.orig/spectro/munki_imp.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/munki_imp.c 2014-09-04 13:18:05.813221888 +0200
+@@ -6358,7 +6358,7 @@
+ int i, j, jj, k, cx, sx;
+ munki_fc coeff[40][16]; /* Existing filter cooefficients */
+ int nwav1; /* Number of filters */
+- double wl_short1, wl_long1; /* Ouput wavelength of first and last filters */
++ double wl_short1, wl_long1; /* Output wavelength of first and last filters */
+ double wl_step1;
+ munki_xp xp[41]; /* Crossover points each side of filter */
+ munki_code ev = MUNKI_OK;
+Index: trunk/target/printtarg.c
+===================================================================
+--- trunk.orig/target/printtarg.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/target/printtarg.c 2014-09-04 13:18:05.813221888 +0200
+@@ -2946,7 +2946,7 @@
+ double sscale = 1.0; /* Spacer size scale */
+ int rand = 1;
+ int qbits = 0; /* Quantization bits */
+- int oft = 0; /* Ouput File type, 0 = PS, 1 = EPS , 2 = TIFF */
++ int oft = 0; /* Output File type, 0 = PS, 1 = EPS , 2 = TIFF */
+ int nocups = 0; /* Supress CUPS PS/EPS job ticket */
+ depth2d tiffdpth = bpc8_2d; /* TIFF pixel depth */
+ double tiffres = 100.0; /* TIFF resolution in DPI */
+Index: trunk/gamut/nearsmth.c
+===================================================================
+--- trunk.orig/gamut/nearsmth.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/gamut/nearsmth.c 2014-09-04 13:18:05.813221888 +0200
+@@ -259,7 +259,7 @@
+ double va, vr = 0.0, vl, vd, vv = 0.0;
+
+ /* Absolute, Delta E^2 between test point and destination closest */
+- /* aodv is already positioned acording to the LCh weights, */
++ /* aodv is already positioned according to the LCh weights, */
+ /* so weight as per average of these */
+ a_o = w->a.o;
+ va = wdesq(dtp, aodv, a_o, a_o, a_o, SUM_POW);
+@@ -1299,7 +1299,7 @@
+ return 0;
+ }
+
+-/* Tweak weights acording to extra cmy cusp flags or rel override */
++/* Tweak weights according to extra cmy cusp flags or rel override */
+ void tweak_weights(gammapweights out[14], int dst_cmymap, int rel_oride) {
+ int i;
+
+@@ -3508,7 +3508,7 @@
+ swdiag = new_rspl(RSPL_NOFLAGS, 3, 3); /* Allocate 3D -> 3D */
+ swdiag->fit_rspl(swdiag, RSPL_NOFLAGS, fpnts, nmpts, NULL, NULL, gres, NULL, NULL, 1.0, avgdev, NULL);
+
+- /* Now create a plot of the sci_gam with the vertexes colored acording to the */
++ /* Now create a plot of the sci_gam with the vertexes colored according to the */
+ /* diagnostic map. */
+ if ((wrl = new_vrml("sci_gam_wt.wrl", 1)) == NULL) {
+ fprintf(stderr,"gamut map: new_vrml failed\n");
+Index: trunk/gamut/nearsmth.h
+===================================================================
+--- trunk.orig/gamut/nearsmth.h 2014-09-04 13:18:05.821222055 +0200
++++ trunk/gamut/nearsmth.h 2014-09-04 13:18:05.813221888 +0200
+@@ -267,7 +267,7 @@
+ gammapweights *src2, double wgt2
+ );
+
+-/* Tweak weights acording to extra cmy cusp flags or rel override */
++/* Tweak weights according to extra cmy cusp flags or rel override */
+ void tweak_weights(gammapweights out[14], int dst_cmymap, int rel_oride);
+
+ #endif /* NEARSMTH_H */
+Index: trunk/imdi/cctiffo.c
+===================================================================
+--- trunk.orig/imdi/cctiffo.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/imdi/cctiffo.c 2014-09-04 13:18:05.813221888 +0200
+@@ -307,7 +307,7 @@
+ case PHOTOMETRIC_LOGLUV:
+ return "CIELog2Luv";
+ }
+- sprintf(buf,"Unknonw Tag %d",pmtc);
++ sprintf(buf,"Unknown Tag %d",pmtc);
+ return buf;
+ }
+
+Index: trunk/imdi/greytiff.c
+===================================================================
+--- trunk.orig/imdi/greytiff.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/imdi/greytiff.c 2014-09-04 13:18:05.813221888 +0200
+@@ -131,7 +131,7 @@
+ case PHOTOMETRIC_LOGLUV:
+ return "CIELog2Luv";
+ }
+- sprintf(buf,"Unknonw Tag %d",pmtc);
++ sprintf(buf,"Unknown Tag %d",pmtc);
+ return buf;
+ }
+
+Index: trunk/link/collink.c
+===================================================================
+--- trunk.orig/link/collink.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/link/collink.c 2014-09-04 13:18:05.817221971 +0200
+@@ -899,7 +899,7 @@
+ }
+ /* We've got the input profile PCS' at this point. */
+
+- /* If we're transfering the K value from the input profile to the */
++ /* If we're transferring the K value from the input profile to the */
+ /* output, copy it into locus[], which will be given to the inverse */
+ /* lookup function, else the inverse lookup will generate a K using */
+ /* the curve parameters. */
+@@ -1039,7 +1039,7 @@
+ if (p->nhack == 2) {
+ /* Ideally we would create a 4D PCSK -> PCSK gamut mapping */
+ /* to smoothly and accurately cope with the changing source */
+- /* and destination gamuts acording to their degree of "K onlyness". */
++ /* and destination gamuts according to their degree of "K onlyness". */
+ /* In practice we're going to simply interpolated between */
+ /* two extremes: unrestricted gamut and K only black gamut. */
+ double map0[3], map1[3];
+Index: trunk/profile/invprofcheck.c
+===================================================================
+--- trunk.orig/profile/invprofcheck.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/profile/invprofcheck.c 2014-09-04 13:18:05.817221971 +0200
+@@ -94,7 +94,7 @@
+ fprintf(stderr," -k Show CIEDE2000 delta E values\n");
+ fprintf(stderr," -w create VRML visualisation (profile.wrl)\n");
+ fprintf(stderr," -x Use VRML axes\n");
+- fprintf(stderr," -e Color vectors acording to delta E\n");
++ fprintf(stderr," -e Color vectors according to delta E\n");
+ fprintf(stderr," profile.icm Profile to check\n");
+ exit(1);
+ }
+Index: trunk/profile/printcal.c
+===================================================================
+--- trunk.orig/profile/printcal.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/profile/printcal.c 2014-09-04 13:18:05.817221971 +0200
+@@ -1289,7 +1289,7 @@
+ icmXYZ2Lab(&wht, wp->Lab, wp->XYZ);
+ }
+
+- /* Sort the channel acording to device value */
++ /* Sort the channel according to device value */
+ /* For a consistent result for identical device values, */
+ /* secondary sort by inverse CIE value */
+ //#define HEAP_COMPARE(A,B) ((A).dev < (B).dev)
+Index: trunk/profile/profcheck.c
+===================================================================
+--- trunk.orig/profile/profcheck.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/profile/profcheck.c 2014-09-04 13:18:05.817221971 +0200
+@@ -54,7 +54,7 @@
+ fprintf(stderr," -w create VRML visualisation (iccprofile.wrl)\n");
+ fprintf(stderr," -x Use VRML axes\n");
+ fprintf(stderr," -m Make VRML lines a minimum of 0.5\n");
+- fprintf(stderr," -e Color vectors acording to delta E\n");
++ fprintf(stderr," -e Color vectors according to delta E\n");
+ fprintf(stderr," -d devval1,deval2,devvalN\n");
+ fprintf(stderr," Specify a device value to sort against\n");
+ fprintf(stderr," -p Sort device value by PCS (Lab) target\n");
+Index: trunk/spectro/dispsup.c
+===================================================================
+--- trunk.orig/spectro/dispsup.c 2014-09-04 13:18:05.821222055 +0200
++++ trunk/spectro/dispsup.c 2014-09-04 13:18:05.817221971 +0200
+@@ -604,7 +604,7 @@
+ scb->serno = p->serno++;
+ scb->msec = msec_time();
+
+- a1logd(p->log,1, "got reading %f %f %f, transfering to col\n",
++ a1logd(p->log,1, "got reading %f %f %f, transferring to col\n",
+ val.XYZ[0], val.XYZ[1], val.XYZ[2]);
+
+ scb->mtype = val.mtype;
+Index: trunk/gamut/gammap.c
+===================================================================
+--- trunk.orig/gamut/gammap.c 2014-01-31 05:08:51.000000000 +0100
++++ trunk/gamut/gammap.c 2014-09-04 13:21:15.557161603 +0200
+@@ -760,7 +760,7 @@
+ #endif
+ if (gmi->bph == gmm_clipBP) {
+
+- /* Extend the target black point to accomodate the */
++ /* Extend the target black point to accommodate the */
+ /* bent or clipped destination space L* range */
+ if (fabp[0] < dr_cs_bp[0]) {
+ t = (fabp[0] - dr_cs_wp[0])/(dr_cs_bp[0] - dr_cs_wp[0]);
+Index: trunk/profile/profout.c
+===================================================================
+--- trunk.orig/profile/profout.c 2014-01-31 05:09:02.000000000 +0100
++++ trunk/profile/profout.c 2014-09-04 13:21:56.566012838 +0200
+@@ -1052,7 +1052,7 @@
+ if (iccver < icmVersion2_4) {
+ iccver = icmVersion2_4; /* Need 2.4.0 for Display intents */
+ if (verb)
+- fprintf(verbo,"Bumped ICC version to 2.4.0 to accomodate multiple Display intents\n");
++ fprintf(verbo,"Bumped ICC version to 2.4.0 to accommodate multiple Display intents\n");
+ }
+ }
+ if (wr_icco->set_version(wr_icco, iccver) != 0)
+Index: trunk/render/thscreen.c
+===================================================================
+--- trunk.orig/render/thscreen.c 2014-01-31 05:09:05.000000000 +0100
++++ trunk/render/thscreen.c 2014-09-04 13:22:40.638927581 +0200
+@@ -396,7 +396,7 @@
+ mrang = 65535.0/(t->oelev - 1.0);
+ DBG(("new_thscreen() raw modulation rande = %f\n",mrang));
+
+- /* Modify the modulation range to accomodate any level overlap */
++ /* Modify the modulation range to accommodate any level overlap */
+ if (olap > 0.0 && t->oelev > 2) {
+ mrang = ((t->oelev - 2.0) * olap * mrang + 65535.0)/(t->oelev - 1.0);
+ DBG(("new_thscreen() modulation adjusted for overlap = %f\n",mrang));
+Index: trunk/xicc/xspect.c
+===================================================================
+--- trunk.orig/xicc/xspect.c 2014-01-31 05:08:53.000000000 +0100
++++ trunk/xicc/xspect.c 2014-09-04 13:23:27.695904152 +0200
+@@ -3462,7 +3462,7 @@
+ /* Given an emission spectrum, set the UV output to the given level. */
+ /* The shape of the UV is taken from FWA1_stim, and the level is */
+ /* with respect to the Y of the input spectrum. */
+-/* The output range is extended to accomodate the UV wavelengths */
++/* The output range is extended to accommodate the UV wavelengths */
+ void xsp_setUV(xspect *out, xspect *in, double uvlevel) {
+ int i, xs, xe;
+ double ww, avg;
diff --git a/debian/patches/10_spectro_inst.patch b/debian/patches/10_spectro_inst.patch
new file mode 100644
index 0000000..7a5cc9d
--- /dev/null
+++ b/debian/patches/10_spectro_inst.patch
@@ -0,0 +1,98 @@
+Index: trunk/spectro/inst.c
+===================================================================
+--- trunk.orig/spectro/inst.c 2014-09-01 20:08:46.629215428 +0200
++++ trunk/spectro/inst.c 2014-09-01 20:08:46.621215261 +0200
+@@ -59,11 +59,12 @@
+ #if defined(ENABLE_FAST_SERIAL)
+ instType fast_ser_inst_type(icoms *p, int tryhard,
+ inst_code (*uicallback)(void *cntx, inst_ui_purp purp), void *cntx);
++#endif /* ENABLE_FAST_SERIAL */
+ # if defined(ENABLE_SERIAL)
+ static instType ser_inst_type(icoms *p,
+ inst_code (*uicallback)(void *cntx, inst_ui_purp purp), void *cntx);
+ # endif /* ENABLE_SERIAL */
+-#endif /* ENABLE_FAST_SERIAL */
++
+
+ /* ------------------------------------ */
+ /* Default methods for instrument class */
+Index: trunk/spectro/icoms_nt.c
+===================================================================
+--- trunk.orig/spectro/icoms_nt.c 2014-09-01 20:08:46.629215428 +0200
++++ trunk/spectro/icoms_nt.c 2014-09-01 20:08:46.621215261 +0200
+@@ -22,8 +22,12 @@
+ struct fast_com_name *next;
+ } fast_com_name;
+
+-#if defined(ENABLE_SERIAL) || defined(ENABLE_FAST_SERIAL)
+-instType fast_ser_inst_type(icoms *p, int tryhard, void *, void *);
++#if defined(ENABLE_FAST_SERIAL)
++instType fast_ser_inst_type(icoms *p, int tryhard, void *, void *);
++#endif /* ENABLE_FAST_SERIAL */
++
++#if defined(ENABLE_SERIAL)
++instType ser_inst_type(icoms *p, void *, void *);
+ #endif /* ENABLE_SERIAL */
+
+ /* Create and return a list of available serial ports or USB instruments for this system. */
+Index: trunk/spectro/icoms_ux.c
+===================================================================
+--- trunk.orig/spectro/icoms_ux.c 2014-09-01 20:08:46.629215428 +0200
++++ trunk/spectro/icoms_ux.c 2014-09-01 20:08:46.621215261 +0200
+@@ -46,8 +46,15 @@
+ #include <mach/task_policy.h>
+ #endif /* __APPLE__ */
+
+-#if defined(ENABLE_SERIAL) || defined(ENABLE_FAST_SERIAL)
+-instType fast_ser_inst_type(icoms *p, int tryhard, void *, void *);
++#include "inst.h"
++
++#if defined(ENABLE_FAST_SERIAL)
++instType fast_ser_inst_type(icoms *p, int tryhard, void *, void *);
++#endif /* ENABLE_FAST_SERIAL */
++
++#if defined(ENABLE_SERIAL)
++static instType ser_inst_type(icoms *p,
++ inst_code (*uicallback)(void *cntx, inst_ui_purp purp), void *cntx);
+ #endif /* ENABLE_SERIAL */
+
+ /* Create and return a list of available serial ports or USB instruments for this system */
+@@ -134,7 +141,12 @@
+ icoms *icom;
+ if ((path = p->get_last_path(p)) != NULL
+ && (icom = new_icoms(path, p->log)) != NULL) {
++#if defined(ENABLE_FAST_SERIAL)
+ instType itype = fast_ser_inst_type(icom, 0, NULL, NULL);
++#endif
++#if defined(ENABLE_SERIAL)
++ instType itype = ser_inst_type(icom, NULL, NULL);
++#endif
+ if (itype != instUnknown)
+ icompaths_set_serial_itype(path, itype);
+ icom->del(icom);
+@@ -279,7 +291,12 @@
+ icoms *icom;
+ if ((path = p->get_last_path(p)) != NULL
+ && (icom = new_icoms(path, p->log)) != NULL) {
++#if defined(ENABLE_FAST_SERIAL)
+ instType itype = fast_ser_inst_type(icom, 0, NULL, NULL);
++#endif
++#if defined(ENABLE_SERIAL)
++ instType itype = ser_inst_type(icom, (void *)NULL, (void *)NULL);
++#endif
+ if (itype != instUnknown)
+ icompaths_set_serial_itype(path, itype);
+ icom->del(icom);
+Index: trunk/spectro/Makefile.UNIX
+===================================================================
+--- trunk.orig/spectro/Makefile.UNIX 2014-01-31 05:08:58.000000000 +0100
++++ trunk/spectro/Makefile.UNIX 2014-09-01 20:10:22.819216376 +0200
+@@ -26,7 +26,7 @@
+ LIBOF =
+ RANLIB = echo
+ AS = as
+-CCFLAGSDEF = -DUNIX -c
++CCFLAGSDEF = -DUNIX -c -fPIC
+ CC = cc $(CCFLAGS) $(STDHDRS)
+ CCOF = -o
+ LINKFLAGSDEF = -lm -lpthread -lrt
diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch
new file mode 100644
index 0000000..a2cc91a
--- /dev/null
+++ b/debian/patches/15_jam.patch
@@ -0,0 +1,87 @@
+Description: Add multiarch support to jam files
+Author: Jörg Frings Fürst <debian@jff-webhosting.net>
+Forwarded:
+Last-Update: 2014-09-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/Jamtop
+===================================================================
+--- trunk.orig/Jamtop 2014-09-06 10:26:03.492738912 +0200
++++ trunk/Jamtop 2014-09-06 10:26:03.484738743 +0200
+@@ -108,13 +108,18 @@
+ }
+
+ # See if we have a system TIFF library.
+-if ! $(BUILTIN_TIFF) && $(UNIX) {
+- if [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ] {
++if ! $(BUILDIN_TIFF) {
++if $(UNIX) {
++ if [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ]
++ || [ GLOB /usr/include/x86_64-linux-gnu : tiffio.h ]
++ || [ GLOB /usr/include/i386-linux-gnu : tiffio.h ] {
+ if [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ]
+ || [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ]
+ || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ]
+ || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ]
+- || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] {
++ || [ GLOB /usr/lib/lib/i386-linux-gnu : libtiff.so ]
++ || [ GLOB /usr/lib/lib/i386-linux-gnu : libtiff.a ]
++ || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] {
+ echo "Using system TIFF library" ;
+ TIFFLIB = ;
+ TIFFINC = ;
+@@ -123,12 +128,13 @@
+ }
+ }
+ }
++}
+
+ # If nothing else, use Argyll supplied TIFF library
+ if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) {
+ echo "Using Argyll TIFF library" ;
+- TIFFLIB = ../tiff/libtiff.lib ;
+- TIFFINC = ../tiff ;
++# TIFFLIB = ../tiff/libtiff.lib ;
++# TIFFINC = ../tiff ;
+ }
+
+ # See if we have a system JPEG library.
+Index: trunk/Jambase
+===================================================================
+--- trunk.orig/Jambase 2014-09-06 10:26:03.492738912 +0200
++++ trunk/Jambase 2014-09-06 10:26:03.484738743 +0200
+@@ -880,7 +880,7 @@
+
+ # UNIX defaults
+
+- CCFLAGS ?= -DUNIX -D_THREAD_SAFE -pipe ;
++ CCFLAGS ?= $(CPPFLAGS) -g -DUNIX -D_THREAD_SAFE -pipe ;
+ CCOPTFLAG ?= -O2 ;
+ CCDEBUGFLAG ?= -g ;
+ CCPROFFLAG ?= ;
+@@ -890,7 +890,7 @@
+ CHGRP ?= chgrp ;
+ CHOWN ?= chown ;
+ LEX ?= lex ;
+- LINKFLAGS ?= ;
++ LINKFLAGS ?= $(LDFLAGS) ;
+ LINKOPTFLAG ?= -O ; # Affects creating .so's
+ LINKSTRIPFLAG ?= -s ;
+ LINKDEBUGFLAG ?= ;
+Index: trunk/imdi/Makefile
+===================================================================
+--- trunk.orig/imdi/Makefile 2014-09-06 10:26:03.492738912 +0200
++++ trunk/imdi/Makefile 2014-09-06 10:26:03.484738743 +0200
+@@ -9,10 +9,10 @@
+ # by uncommenting the appropriate line:
+
+ # Microsoft VC++, WinNT setup
+-include Makefile.WNT
++#include Makefile.WNT
+
+ # Generic UNIX setup
+-#include Makefile.UNIX
++include Makefile.UNIX
+
+ # Apple OS X
+ #include Makefile.OSX
diff --git a/debian/patches/series b/debian/patches/series
index ea92233..17d3b70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,8 @@
-01_autotools-support.diff
-02_firmware-package-builder.diff
-03_usb-db.diff
-04_CVE-2012-4405.diff
-06_fix_udev_rule.patch
+100_spelling.patch
+15_jam.patch
+#10_spectro_inst.patch
+#01_autotools-support.diff
+#02_firmware-package-builder.diff
+#03_usb-db.diff
+#04_CVE-2012-4405.diff
+#06_fix_udev_rule.patch
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 03:14:07 +0000