[plplot] 01/01: Remove Dont-check-for-hdf5.h patch

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository plplot.

commit 55adc89c378dcaec339dc9ef4ba8d25fabacc8a7
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Jul 12 17:52:31 2017 +0200

    Remove Dont-check-for-hdf5.h patch
---
 debian/patches/Dont-check-for-hdf5.h.patch | 44 ------------------------------
 debian/patches/series                      |  1 -
 2 files changed, 45 deletions(-)

diff --git a/debian/patches/Dont-check-for-hdf5.h.patch b/debian/patches/Dont-check-for-hdf5.h.patch
deleted file mode 100644
index 19caed2..0000000
--- a/debian/patches/Dont-check-for-hdf5.h.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Andrew Ross <andrewross at users.sourceforge.net>
-Date: Mon, 3 Jul 2017 22:39:22 +0200
-Subject: Dont check for hdf5.h
-
----
- cmake/modules/octave.cmake | 25 -------------------------
- 1 file changed, 25 deletions(-)
-
-diff --git a/cmake/modules/octave.cmake b/cmake/modules/octave.cmake
-index bf3beb2..0b5132f 100644
---- a/cmake/modules/octave.cmake
-+++ b/cmake/modules/octave.cmake
-@@ -180,31 +180,6 @@ if(ENABLE_octave)
- 	CACHE INTERNAL ""
- 	)
-       endif(NOT OCTAVE_INCLUDE_PATH_TRIMMED STREQUAL "${OCTAVE_INCLUDE_PATH}")
--      # Octave has a huge number of dependencies and therefore an
--      # impossible-to-untangle set of header #includes that depend on
--      # other packages headers.  And there is no information from
--      # mkoctfile or the octave octave_config_info command about where
--      # those header directories are located.  But from experiments
--      # with both the Linux and Windows binary versions of octave, it
--      # appears that hdf5.h is one external header that is necessary,
--      # and it is never part of the octave-${OCTAVE_VERSION}/octave
--      # hierarchy.
--      # N.B. Debian jessie octave-dev package depends on
--      # hdf5-dev which stores hdf5.h in /usr/include/hdf5/serial
--      find_path(
--	OCTAVE_INCLUDE_PATH_EXTERNAL
--	hdf5.h PATH_SUFFIXES hdf5/serial
--	)
--      if(OCTAVE_INCLUDE_PATH_EXTERNAL)
--        set(OCTAVE_INCLUDE_PATH
--	${OCTAVE_INCLUDE_PATH_EXTERNAL} ${OCTAVE_INCLUDE_PATH}
--	CACHE INTERNAL ""
--	)
--      else(OCTAVE_INCLUDE_PATH_EXTERNAL)
--	message(STATUS "WARNING: "
--	  "Required external Octave header, hdf5.h, that is typically part of the libhdf5-dev package, has not found. Disabling Octave binding")
--	set(ENABLE_octave OFF CACHE BOOL "Enable Octave binding" FORCE)
--      endif(OCTAVE_INCLUDE_PATH_EXTERNAL)
-     else(OCTAVE_INCLUDE_PATH AND OCTAVE_LIBRARIES AND OCTINTERP_LIBRARIES)
-       message(STATUS "WARNING: "
-       "The Octave headers and/or library not found. Disabling Octave binding")
diff --git a/debian/patches/series b/debian/patches/series
index cc66266..4c36fd8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 Unset-python-path.patch
 Proper-use-of-the-rmpath-function.patch
-Dont-check-for-hdf5.h.patch
 Remove-nondfsg-dirs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/plplot.git