This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf.
commit 0572c565a03b8ed7197a0a140a6af5170e3aa7f2 Author: Bas Couwenberg <[email protected]> Date: Tue Nov 10 00:02:23 2015 +0100 Add patch to fix inconsistent return types. --- debian/changelog | 7 ++++ debian/patches/inconsistent-return-type.patch | 47 +++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 55 insertions(+) diff --git a/debian/changelog b/debian/changelog index 64f1950..bec4121 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +netcdf (1:4.4.0~rc3-2) UNRELEASED; urgency=medium + + * Add patch to fix inconsistent return types. + (closes: 749511) + + -- Bas Couwenberg <[email protected]> Tue, 10 Nov 2015 00:01:34 +0100 + netcdf (1:4.4.0~rc3-1) unstable; urgency=medium * Move from experimental to unstable. diff --git a/debian/patches/inconsistent-return-type.patch b/debian/patches/inconsistent-return-type.patch new file mode 100644 index 0000000..2ae0b2b --- /dev/null +++ b/debian/patches/inconsistent-return-type.patch @@ -0,0 +1,47 @@ +Description: Fix inconsistent return type. +Author: Michael Tautschnig <[email protected]> +Bug-Debian: https://bugs.debian.org/749511 +Forwarded: https://github.com/Unidata/netcdf-c/pull/147 + +--- a/oc2/oc.h ++++ b/oc2/oc.h +@@ -537,7 +537,7 @@ extern OCerror oc_svcerrordata(OClink li + note that this may or may not be the same as returned + by oc_svcerrordata. + */ +-extern int oc_httpcode(OClink); ++extern OCerror oc_httpcode(OClink); + + /* + (Re-)initialize the oc library as if nothing had been called. +--- a/oc2/ochttp.c ++++ b/oc2/ochttp.c +@@ -88,11 +88,11 @@ fail: + return OCTHROW(OC_ECURL); + } + +-int ++OCerror + ocfetchurl(CURL* curl, const char* url, OCbytes* buf, long* filetime, + struct OCcredentials* creds) + { +- int stat = OC_NOERR; ++ OCerror stat = OC_NOERR; + CURLcode cstat = CURLE_OK; + size_t len; + long httpcode = 0; +--- a/oc2/ocrc.c ++++ b/oc2/ocrc.c +@@ -408,10 +408,10 @@ done: + return stat; + } + +-int ++OCerror + ocrc_process(OCstate* state) + { +- int stat = 0; ++ OCerror stat = OC_NOERR; + char* value = NULL; + OCURI* uri = state->uri; + char* url_userpwd = NULL; diff --git a/debian/patches/series b/debian/patches/series index 60a8cb7..f8c1713 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ link-private.patch privacy-breach-logo.patch hdf5-library-path.patch +inconsistent-return-type.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
