summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/100_spelling.patch28
-rw-r--r--debian/patches/110_dispwin_segfault.patch2
-rw-r--r--debian/patches/20_hurd_PATH_MAX.patch2
-rw-r--r--debian/patches/series2
5 files changed, 19 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index c8bf772..30e405c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
argyll (1.8.3+repack-1) UNRELEASED; urgency=medium
- *
+ * New upstream release.
+ * Refresh patches.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 06 Nov 2015 07:19:48 +0100
diff --git a/debian/patches/100_spelling.patch b/debian/patches/100_spelling.patch
index eb52570..2d46f66 100644
--- a/debian/patches/100_spelling.patch
+++ b/debian/patches/100_spelling.patch
@@ -143,7 +143,7 @@ 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));
-@@ -5128,7 +5128,7 @@ int ddebug /* >0 to print debug sta
+@@ -5131,7 +5131,7 @@ int ddebug /* >0 to print debug sta
p->native = native &= ~2;
}
@@ -208,7 +208,7 @@ Index: trunk/spectro/i1pro_imp.c
===================================================================
--- trunk.orig/spectro/i1pro_imp.c
+++ trunk/spectro/i1pro_imp.c
-@@ -3768,7 +3768,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -3813,7 +3813,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
return I1PRO_OK;
}
@@ -217,7 +217,7 @@ Index: trunk/spectro/i1pro_imp.c
s->dark_valid = 1;
s->ddate = m->caldate;
-@@ -3813,7 +3813,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
+@@ -3858,7 +3858,7 @@ i1pro_code i1pro_restore_refspot_cal(i1p
return I1PRO_OK;
}
@@ -383,8 +383,8 @@ Index: trunk/gamut/nearsmth.c
===================================================================
--- 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;
+@@ -263,7 +263,7 @@ double dxratio /* Depth expansion ratio
+ double va, vr, vd, vv = 0.0;
/* Absolute, Delta E^2 between test point and destination closest */
- /* aodv is already positioned acording to the LCh weights, */
@@ -392,7 +392,7 @@ 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);
-@@ -3598,7 +3598,7 @@ static void create_influence_plot(nearsm
+@@ -4067,7 +4067,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);
@@ -405,8 +405,8 @@ Index: trunk/gamut/nearsmth.h
===================================================================
--- trunk.orig/gamut/nearsmth.h
+++ trunk/gamut/nearsmth.h
-@@ -274,7 +274,7 @@ gammapweights *src1, double wgt1,
- gammapweights *src2, double wgt2
+@@ -294,7 +294,7 @@ gammapweights *src2, double wgt2,
+ gammapweights *src3, double wgt3
);
-/* Tweak weights acording to extra cmy cusp flags or rel override */
@@ -444,7 +444,7 @@ Index: trunk/link/collink.c
===================================================================
--- trunk.orig/link/collink.c
+++ trunk/link/collink.c
-@@ -1138,7 +1138,7 @@ void devip_devop(void *cntx, double *out
+@@ -1111,7 +1111,7 @@ void devip_devop(void *cntx, double *out
}
/* We've got the input profile PCS' at this point. */
@@ -453,7 +453,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. */
-@@ -1270,7 +1270,7 @@ void devip_devop(void *cntx, double *out
+@@ -1243,7 +1243,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 */
@@ -492,7 +492,7 @@ Index: trunk/gamut/gammap.c
===================================================================
--- trunk.orig/gamut/gammap.c
+++ trunk/gamut/gammap.c
-@@ -775,7 +775,7 @@ gammap *new_gammap(
+@@ -853,7 +853,7 @@ gammap *new_gammap(
#endif
if (gmi->bph == gmm_clipBP) {
@@ -544,7 +544,7 @@ Index: trunk/spectro/ccxxmake.c
===================================================================
--- trunk.orig/spectro/ccxxmake.c
+++ trunk/spectro/ccxxmake.c
-@@ -395,7 +395,7 @@ int main(int argc, char *argv[]) {
+@@ -398,7 +398,7 @@ int main(int argc, char *argv[]) {
/* COM port */
} else if (argv[fa][1] == 'c') {
fa = nfa;
@@ -553,7 +553,7 @@ Index: trunk/spectro/ccxxmake.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[]) {
+@@ -498,7 +498,7 @@ int main(int argc, char *argv[]) {
/* Serial port flow control */
} else if (argv[fa][1] == 'W') {
fa = nfa;
@@ -562,7 +562,7 @@ Index: trunk/spectro/ccxxmake.c
if (na[0] == 'n' || na[0] == 'N')
fc = fc_none;
else if (na[0] == 'h' || na[0] == 'H')
-@@ -584,7 +584,7 @@ int main(int argc, char *argv[]) {
+@@ -587,7 +587,7 @@ int main(int argc, char *argv[]) {
strcat(outname, doccss ? ".ccss" : ".ccmx");
if (fakeseq && doccss)
diff --git a/debian/patches/110_dispwin_segfault.patch b/debian/patches/110_dispwin_segfault.patch
index 2b1e684..cfd6eba 100644
--- a/debian/patches/110_dispwin_segfault.patch
+++ b/debian/patches/110_dispwin_segfault.patch
@@ -10,7 +10,7 @@ Index: trunk/spectro/dispwin.c
===================================================================
--- trunk.orig/spectro/dispwin.c
+++ trunk/spectro/dispwin.c
-@@ -5553,6 +5553,7 @@ main(int argc, char *argv[]) {
+@@ -5556,6 +5556,7 @@ main(int argc, char *argv[]) {
/* Display number */
else if (argv[fa][1] == 'd') {
diff --git a/debian/patches/20_hurd_PATH_MAX.patch b/debian/patches/20_hurd_PATH_MAX.patch
index 0079adb..3775edc 100644
--- a/debian/patches/20_hurd_PATH_MAX.patch
+++ b/debian/patches/20_hurd_PATH_MAX.patch
@@ -8,7 +8,7 @@ Index: trunk/numlib/numsup.c
===================================================================
--- trunk.orig/numlib/numsup.c
+++ trunk/numlib/numsup.c
-@@ -40,6 +40,10 @@
+@@ -47,6 +47,10 @@
/* Globals */
diff --git a/debian/patches/series b/debian/patches/series
index 4856c86..8f5d038 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