[netcdf] 06/08: Refresh patches.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository netcdf.

commit 5d885fecc1e20cfbe5bc841d8116959260927625
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Sep 30 10:14:30 2017 +0200

    Refresh patches.
---
 debian/changelog                       | 1 +
 debian/patches/hdf5-library-path.patch | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93ab452..c9f64ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ netcdf (1:4.5.0~rc3-1) UNRELEASED; urgency=medium
   * Change priority from extra to optional.
   * Bump Standards-Version to 4.1.1, changes: priority.
   * Update copyright years for Northwestern University.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 30 Sep 2017 10:09:19 +0200
 
diff --git a/debian/patches/hdf5-library-path.patch b/debian/patches/hdf5-library-path.patch
index 7f68145..190d927 100644
--- a/debian/patches/hdf5-library-path.patch
+++ b/debian/patches/hdf5-library-path.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
    IF(NOT HAVE_HDF5_H)
      MESSAGE(FATAL_ERROR "Compiling a test with hdf5 failed. Either hdf5.h cannot be found, or the log messages should be checked for another reason.")
    ELSE(NOT HAVE_HDF5_H)
-@@ -1797,6 +1797,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
+@@ -1813,6 +1813,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
  SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
  SET(CC ${CMAKE_C_COMPILER})
  
@@ -45,8 +45,8 @@ Forwarded: not-needed
 +cflags="-I at CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @HDF5_INCS@"
 +libs="-L at CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ @HDF5_LIBS@ @NC_LIBS@"
  
- if [ -z "@USE_DAP@" -o -z "@ENABLE_DAP2@" ] ; then
- has_dap2=ON
+ has_dap2="@ENABLE_DAP2@"
+ if [ -z $has_dap2 -o "$has_dap2" = "OFF" ]; then
 --- a/netcdf.pc.in
 +++ b/netcdf.pc.in
 @@ -8,6 +8,6 @@ Name: @PACKAGE@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git