[cdo] 14/16: refresh patches

[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 db9da6c0f8fe79792412b861d9d5c3e8b905e5cc
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jul 3 14:15:04 2016 +0100

    refresh patches
---
 debian/changelog                     |  1 +
 debian/patches/build-fixes.patch     | 17 -----------------
 debian/patches/fix_typos.patch       |  5 +++++
 debian/patches/hppa_gomp_bug.patch   |  8 ++++----
 debian/patches/libc-2.23-fixes.patch | 24 +++---------------------
 debian/patches/str2uuid.patch        |  5 -----
 6 files changed, 13 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cfd28f6..60540c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cdo (1.7.2+dfsg.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - refresh patches
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sun, 03 Jul 2016 13:59:22 +0100
 
diff --git a/debian/patches/build-fixes.patch b/debian/patches/build-fixes.patch
deleted file mode 100644
index bc26b43..0000000
--- a/debian/patches/build-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Add explicit declaration.
-Last-Updated: 2014-10-28
-Forwarded: no
-
-Index: cdo-1.6.5+dfsg.1/src/griddes.c
-===================================================================
---- cdo-1.6.5+dfsg.1.orig/src/griddes.c
-+++ cdo-1.6.5+dfsg.1/src/griddes.c
-@@ -55,6 +55,7 @@ void extClose(int fileID);
- 
- #define MAX_LINE_LEN 65536
- 
-+void str2uuid(const char *uuidstr, char *uuid);
- 
- void gridInit(griddes_t *grid)
- {
diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index d86318c..49ce3d0 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -1,3 +1,8 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Fix typos.
+Last-Updated: 2015-07-20
+Forwarded: no
+
 Index: cdo-1.6.9+dfsg.1/libcdi/src/grid.c
 ===================================================================
 --- cdo-1.6.9+dfsg.1.orig/libcdi/src/grid.c
diff --git a/debian/patches/hppa_gomp_bug.patch b/debian/patches/hppa_gomp_bug.patch
index b8a4b91..30b8b05 100644
--- a/debian/patches/hppa_gomp_bug.patch
+++ b/debian/patches/hppa_gomp_bug.patch
@@ -9,11 +9,11 @@ Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790393
 Last-Updated: 2016-03-21
 Forwarded: no
 
-Index: cdo-1.7.1+dfsg.1/src/remaplib.c
+Index: cdo-1.7.2+dfsg.1/src/remaplib.c
 ===================================================================
---- cdo-1.7.1+dfsg.1.orig/src/remaplib.c
-+++ cdo-1.7.1+dfsg.1/src/remaplib.c
-@@ -1573,13 +1573,14 @@ void remap_stat(int remap_order, remapgr
+--- cdo-1.7.2+dfsg.1.orig/src/remaplib.c
++++ cdo-1.7.2+dfsg.1/src/remaplib.c
+@@ -1570,13 +1570,14 @@ void remap_stat(int remap_order, remapgr
  
  /*****************************************************************************/
  
diff --git a/debian/patches/libc-2.23-fixes.patch b/debian/patches/libc-2.23-fixes.patch
index 955199c..3664de5 100644
--- a/debian/patches/libc-2.23-fixes.patch
+++ b/debian/patches/libc-2.23-fixes.patch
@@ -4,10 +4,10 @@ Forwarded: no
 Last-Updated: 2016-03-21
 Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818826
 
-Index: cdo-1.7.1+dfsg.1/src/EOFs.c
+Index: cdo-1.7.2+dfsg.1/src/EOFs.c
 ===================================================================
---- cdo-1.7.1+dfsg.1.orig/src/EOFs.c
-+++ cdo-1.7.1+dfsg.1/src/EOFs.c
+--- cdo-1.7.2+dfsg.1.orig/src/EOFs.c
++++ cdo-1.7.2+dfsg.1/src/EOFs.c
 @@ -181,7 +181,7 @@ void *EOFs(void * argument)
    juldate_t juldate;
  
@@ -17,21 +17,3 @@ Index: cdo-1.7.1+dfsg.1/src/EOFs.c
    double xvals, yvals;
  
    typedef struct {
-@@ -377,7 +377,7 @@ void *EOFs(void * argument)
- 	      npack = 0;
- 	      for ( i = 0; i < gridsize; ++i )
- 		{
--		  if ( !DBL_IS_EQUAL(weight[i], 0) && !DBL_IS_EQUAL(weight[i], missval) &&
-+		  if ( !DBL_IS_EQUAL(weight[i], 0.0) && !DBL_IS_EQUAL(weight[i], missval) &&
- 		       !DBL_IS_EQUAL(in[i], missval) )
- 		    pack[npack++] = i;
- 		}
-@@ -392,7 +392,7 @@ void *EOFs(void * argument)
- 	  ipack = 0;
- 	  for ( i = 0; i < gridsize; ++i )
- 	    {
--	      if ( !DBL_IS_EQUAL(weight[i], 0) && !DBL_IS_EQUAL(weight[i], missval) &&
-+	      if ( !DBL_IS_EQUAL(weight[i], 0.0) && !DBL_IS_EQUAL(weight[i], missval) &&
- 		   !DBL_IS_EQUAL(in[i], missval) && pack[ipack++] != i )
- 		{
- 		  cdoAbort("Missing values unsupported!");
diff --git a/debian/patches/str2uuid.patch b/debian/patches/str2uuid.patch
deleted file mode 100644
index eaadc23..0000000
--- a/debian/patches/str2uuid.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Build fix needed for str2uuid() fn
-Forwarded: no
-Last-Updated: 2015-06-29
-

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