[gmt] 04/08: Drop changes for HDF5 MPI, netcdf now built with serial flavor.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository gmt.

commit afd8d612da3f637c8775ad3240cabe72c76f5292
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Aug 21 18:27:11 2015 +0200

    Drop changes for HDF5 MPI, netcdf now built with serial flavor.
---
 debian/changelog              |  2 +-
 debian/control                |  1 -
 debian/patches/hdf5-mpi.patch | 31 -------------------------------
 debian/patches/series         |  1 -
 debian/rules                  | 11 +----------
 5 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b380594..1763c82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 gmt (5.1.2+dfsg1-2~exp2) UNRELEASED; urgency=medium
 
-  * Use mpi-default-dev to select the architecture specific HDF5 MPI flavor.
   * Override dh_auto_configure to use custom CMake options.
+  * Drop changes for HDF5 MPI, netcdf now built with serial flavor.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 30 Jul 2015 22:35:49 +0200
 
diff --git a/debian/control b/debian/control
index 306c167..6ce9c1c 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 9),
                libpcre3-dev,
                libxaw7-dev,
                libxmu-headers,
-               mpi-default-dev,
                python-sphinx,
                texlive,
                texlive-latex-extra,
diff --git a/debian/patches/hdf5-mpi.patch b/debian/patches/hdf5-mpi.patch
deleted file mode 100644
index 55b59a5..0000000
--- a/debian/patches/hdf5-mpi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Search for HDF5 library in other paths too.
- The HDF5 libraries are installation in non-standard locations in Debian,
- not in the same directory as the NetCDF library.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://gmt.soest.hawaii.edu/issues/732
-
---- a/cmake/modules/FindNETCDF.cmake
-+++ b/cmake/modules/FindNETCDF.cmake
-@@ -105,11 +105,21 @@ find_library (NETCDF_LIBRARY
- 	/opt
- )
- 
-+if (NOT DEFINED HDF5_LIBRARY_DIRS)
-+  set (HDF5_LIBRARY_DIRS "")
-+endif (NOT DEFINED HDF5_LIBRARY_DIRS)
-+
-+if (NOT DEFINED HDF5_INCLUDE_DIRS)
-+  set (HDF5_INCLUDE_DIRS "")
-+else (NOT DEFINED HDF5_INCLUDE_DIRS)
-+  list (APPEND NETCDF_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
-+endif (NOT DEFINED HDF5_INCLUDE_DIRS)
-+
- # find all libs that nc-config reports
- foreach (_extralib ${_netcdf_lib})
- 	find_library (_found_lib_${_extralib}
- 		NAMES ${_extralib}
--		PATHS ${_netcdf_libpath})
-+		PATHS ${_netcdf_libpath} ${HDF5_LIBRARY_DIRS})
- 	list (APPEND NETCDF_LIBRARY ${_found_lib_${_extralib}})
- endforeach (_extralib)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9c286f9..ae9a6fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@ mips.patch
 manpage-section.patch
 dont-use-timestamped-gzip.patch
 rename-libpsl-to-libgmt-psl.patch
-hdf5-mpi.patch
diff --git a/debian/rules b/debian/rules
index 2f2c3ce..05219f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,6 @@ ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
    export DH_VERBOSE
 endif
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-include /usr/share/mpi-default-dev/debian_defaults
-
-HDF5_INCLUDE_PATH=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
-HDF5_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
-
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u "+%d %B %Y" -f -)
 
@@ -34,9 +27,7 @@ CMAKE_OPTS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
              -DFLOCK=on \
              -DGMT_INSTALL_MODULE_LINKS=off \
              -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=off \
-             -DLICENSE_RESTRICTED=LGPL \
-             -DHDF5_INCLUDE_DIRS=$(HDF5_INCLUDE_PATH) \
-             -DHDF5_LIBRARY_DIRS=$(HDF5_LIBRARY_PATH)
+             -DLICENSE_RESTRICTED=LGPL
 
 %:
 	dh $@ --buildsystem cmake \

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