This is an automated email from the git hooks/post-receive script. mckinstry pushed a commit to branch dev-coinstallable in repository netcdf.
commit 33bd9d46051fbd01c5c1a3a205d26b3b325b1091 Author: Alastair McKinstry <mckins...@debian.org> Date: Fri May 13 21:43:03 2016 +0100 refresh patches --- debian/patches/hdf5-library-path.patch | 20 +++++++++++++------- debian/patches/hdf5-location.patch | 8 ++++---- debian/patches/nc-config.patch | 21 +++++++++++---------- debian/patches/pnetcdf-settings.patch | 14 +++++++------- debian/patches/privacy-breach-logo.patch | 12 ++++++++---- debian/patches/reproducible.patch | 6 +++--- 6 files changed, 46 insertions(+), 35 deletions(-) diff --git a/debian/patches/hdf5-library-path.patch b/debian/patches/hdf5-library-path.patch index f49a62e..3c1d32c 100644 --- a/debian/patches/hdf5-library-path.patch +++ b/debian/patches/hdf5-library-path.patch @@ -5,8 +5,10 @@ Description: Append HDF5 library & include paths to nc-config & netcdf.pc. Author: Bas Couwenberg <sebas...@debian.org> Forwarded: not-needed ---- a/CMakeLists.txt -+++ b/CMakeLists.txt +Index: netcdf-4.4.1~rc1/CMakeLists.txt +=================================================================== +--- netcdf-4.4.1~rc1.orig/CMakeLists.txt ++++ netcdf-4.4.1~rc1/CMakeLists.txt @@ -1599,6 +1599,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}) SET(CC ${CMAKE_C_COMPILER}) @@ -25,8 +27,10 @@ Forwarded: not-needed # Process all dependency libraries and create a string # used when parsing netcdf.pc.in ---- a/nc-config.cmake.in -+++ b/nc-config.cmake.in +Index: netcdf-4.4.1~rc1/nc-config.cmake.in +=================================================================== +--- netcdf-4.4.1~rc1.orig/nc-config.cmake.in ++++ netcdf-4.4.1~rc1/nc-config.cmake.in @@ -10,8 +10,8 @@ libdir="@CMAKE_INSTALL_PREFIX@/@CMAKE_IN includedir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" @@ -38,9 +42,11 @@ Forwarded: not-needed has_dap="@USE_DAP@" if [ -z $has_dap ]; then ---- a/netcdf.pc.in -+++ b/netcdf.pc.in -@@ -8,6 +8,6 @@ Name: @PACKAGE@ +Index: netcdf-4.4.1~rc1/netcdf.pc.in +=================================================================== +--- netcdf-4.4.1~rc1.orig/netcdf.pc.in ++++ netcdf-4.4.1~rc1/netcdf.pc.in +@@ -15,6 +15,6 @@ Name: @PACKAGE@ Description: NetCDF Client Library for C URL: http://www.unidata.ucar.edu/netcdf Version: @PACKAGE_VERSION@ diff --git a/debian/patches/hdf5-location.patch b/debian/patches/hdf5-location.patch index f387afa..1a62515 100644 --- a/debian/patches/hdf5-location.patch +++ b/debian/patches/hdf5-location.patch @@ -1,8 +1,8 @@ -Index: netcdf-4.4.0/CMakeLists.txt +Index: netcdf-4.4.1~rc1/CMakeLists.txt =================================================================== ---- netcdf-4.4.0.orig/CMakeLists.txt -+++ netcdf-4.4.0/CMakeLists.txt -@@ -596,8 +596,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) +--- netcdf-4.4.1~rc1.orig/CMakeLists.txt ++++ netcdf-4.4.1~rc1/CMakeLists.txt +@@ -607,8 +607,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) # Find out if HDF5 was built with parallel support. # Do that by checking for the targets H5Pget_fapl_mpiposx and # H5Pget_fapl_mpio in ${HDF5_LIB}. diff --git a/debian/patches/nc-config.patch b/debian/patches/nc-config.patch index 73e5384..8495e7d 100644 --- a/debian/patches/nc-config.patch +++ b/debian/patches/nc-config.patch @@ -4,15 +4,13 @@ Description: Adapt nc-config to use pkg-config, necessary because Last-Updated: 2016-01-16 Forwarded: not-needed -Index: netcdf-4.4.0~rc5/nc-config.in +Index: netcdf-4.4.1~rc1/nc-config.in =================================================================== ---- netcdf-4.4.0~rc5.orig/nc-config.in -+++ netcdf-4.4.0~rc5/nc-config.in -@@ -3,19 +3,20 @@ - # This forms the basis for the nc-config utility, which tells you +--- netcdf-4.4.1~rc1.orig/nc-config.in ++++ netcdf-4.4.1~rc1/nc-config.in +@@ -4,20 +4,19 @@ # various things about the netCDF installation. This code was # contributed by netCDF user Arlindo DaSilva. Thanks Arlindo! -+# adapted by Alastair McKinstry to read from pkg-config for multiarch -prefix=@prefix@ -exec_prefix=${prefix} @@ -21,14 +19,16 @@ Index: netcdf-4.4.0~rc5/nc-config.in +exec_prefix=`pkg-config netcdf --variable=prefix` +includedir=`pkg-config netcdf --variable=includedir` +- -cc="@CC@" --cflags=" -I${includedir} @CPPFLAGS@" +-cflags=" -I${includedir} @CPPFLAGS@" -has_dap="@HAS_DAP@" -has_nc2="@HAS_NC2@" -has_nc4="@HAS_NC4@" -has_hdf4="@HAS_HDF4@" -has_pnetcdf="@HAS_PNETCDF@" -has_hdf5="@HAS_HDF5@" +-has_logging="@HAS_LOGGING@" +cc=`pkg-config netcdf --variable=ccompile` +cflags=`pkg-config netcdf --variable=cflags` +has_dap=`pkg-config netcdf --variable=has_dap` @@ -37,13 +37,14 @@ Index: netcdf-4.4.0~rc5/nc-config.in +has_hdf4=`pkg-config netcdf --variable=has_hdf4` +has_pnetcdf=`pkg-config netcdf --variable=has_pnetcdf` +has_hdf5=`pkg-config netcdf --variable=has_hdf5` ++has_logging=`pkg-config netcdf --variable=has_logging` version="@PACKAGE_NAME@ @PACKAGE_VERSION@" has_f90="no" -Index: netcdf-4.4.0~rc5/netcdf.pc.in +Index: netcdf-4.4.1~rc1/netcdf.pc.in =================================================================== ---- netcdf-4.4.0~rc5.orig/netcdf.pc.in -+++ netcdf-4.4.0~rc5/netcdf.pc.in +--- netcdf-4.4.1~rc1.orig/netcdf.pc.in ++++ netcdf-4.4.1~rc1/netcdf.pc.in @@ -3,6 +3,13 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ diff --git a/debian/patches/pnetcdf-settings.patch b/debian/patches/pnetcdf-settings.patch index 4ec4c67..e7bd2ed 100644 --- a/debian/patches/pnetcdf-settings.patch +++ b/debian/patches/pnetcdf-settings.patch @@ -1,12 +1,12 @@ -Index: netcdf-4.4.0/CMakeLists.txt +Index: netcdf-4.4.1~rc1/CMakeLists.txt =================================================================== ---- netcdf-4.4.0.orig/CMakeLists.txt -+++ netcdf-4.4.0/CMakeLists.txt -@@ -948,6 +948,7 @@ IF(ENABLE_PNETCDF) - MESSAGE(STATUS "Cannot find pNetCDF library. Disabling pNetCDF support.") +--- netcdf-4.4.1~rc1.orig/CMakeLists.txt ++++ netcdf-4.4.1~rc1/CMakeLists.txt +@@ -952,6 +952,7 @@ IF(ENABLE_PNETCDF) + MESSAGE(STATUS "Cannot find PNetCDF library. Disabling PNetCDF support.") SET(USE_PNETCDF OFF CACHE BOOL "") ELSE(NOT PNETCDF) + SET(STATUS_PNETCDF "ON") SET(USE_PARALLEL ON CACHE BOOL "") - ENDIF(NOT PNETCDF) - # ELSE() + + # Check PNetCDF version. Must be >= 1.6.0 diff --git a/debian/patches/privacy-breach-logo.patch b/debian/patches/privacy-breach-logo.patch index 43426a4..0f672b4 100644 --- a/debian/patches/privacy-breach-logo.patch +++ b/debian/patches/privacy-breach-logo.patch @@ -2,8 +2,10 @@ Description: Use local logo image to fix privacy-breach-logo lintian error. Author: Bas Couwenberg <sebas...@xs4all.nl> Forwarded: not-needed ---- a/docs/footer.html -+++ b/docs/footer.html +Index: netcdf-4.4.1~rc1/docs/footer.html +=================================================================== +--- netcdf-4.4.1~rc1.orig/docs/footer.html ++++ netcdf-4.4.1~rc1/docs/footer.html @@ -1,7 +1,7 @@ <hr size="2"/> <address style="text-align: center;"> @@ -13,8 +15,10 @@ Forwarded: not-needed <address style="text-align: right;"><small> Generated on $datetime for $projectname. NetCDF is ---- a/docs/obsolete/fan_utils.html -+++ b/docs/obsolete/fan_utils.html +Index: netcdf-4.4.1~rc1/docs/obsolete/fan_utils.html +=================================================================== +--- netcdf-4.4.1~rc1.orig/docs/obsolete/fan_utils.html ++++ netcdf-4.4.1~rc1/docs/obsolete/fan_utils.html @@ -2,7 +2,7 @@ <head> diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch index d1e7b16..560718d 100644 --- a/debian/patches/reproducible.patch +++ b/debian/patches/reproducible.patch @@ -4,10 +4,10 @@ Description: Drop build-dependent metadata, as it makes the Last-Updated: 2016-01-16 Forwarded: no -Index: netcdf-4.4.0~rc5/libnetcdf.settings.in +Index: netcdf-4.4.1~rc1/libnetcdf.settings.in =================================================================== ---- netcdf-4.4.0~rc5.orig/libnetcdf.settings.in -+++ netcdf-4.4.0~rc5/libnetcdf.settings.in +--- netcdf-4.4.1~rc1.orig/libnetcdf.settings.in ++++ netcdf-4.4.1~rc1/libnetcdf.settings.in @@ -4,9 +4,6 @@ # General ------- -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel