This is an automated email from the git hooks/post-receive script. tille pushed a commit to branch master in repository r-bioc-genefilter.
commit 410daca692b76ddc03564e4e01cdda8167e499f6 Author: Andreas Tille <[email protected]> Date: Thu Jan 28 10:01:56 2016 +0000 Apply upstream patch to fix conflicting declarations of function gf_distance --- debian/changelog | 7 +++++ debian/control | 2 +- debian/patches/gf_distance_definition.patch | 41 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4d21995..896e086 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +r-bioc-genefilter (1.52.0-2) unstable; urgency=medium + + * Apply upstream patch to fix conflicting declarations of function gf_distance + Closes: #812767 + + -- Andreas Tille <[email protected]> Thu, 28 Jan 2016 10:55:03 +0100 + r-bioc-genefilter (1.52.0-1) unstable; urgency=medium * New upstream version diff --git a/debian/control b/debian/control index e53c8d5..270f537 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 9), r-bioc-annotate, r-cran-survival Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-bioc-genefilter/trunk/ +Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/R/r-bioc-genefilter/trunk/ Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/R/r-bioc-genefilter/trunk/ Homepage: http://bioconductor.org/packages/release/bioc/html/genefilter.html diff --git a/debian/patches/gf_distance_definition.patch b/debian/patches/gf_distance_definition.patch new file mode 100644 index 0000000..604f095 --- /dev/null +++ b/debian/patches/gf_distance_definition.patch @@ -0,0 +1,41 @@ +Origin: upstream, https://hedgehog.fhcrc.org/bioconductor/branches/RELEASE_3_2/madman/Rpacks/genefilter r112947 +Author:"Morgan, Martin" <[email protected]> +Last-Update: 2016-01-27 16:59:31 +Bug-Debian: https://bugs.debian.org/812767 +Description: bugfix: rationalize C signatures to gf_distance + + +--- a/src/nd.c ++++ b/src/nd.c +@@ -26,17 +26,14 @@ + #if defined(USING_R) /*( R-specific stuff */ + + #define S_CDECL +-typedef int RSInt; +- + #ifdef HAVE_CONFIG_H + # include <config.h> + #endif + /* we need this first to get the right options for math.h */ + #include <R_ext/Arith.h> + +-#include <R.h> ++#include "genefilter.h" + #include <Rmath.h> +-#include <Rinternals.h> + #include "R_ext/Error.h" + #include "R_ext/Applic.h" + +--- a/src/genefilter.h ++++ b/src/genefilter.h +@@ -2,5 +2,8 @@ + #include <R.h> + #include <Rinternals.h> + +-void gf_distance(double *x, double *kval, int *nr, int *nc, double *d, +- int *diag, int *method); ++typedef int RSInt; ++ ++void gf_distance(double *x, RSInt *nr, RSInt *nc, RSInt *g, double *d, ++ RSInt *iRow, RSInt *nInterest, RSInt *nResults, ++ RSInt *method, double *wval); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c25ae49 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +gf_distance_definition.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/r-bioc-genefilter.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
