[netcdf] 05/07: Drop big-endian.patch, applied upstream. Refresh remaining 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 25785861b6ef8cca51346791825a8697f56c628c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 20 07:30:45 2018 +0100

    Drop big-endian.patch, applied upstream. Refresh remaining patches.
---
 debian/changelog                       |  1 +
 debian/patches/big-endian.patch        | 15 ---------------
 debian/patches/hdf5-library-path.patch |  8 ++++----
 debian/patches/link-private.patch      |  2 +-
 debian/patches/series                  |  1 -
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40dd99b..fda4a73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ netcdf (1:4.6.1-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Don't use libjs-jquery for Doxygen docs.
   * Add lintian override for vcs-deprecated-in-debian-infrastructure.
+  * Drop big-endian.patch, applied upstream. Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 20 Mar 2018 07:24:05 +0100
 
diff --git a/debian/patches/big-endian.patch b/debian/patches/big-endian.patch
deleted file mode 100644
index 5a8234d..0000000
--- a/debian/patches/big-endian.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix build failure on big-endian architectures.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/Unidata/netcdf-c/issues/806
-
---- a/libdispatch/dfilter.c
-+++ b/libdispatch/dfilter.c
-@@ -156,7 +156,7 @@ NC_parsefilterspec(const char* spec, uns
- 	    /* convert to network byte order */
- 	    memcpy(mem,&val64u,sizeof(mem));
- #ifdef WORDS_BIGENDIAN	    
--	    byteswap8(mem);  /* convert big endian to little endian */
-+	    NC_byteswap8(mem);  /* convert big endian to little endian */
- #endif
- 	    vector = (unsigned int*)mem;
- 	    ulist[nparams++] = vector[0];
diff --git a/debian/patches/hdf5-library-path.patch b/debian/patches/hdf5-library-path.patch
index 38129ba..6ee9781 100644
--- a/debian/patches/hdf5-library-path.patch
+++ b/debian/patches/hdf5-library-path.patch
@@ -7,16 +7,16 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -755,7 +755,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-   SET(USE_ZLIB ON)
-   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
+@@ -746,7 +746,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+     SET(H5_USE_16_API 0)
+   ENDIF()
  
 -  FIND_PATH(HAVE_HDF5_H hdf5.h)
 +  FIND_PATH(HAVE_HDF5_H hdf5.h PATHS ${HDF5_INCLUDE_PATH})
    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)
-@@ -1825,6 +1825,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
+@@ -1733,6 +1733,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
  SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
  SET(CC ${CMAKE_C_COMPILER})
  
diff --git a/debian/patches/link-private.patch b/debian/patches/link-private.patch
index d1425e2..53fb37c 100644
--- a/debian/patches/link-private.patch
+++ b/debian/patches/link-private.patch
@@ -3,7 +3,7 @@ Author: Nico Schlömer <nico.schloemer at gmail.com>
 
 --- a/liblib/CMakeLists.txt
 +++ b/liblib/CMakeLists.txt
-@@ -92,7 +92,7 @@ IF(TLL_LIBS)
+@@ -96,7 +96,7 @@ IF(TLL_LIBS)
    LIST(REMOVE_DUPLICATES TLL_LIBS)
  ENDIF()
  
diff --git a/debian/patches/series b/debian/patches/series
index ffceee2..bf960a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ privacy-breach-logo.patch
 hdf5-library-path.patch
 tst_fileinfo-link-hdf5.patch
 reproducible-settings.patch
-big-endian.patch

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