[cdo] 16/16: More changes needed for off_t patch. Closes: #878408

[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 7ee1a69f42d8c2673f3efb1f77d21d000c13049f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 25 09:20:19 2017 +0100

    More changes needed for off_t patch. Closes: #878408
---
 debian/changelog               |  6 ++++++
 debian/patches/off_t-fix.patch | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6927027..a5ed713 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cdo (1.9.1+dfsg.1-5) unstable; urgency=medium
+
+  * More changes needed for off_t patch. Closes: #878408
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 25 Oct 2017 07:12:30 +0100
+
 cdo (1.9.1+dfsg.1-4) unstable; urgency=medium
 
   * Workaround for off_t bug. off_t is defined differently (long vs long long)
diff --git a/debian/patches/off_t-fix.patch b/debian/patches/off_t-fix.patch
index 3c84f5e..6f7d4e3 100644
--- a/debian/patches/off_t-fix.patch
+++ b/debian/patches/off_t-fix.patch
@@ -2,7 +2,7 @@ Description: off_t has conflicting definiions if pulled in first after <thread>
  or not (long vs long long, on 32-bit archs)
  For consistency, add <thread> ahead where necessary
 Author: Alastair McKinstry <mckinstry at debian.org>
-Last-Updated: 2017-10-23
+Last-Updated: 2017-10-24
 Forwarded: no
 
 Index: cdo-1.9.1+dfsg.1/src/Afterburner.cc
@@ -29,3 +29,16 @@ Index: cdo-1.9.1+dfsg.1/src/process.cc
  #if defined(HAVE_CONFIG_H)
  #include "config.h"
  #endif
+Index: cdo-1.9.1+dfsg.1/src/Gradsdes.cc
+===================================================================
+--- cdo-1.9.1+dfsg.1.orig/src/Gradsdes.cc
++++ cdo-1.9.1+dfsg.1/src/Gradsdes.cc
+@@ -21,7 +21,7 @@
+       Gradsdes   gradsdes       GrADS data descriptor file
+ */
+ 
+-
++#include <thread>
+ #if defined(HAVE_CONFIG_H)
+ #include "config.h" /* VERSION */
+ #endif

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