debian/changelog

@@ -121,7 +121,6 @@ netcdf (1:4.4.1.1-1) unstable; urgency=medium
   * Update symbols for 4.4.1.1.
 
  -- Bas Couwenberg <sebastic@debian.org>  Tue, 22 Nov 2016 07:24:16 +0100
->>>>>>> master
 
 netcdf (1:4.4.1-2) unstable; urgency=medium
 

debian/libnetcdf-mpi-13.lintian-overrides

-libnetcdf-mpi-11: package-name-doesnt-match-sonames libnetcdf-mpi11
+libnetcdf-mpi-13: package-name-doesnt-match-sonames libnetcdf-mpi13

debian/libnetcdf-pnetcdf-13.lintian-overrides

-libnetcdf-pnetcdf-11: package-name-doesnt-match-sonames libnetcdf-pnetcdf11
+libnetcdf-pnetcdf-13: package-name-doesnt-match-sonames libnetcdf-pnetcdf13

debian/patches/hdf5_mpi_libs.patch

-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- netcdf (1:4.4.0-2~exp1) UNRELEASED; urgency=medium
- .
-   * Add mpi, pnetcdf variants of netcdf. Closes: #708638.
-   * use libaec-dev to provide SZIP, now that HDF5 uses SZIP.
-   * Enable MMAP in diskless.
-Author: Alastair McKinstry <mckinstry@debian.org>
-Bug-Debian: https://bugs.debian.org/708638
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
-Index: netcdf-4.4.0/CMakeLists.txt
-===================================================================
---- netcdf-4.4.0.orig/CMakeLists.txt
-+++ netcdf-4.4.0/CMakeLists.txt
-@@ -1,4 +1,4 @@
--## This is a CMake file, part of Unidata's netCDF package.
-+# This is a CMake file, part of Unidata's netCDF package.
- # Copyright 2012-2014, see the COPYRIGHT file for more information.
- #
- 
-@@ -495,6 +495,8 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-     SET(HDF5_LIBRARIES ${HDF5_C_LIBRARY} ${HDF5_HL_LIBRARY})
-     MESSAGE(STATUS "Using HDF5 C Library: ${HDF5_C_LIBRARY}")
-     MESSAGE(STATUS "Using HDF5 HL LIbrary: ${HDF5_HL_LIBRARY}")
-+    SET(HDF5_LIBRARIES "${HDF5_C_LIBRARY};${HDF5_HL_LIBRARY}")
-+    INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
-   ELSE(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR) # We are seeking out HDF5 with Find Package.
-     ###
-     # For now we assume that if we are building netcdf
-@@ -524,7 +526,12 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-       SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
-       FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL NO_MODULES REQUIRED ${NC_HDF5_LINK_TYPE})
-     ELSE(MSVC)
--      FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
-+      IF (HDF5_C_LIBRARY AND HDF5_HL_LIBRARY)
-+	SET(ALL_TLL_LIBS "${HDF5_C_LIBRARY};${HDF5_HL_LIBRARY};${ALL_TLL_LIBS}")
-+      ELSE()
-+	# Only do this if not set, otherwise we only get serial versions, for some reason
-+	FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
-+      ENDIF()
-     ENDIF(MSVC)
- 
-     ##
-@@ -1199,6 +1206,7 @@ CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCO
- CHECK_FUNCTION_EXISTS(getrlimit HAVE_GETRLIMIT)
- CHECK_FUNCTION_EXISTS(_filelengthi64 HAVE_FILE_LENGTH_I64)
- 
-+
- #####
- # End system inspection checks.
- #####

debian/patches/reproducible.patch

-Author: Alastair McKinstry <mckinstry@debian.org>
-Description: Drop build-dependent metadata, as it makes the 
- package non bit-reproducible
-Last-Updated: 2016-01-16
-Forwarded: no
-
-Index: netcdf-4.4.1~rc1/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
- -------
- NetCDF Version:		@PACKAGE_VERSION@
--Configured On:		@CONFIG_DATE@
--Host System:		@host_cpu@-@host_vendor@-@host_os@
--Build Directory: 	@abs_top_builddir@
- Install Prefix:         @prefix@
- 
- # Compiling Options

debian/patches/tst-fix.patch

-Author: Alastair  McKinstry <mckinstry@debian.org>
-Description: tst_fileinfo needs to be linked to other libs (-lhdf5)
-Last-Updated: 2016-10-07
-Forwarded: no
-
-Index: netcdf-4.4.1/ncdump/CMakeLists.txt
-===================================================================
---- netcdf-4.4.1.orig/ncdump/CMakeLists.txt
-+++ netcdf-4.4.1/ncdump/CMakeLists.txt
-@@ -61,7 +61,7 @@ IF(ENABLE_TESTS)
- 
- IF(ENABLE_FILEINFO)
-   ADD_EXECUTABLE(tst_fileinfo tst_fileinfo.c)
--  TARGET_LINK_LIBRARIES(tst_fileinfo netcdf)
-+  TARGET_LINK_LIBRARIES(tst_fileinfo netcdf ${ALL_TLL_LIBS})
-   add_sh_test(ncdump tst_fileinfo)
- ENDIF()
-