[eccodes] 06/13: refresh static-fix.patch

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/2.5.0-2
in repository eccodes.

commit 6ae9f4d4f78ec0714834f66bcff1ff7cbcfed8b6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 4 11:25:25 2017 +0100

    refresh static-fix.patch
---
 debian/patches/static-fix.patch | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/patches/static-fix.patch b/debian/patches/static-fix.patch
index 08fd2d1..6e6ba18 100644
--- a/debian/patches/static-fix.patch
+++ b/debian/patches/static-fix.patch
@@ -3,7 +3,7 @@ Description: compile fix for shadowed function definitions
  goto-cc compiler says multiple 'usage' functions shadow each other
  due to including 'grib_options' when linking. Declare static.
 Bug-Upstream: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=752732
-Last-Updated: 2016-10-27
+Last-Updated: 2017-10-03
 Forwarded: no
 
 Index: eccodes-2.5.0/tools/mars_request.c
@@ -172,6 +172,32 @@ Index: eccodes-2.5.0/tools/grib_to_netcdf.c
              exit(1);
          }
      }
+@@ -4027,14 +4027,14 @@ int grib_tool_init(grib_runtime_options*
+             char* theArg = grib_options_get_option("d:");
+             if (!is_number(theArg) || atol(theArg)<0 || atol(theArg)>9 ) {
+                 fprintf(stderr, "Invalid deflate option: %s (must be 0 to 9)\n", theArg);
+-                usage();
++                grib_usage();
+                 exit(1);
+             }
+             set_value(user_r, "deflate", theArg);
+             deflate_option=1;
+         } else {
+             fprintf(stderr, "Invalid deflate option for non netCDF-4 output formats\n");
+-            usage();
++            grib_usage();
+             exit(1);
+         }
+     }
+@@ -4050,7 +4050,7 @@ int grib_tool_init(grib_runtime_options*
+         else
+         {
+             fprintf(stderr, "Invalid shuffle option. Deflate option needed.\n");
+-            usage();
++            grib_usage();
+             exit(1);
+         }
+ 
 @@ -4063,7 +4063,7 @@ int grib_tool_init(grib_runtime_options*
          char* theArg = grib_options_get_option("R:");
          if (!is_number(theArg)) {

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