diff -Nru gsl-2.5+dfsg/debian/changelog gsl-2.5+dfsg/debian/changelog --- gsl-2.5+dfsg/debian/changelog 2018-08-24 01:30:39.000000000 +0000 +++ gsl-2.5+dfsg/debian/changelog 2018-11-27 02:45:48.000000000 +0000 @@ -1,3 +1,14 @@ +gsl (2.5+dfsg-6) unstable; urgency=medium + + * filter/rmedian.c: Renamed structure element delete to delete_oldest + * movstat/apply.c: Idem + * movstat/gsl_movstat.h: Idem (Closes: #912341) + + * doc/gsl-randist.1: Applied patch suggested by Barak Pearlmutter + (Closes: #915539) + + -- Dirk Eddelbuettel Mon, 26 Nov 2018 20:45:48 -0600 + gsl (2.5+dfsg-5) unstable; urgency=medium [ Steve Langasek ] diff -Nru gsl-2.5+dfsg/debian/patches/manual-page-correction gsl-2.5+dfsg/debian/patches/manual-page-correction --- gsl-2.5+dfsg/debian/patches/manual-page-correction 1970-01-01 00:00:00.000000000 +0000 +++ gsl-2.5+dfsg/debian/patches/manual-page-correction 2018-11-27 02:42:12.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Missing double hyphen in manual page +Author: Dirk Eddelbuettel +Bug-Debian: https://bugs.debian.org/913539 +Origin: other, email by Barak Pearlmutter +Last-Update: 2018-11-27 + +--- gsl-2.5+dfsg.orig/doc/gsl-randist.1 ++++ gsl-2.5+dfsg/doc/gsl-randist.1 +@@ -15,7 +15,7 @@ Here is an example. We generate 10000 r + distribution with a width of 30 and histogram them over the range -100 to + 100, using 200 bins. + +- gsl-randist 0 10000 cauchy 30 | gsl-histogram -100 100 200 > histogram.dat ++ gsl-randist 0 10000 cauchy 30 | gsl-histogram -- -100 100 200 > histogram.dat + + A plot of the resulting histogram will show the familiar shape of the + Cauchy distribution with fluctuations caused by the finite sample diff -Nru gsl-2.5+dfsg/debian/patches/renamed-delete gsl-2.5+dfsg/debian/patches/renamed-delete --- gsl-2.5+dfsg/debian/patches/renamed-delete 1970-01-01 00:00:00.000000000 +0000 +++ gsl-2.5+dfsg/debian/patches/renamed-delete 2018-11-27 02:42:35.000000000 +0000 @@ -0,0 +1,77 @@ +Description: The struct member 'delete' conflicts in C++ code + Upstream patch +Author: Dirk Eddelbuettel +Bug-Debian: https://bugs.debian.org/907119 +Origin: upstream, http://git.savannah.gnu.org/cgit/gsl.git/commit/?id=d9a747a9d2819899e436bb546edd61bfcab0558e +Bug-Debian: https://bugs.debian.org/912341 +Last-Update: 2018-11-27 + +--- gsl-2.5+dfsg.orig/filter/rmedian.c ++++ gsl-2.5+dfsg/filter/rmedian.c +@@ -188,7 +188,7 @@ static int + rmedian_delete(void * vstate) + { + rmedian_state_t * state = (rmedian_state_t *) vstate; +- return (state->minmax_acc->delete)(state->minmax_state); ++ return (state->minmax_acc->delete_oldest)(state->minmax_state); + } + + static int +--- gsl-2.5+dfsg.orig/movstat/apply.c ++++ gsl-2.5+dfsg/movstat/apply.c +@@ -91,7 +91,7 @@ gsl_movstat_apply_accum(const gsl_movsta + for (i = 0; i < H; ++i) + (accum->insert)(x1, w->state); + } +- else if (accum->delete == NULL) /* FIXME XXX */ ++ else if (accum->delete_oldest == NULL) /* FIXME XXX */ + { + /* save last K - 1 samples of x for later (needed for in-place input/output) */ + int idx1 = GSL_MAX(n - J - H, 0); +@@ -125,7 +125,7 @@ gsl_movstat_apply_accum(const gsl_movsta + int idx1 = GSL_MAX(n - J, 0); + int idx2 = n - 1; + +- if (accum->delete == NULL) ++ if (accum->delete_oldest == NULL) + { + int wsize = n - GSL_MAX(n - J - H, 0); /* size of work array */ + +@@ -154,7 +154,7 @@ gsl_movstat_apply_accum(const gsl_movsta + if (i - H > 0) + { + /* delete oldest window sample as we move closer to edge */ +- (accum->delete)(w->state); ++ (accum->delete_oldest)(w->state); + } + + /* yi = acc_get [ work(i:K-2) ] */ +--- gsl-2.5+dfsg.orig/movstat/gsl_movstat.h ++++ gsl-2.5+dfsg/movstat/gsl_movstat.h +@@ -43,19 +43,19 @@ typedef enum + } gsl_movstat_end_t; + + /* accumulator struct +- * size - return number of bytes needed for accumulator with maximum of n elements +- * init - initialize accumulator state +- * insert - insert a single sample into accumulator; if there are already n +- * samples in accumulator, oldest sample is overwritten +- * delete - delete oldest sample from accumulator +- * get - return accumulated value ++ * size - return number of bytes needed for accumulator with maximum of n elements ++ * init - initialize accumulator state ++ * insert - insert a single sample into accumulator; if there are already n ++ * samples in accumulator, oldest sample is overwritten ++ * delete_oldest - delete oldest sample from accumulator ++ * get - return accumulated value + */ + typedef struct + { + size_t (*size) (const size_t n); + int (*init) (const size_t n, void * vstate); + int (*insert) (const double x, void * vstate); +- int (*delete) (void * vstate); ++ int (*delete_oldest) (void * vstate); + int (*get) (void * params, double * result, const void * vstate); + } gsl_movstat_accum; + diff -Nru gsl-2.5+dfsg/debian/patches/series gsl-2.5+dfsg/debian/patches/series --- gsl-2.5+dfsg/debian/patches/series 2018-08-24 01:27:07.000000000 +0000 +++ gsl-2.5+dfsg/debian/patches/series 2018-11-27 02:38:10.000000000 +0000 @@ -2,3 +2,5 @@ ## dont-disable-deprecated.full ## reset-so-number gsl-cblas-linkage +manual-page-correction +renamed-delete