From d2d6a5eef29fc0325a614022ae1c9d2fd677d7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 26 Aug 2017 16:48:15 +0200 Subject: Refresh 0100_spelling.patch --- debian/changelog | 7 ++- debian/patches/0100_spelling.patch | 94 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 434e592..f111366 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,12 +7,15 @@ argyll (1.9.2+repack-2) UNRELEASED; urgency=medium * debian/copyright: - Remove dh-autoreconf. + Not longer needed since debhelper compatibility level > 10. - - Remove libssl-dev from build depends to use the upstream ssl implemantiton. + - Remove libssl-dev from build depends to use the upstream ssl + implemantiton. + Openssl provides only TLS1.2. TLS1.0 / TLS1.1 is using to connect some - devices (Closes #871427). + devices (Closes: #871427). * Use the automatic debug symbol packages: - Remove argyll-dbg section from debian/control. - Remove override_dh_strip from debian/rules. + * Refresh patches: + - 0100_spelling.patch. -- Jörg Frings-Fürst Sat, 26 Aug 2017 14:50:25 +0200 diff --git a/debian/patches/0100_spelling.patch b/debian/patches/0100_spelling.patch index f0d1f25..2705f6b 100644 --- a/debian/patches/0100_spelling.patch +++ b/debian/patches/0100_spelling.patch @@ -269,6 +269,15 @@ 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( + } + } + +- a1logd(p->log,3,"i1pro_imp_measure sucessful return\n"); ++ a1logd(p->log,3,"i1pro_imp_measure successful return\n"); + if (user_trig) + return I1PRO_USER_TRIG; + return ev; @@ -3815,7 +3815,7 @@ i1pro_code i1pro_imp_meas_refrate( } } @@ -296,6 +305,15 @@ Index: trunk/spectro/i1pro_imp.c s->cal_valid = 1; s->cfdate = m->caldate; +@@ -4310,7 +4310,7 @@ i1pro_code i1pro_save_calibration(i1pro + write_doubles(&x, fp, s->idark_data[3]-1, m->nraw+1); + } + +- a1logd(p->log,3,"nbytes = %d, Checkum = 0x%x\n",x.nbytes,x.chsum); ++ a1logd(p->log,3,"nbytes = %d, Checksum = 0x%x\n",x.nbytes,x.chsum); + write_ints(&x, fp, (int *)&x.chsum, 1); + + if (fclose(fp) != 0) Index: trunk/spectro/madvrwin.c =================================================================== --- trunk.orig/spectro/madvrwin.c @@ -445,6 +463,15 @@ 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( + if (nvals > 0) + vals[0].duration = duration; /* Possible flash duration */ + +- a1logd(p->log,3,"munki_imp_measure sucessful return\n"); ++ a1logd(p->log,3,"munki_imp_measure successful return\n"); + if (user_trig) + return MUNKI_USER_TRIG; + return ev; @@ -3046,7 +3046,7 @@ munki_code munki_imp_meas_refrate( } } @@ -454,6 +481,15 @@ Index: trunk/spectro/munki_imp.c } return MUNKI_RD_NOREFR_FOUND; +@@ -3260,7 +3260,7 @@ munki_code munki_save_calibration(munki + write_doubles(&x, fp, s->idark_data[3]-1, m->nraw+1); + } + +- a1logd(p->log,3,"Checkum = 0x%x\n",x.chsum); ++ a1logd(p->log,3,"Checksum = 0x%x\n",x.chsum); + write_ints(&x, fp, (int *)&x.chsum, 1); + + if (fclose(fp) != 0) @@ -6425,7 +6425,7 @@ munki_code munki_create_hr(munki *p, int int i, j, jj, k, cx, sx; munki_fc coeff[40][16]; /* Existing filter cooefficients */ @@ -954,6 +990,24 @@ Index: trunk/spectro/ex1.c return inst_ok; } +@@ -929,7 +929,7 @@ ex1_interp_native_error(ex1 *p, int ec) + case EX1_FLASH_MAP: + return "Flash map is incompatible with firmware"; + case EX1_DEFERRED: +- return "Operation/Response deffered"; ++ return "Operation/Response deferred"; + default: + return NULL; + } +@@ -1279,7 +1279,7 @@ static int ex1_save_calibration(ex1 *p) + calf_wrspec(&x, p->sconf.idark[0]); + calf_wrspec(&x, p->sconf.idark[1]); + +- a1logd(p->log,3,"nbytes = %d, Checkum = 0x%x\n",x.nbytes,x.chsum); ++ a1logd(p->log,3,"nbytes = %d, Checksum = 0x%x\n",x.nbytes,x.chsum); + calf_wints(&x, (int *)(&x.chsum), 1); + + if (calf_done(&x)) @@ -1466,7 +1466,7 @@ static void dump_command(ex1 *p, ORD8 *b if (flags & EX1_FLAG_NACK) a1logd(p->log, 0, " Negative acknowldgement response\n"); @@ -1066,6 +1120,15 @@ Index: trunk/icc/icc.c /* ArgyllCMS private tag: */ case icmSigAbsToRelTransSpace: +@@ -5773,7 +5773,7 @@ int icmSetMultiLutTables( + return icp->errc = 1; + } + if (pp[tn]->ttype != p->ttype) { +- sprintf(icp->err,"icmSetMultiLutTables Tables have different Tage Type"); ++ sprintf(icp->err,"icmSetMultiLutTables Tables have different Tag Type"); + return icp->errc = 1; + } + Index: trunk/gamut/isecvol.c =================================================================== --- trunk.orig/gamut/isecvol.c @@ -1315,6 +1378,15 @@ Index: trunk/target/ofps.c } #ifdef DUMP_STRUCTURE dump_node_vtxs(s, 1); +@@ -8443,7 +8443,7 @@ int nopstop /* Debug - number of opti + fprintf(stderr,"Average dnsqs/position = %.2f\n",s->dnsqs/(double)s->positions); + fprintf(stderr,"Average function calls/dnsq = %.1f\n",s->funccount/(double)s->dnsqs); + fprintf(stderr,"Maximum function calls/dnsq = %d\n",s->maxfunc); +- fprintf(stderr,"Average function calls/sucessful dnsq = %.2f\n",s->sucfunc/(double)s->sucdnsq); ++ fprintf(stderr,"Average function calls/successful dnsq = %.2f\n",s->sucfunc/(double)s->sucdnsq); + fprintf(stderr,"Average function calls/position = %.1f\n",s->funccount/(double)s->positions); + fprintf(stderr,"Maximum tries for dnsq sucess %d\n",s->maxretries); + fprintf(stderr,"Number of position_vtx failures %d\n",s->posfails); Index: trunk/spectro/synthread.c =================================================================== --- trunk.orig/spectro/synthread.c @@ -1390,6 +1462,15 @@ Index: trunk/spectro/smcube.c icmLab2XYZ(&icmD50_100, p->XYZ, p->XYZ); +@@ -2065,7 +2065,7 @@ int static smcube_save_calibration(smcub + calf_wtime_ts(&x, &p->gdate, 1); + calf_wdoubles(&x, p->goff, 3); + +- a1logd(p->log,3,"nbytes = %d, Checkum = 0x%x\n",x.nbytes,x.chsum); ++ a1logd(p->log,3,"nbytes = %d, Checksum = 0x%x\n",x.nbytes,x.chsum); + calf_wints(&x, (int *)(&x.chsum), 1); + + if (calf_done(&x)) Index: trunk/spectro/kleink10.c =================================================================== --- trunk.orig/spectro/kleink10.c @@ -1616,3 +1697,16 @@ Index: trunk/spectro/illumread.c continue; } if ((rv = it->get_set_opt(it, trigmode)) != inst_ok) { +Index: trunk/profile/mppprof.c +=================================================================== +--- trunk.orig/profile/mppprof.c ++++ trunk/profile/mppprof.c +@@ -582,7 +582,7 @@ make_output_mpp( + + /* Estimate the ink mixing model */ + if (omix) { +- printf("The ink mixing model isn't implimented here yet\n"); ++ printf("The ink mixing model isn't implemented here yet\n"); + } + + /* create and write the cgats profile */ -- cgit v1.2.3