[cdo] 10/16: Test nvals patch

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cdo.

commit 1b182a98feceb3b0fceea25258f8bf7b0f726da4
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Oct 14 07:29:51 2017 +0100

    Test nvals patch
---
 debian/changelog                |  4 ++--
 debian/patches/pipe_nvals.patch | 22 ++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0d5d9c..088757c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-cdo (1.9.1+dfsg.1-2) UNRELEASED; urgency=medium
+cdo (1.9.1+dfsg.1-2) experimental; urgency=medium
 
   * Drop eccodes patch; instead use new --with-eccodes functionality
   * Add --enable-hirlam-extensions
   * Enable --with-libxml2 support
 
- -- Alastair McKinstry <mckinstry at debian.org>  Fri, 13 Oct 2017 21:06:15 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Sat, 14 Oct 2017 07:29:18 +0100
 
 cdo (1.9.1+dfsg.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/pipe_nvals.patch b/debian/patches/pipe_nvals.patch
new file mode 100644
index 0000000..d3a2943
--- /dev/null
+++ b/debian/patches/pipe_nvals.patch
@@ -0,0 +1,22 @@
+Index: cdo-1.9.1+dfsg.1/src/pstream.cc
+===================================================================
+--- cdo-1.9.1+dfsg.1.orig/src/pstream.cc
++++ cdo-1.9.1+dfsg.1/src/pstream.cc
+@@ -933,7 +933,7 @@ pstreamCloseChildStream(pstream_t *pstre
+     }
+   pthread_mutex_unlock(pipe->m_mutex);
+ 
+-  processAddNvals(pipe->nvals);
++  processAddNvals((off_t) pipe->nvals);
+ }
+ void
+ pstreamCloseParentStream(pstream_t *pstreamptr)
+@@ -999,7 +999,7 @@ void pstream_t::close(){
+ 
+       if (mode == 'r')
+         {
+-          processAddNvals(streamNvals(m_fileID));
++          processAddNvals( (off_t) streamNvals(m_fileID));
+         }
+ 
+ #if defined(HAVE_LIBPTHREAD)
diff --git a/debian/patches/series b/debian/patches/series
index d4dbb3c..1c72c27 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+pipe_nvals.patch
 fix_typos.patch
 ignore.patch
 deregister.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git