This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf.
commit 16662fbba382b316feda786f67d4ca6c94232d02 Author: Bas Couwenberg <[email protected]> Date: Tue Jun 6 07:45:25 2017 +0200 Refresh patches. --- debian/changelog | 1 + debian/patches/hdf5-library-path.patch | 15 ++++++++--- debian/patches/link-private.patch | 2 +- debian/patches/tst_fileinfo-link-hdf5.patch | 40 ++++++++++++++--------------- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index c1b30cd..49651e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ netcdf (1:4.5.0~rc1-1) UNRELEASED; urgency=medium - Update copyright years for Unidata - Add license & copyright for new files - Rename MIT license shortname to Expat + * Refresh patches. -- Bas Couwenberg <[email protected]> Tue, 06 Jun 2017 07:17:14 +0200 diff --git a/debian/patches/hdf5-library-path.patch b/debian/patches/hdf5-library-path.patch index 82baa5c..7f68145 100644 --- a/debian/patches/hdf5-library-path.patch +++ b/debian/patches/hdf5-library-path.patch @@ -7,7 +7,16 @@ Forwarded: not-needed --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1613,6 +1613,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA +@@ -747,7 +747,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + SET(USE_ZLIB ON) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS}) + +- 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) +@@ -1797,6 +1797,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) SET(CC ${CMAKE_C_COMPILER}) @@ -36,8 +45,8 @@ Forwarded: not-needed +cflags="-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @HDF5_INCS@" +libs="-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ @HDF5_LIBS@ @NC_LIBS@" - has_dap="@USE_DAP@" - if [ -z $has_dap ]; then + if [ -z "@USE_DAP@" -o -z "@ENABLE_DAP2@" ] ; then + has_dap2=ON --- a/netcdf.pc.in +++ b/netcdf.pc.in @@ -8,6 +8,6 @@ Name: @PACKAGE@ diff --git a/debian/patches/link-private.patch b/debian/patches/link-private.patch index 2a0c42c..393a8af 100644 --- a/debian/patches/link-private.patch +++ b/debian/patches/link-private.patch @@ -3,7 +3,7 @@ Author: Nico Schlömer <[email protected]> --- a/liblib/CMakeLists.txt +++ b/liblib/CMakeLists.txt -@@ -80,7 +80,7 @@ IF(TLL_LIBS) +@@ -84,7 +84,7 @@ IF(TLL_LIBS) LIST(REMOVE_DUPLICATES TLL_LIBS) ENDIF() diff --git a/debian/patches/tst_fileinfo-link-hdf5.patch b/debian/patches/tst_fileinfo-link-hdf5.patch index 2790bf1..74e593a 100644 --- a/debian/patches/tst_fileinfo-link-hdf5.patch +++ b/debian/patches/tst_fileinfo-link-hdf5.patch @@ -8,25 +8,25 @@ Forwarded: not-needed --- a/ncdump/CMakeLists.txt +++ b/ncdump/CMakeLists.txt -@@ -62,6 +62,21 @@ IF(ENABLE_TESTS) - IF(USE_NETCDF4) - ADD_EXECUTABLE(tst_fileinfo tst_fileinfo.c) - TARGET_LINK_LIBRARIES(tst_fileinfo netcdf) -+ IF(USE_HDF5 OR USE_NETCDF4) -+ # Some version of cmake define HDF5_hdf5_LIBRARY instead of -+ # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES -+ IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES) -+ SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY}) +@@ -68,6 +68,21 @@ IF(ENABLE_TESTS) + IF(USE_NETCDF4) + ADD_EXECUTABLE(tst_fileinfo tst_fileinfo.c) + TARGET_LINK_LIBRARIES(tst_fileinfo netcdf) ++ IF(USE_HDF5 OR USE_NETCDF4) ++ # Some version of cmake define HDF5_hdf5_LIBRARY instead of ++ # HDF5_LIBRARY. Same with HDF5_HL_LIBRARIES ++ IF(HDF5_hdf5_LIBRARY AND NOT HDF5_C_LIBRARIES) ++ SET(HDF5_C_LIBRARIES ${HDF5_hdf5_LIBRARY}) ++ ENDIF() ++ IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES) ++ SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY}) ++ ENDIF() ++ # The order of the libraries is important here for static ++ # builds: ++ # Make sure that HDF5_C_LIBRARY appears *after* ++ # HDF5_HL_LIBRARY. ++ TARGET_LINK_LIBRARIES(tst_fileinfo ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES}) + ENDIF() -+ IF(HDF5_hdf5_hl_LIBRARY AND NOT HDF5_HL_LIBRARIES) -+ SET(HDF5_HL_LIBRARIES ${HDF5_hdf5_hl_LIBRARY}) -+ ENDIF() -+ # The order of the libraries is important here for static -+ # builds: -+ # Make sure that HDF5_C_LIBRARY appears *after* -+ # HDF5_HL_LIBRARY. -+ TARGET_LINK_LIBRARIES(tst_fileinfo ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES}) -+ ENDIF() - add_sh_test(ncdump tst_fileinfo) - ENDIF() + ENDIF() + IF(MSVC) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
