[netcdf] 05/08: Drop cross.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 15f28453d4f7bfb328b4d04bdf9e8059e2415fb7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 25 19:31:51 2018 +0100

    Drop cross.patch, applied upstream. Refresh remaining patches.
---
 debian/changelog                            |  1 +
 debian/patches/cross.patch                  | 35 -----------------------------
 debian/patches/hdf5-library-path.patch      |  4 ++--
 debian/patches/link-private.patch           |  2 +-
 debian/patches/series                       |  1 -
 debian/patches/tst_fileinfo-link-hdf5.patch |  2 +-
 6 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b36192b..cd8437d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ netcdf (1:4.6.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update copyright-format URL to use HTTPS.
   * Update copyright years for Unidata.
+  * Drop cross.patch, applied upstream. Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 25 Jan 2018 19:23:38 +0100
 
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
deleted file mode 100644
index 40b50a0..0000000
--- a/debian/patches/cross.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Description: Fix cross build from source.
-Author: Helmut Grohne <helmut at subdivi.de>
-Bug-Debian: https://bugs.debian.org/885845
-Bug: https://github.com/Unidata/netcdf-c/issues/753
-Applied-Upstream: https://github.com/Unidata/netcdf-c/commit/2281f3e133ace03521b1368ca8c6d7a1e3e813dc
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,7 +93,6 @@ INCLUDE(${CMAKE_ROOT}/Modules/CheckTypeS
- INCLUDE(${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
- INCLUDE(${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake)
- INCLUDE(${CMAKE_ROOT}/Modules/CheckCSourceCompiles.cmake)
--INCLUDE(${CMAKE_ROOT}/Modules/CheckCSourceRuns.cmake)
- INCLUDE(${CMAKE_ROOT}/Modules/TestBigEndian.cmake)
- INCLUDE(${CMAKE_ROOT}/Modules/CheckSymbolExists.cmake)
- INCLUDE(${CMAKE_ROOT}/Modules/GetPrerequisites.cmake)
-@@ -1194,14 +1193,12 @@ MARK_AS_ADVANCED(ENABLE_SHARED_LIBRARY_V
- SET(SIGNED_TEST_SOURCE "\n
-   #include <stdlib.h>\n
-   int main(void) {\n
--    char is_signed = (char) - 1;\n
--    if(is_signed < 0)\n
--      return 1;\n
--    else\n
--      return 0;\n
-+    char error_if_char_is_signed[((char)-1) < 0 ? -1 : 1];\n
-+    error_if_char_is_signed[0] = 0;
-+    return 0;\n
- }\n")
- 
--CHECK_C_SOURCE_RUNS("${SIGNED_TEST_SOURCE}" __CHAR_UNSIGNED__)
-+CHECK_C_SOURCE_COMPILES("${SIGNED_TEST_SOURCE}" __CHAR_UNSIGNED__)
- 
- # Library include checks
- CHECK_INCLUDE_FILE("math.h"      HAVE_MATH_H)
diff --git a/debian/patches/hdf5-library-path.patch b/debian/patches/hdf5-library-path.patch
index 190d927..38129ba 100644
--- a/debian/patches/hdf5-library-path.patch
+++ b/debian/patches/hdf5-library-path.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -747,7 +747,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+@@ -755,7 +755,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
    SET(USE_ZLIB ON)
    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
  
@@ -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)
-@@ -1813,6 +1813,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
+@@ -1825,6 +1825,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 393a8af..d1425e2 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
-@@ -84,7 +84,7 @@ IF(TLL_LIBS)
+@@ -92,7 +92,7 @@ IF(TLL_LIBS)
    LIST(REMOVE_DUPLICATES TLL_LIBS)
  ENDIF()
  
diff --git a/debian/patches/series b/debian/patches/series
index 7c9f290..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
-cross.patch
diff --git a/debian/patches/tst_fileinfo-link-hdf5.patch b/debian/patches/tst_fileinfo-link-hdf5.patch
index 74e593a..b3c32e8 100644
--- a/debian/patches/tst_fileinfo-link-hdf5.patch
+++ b/debian/patches/tst_fileinfo-link-hdf5.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/ncdump/CMakeLists.txt
 +++ b/ncdump/CMakeLists.txt
-@@ -68,6 +68,21 @@ IF(ENABLE_TESTS)
+@@ -52,6 +52,21 @@ IF(ENABLE_TESTS)
    IF(USE_NETCDF4)
      ADD_EXECUTABLE(tst_fileinfo tst_fileinfo.c)
      TARGET_LINK_LIBRARIES(tst_fileinfo netcdf)

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