[opengm] 381/386: Update patch queue.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/master
in repository opengm.

commit db7a34170850bc0790483bfacaa4c4c84485c449
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Aug 30 15:16:42 2016 +0100

    Update patch queue.
    
    - Drop disable-mem-logging-by-default.patch, applied upstream.
    - Drop fix-hdf5-detection.patch, fixed upstream.
    
    Gbp-Dch: Full
---
 .../patches/disable-mem-logging-by-default.patch   | 61 ----------------------
 debian/patches/fix-hdf5-detection.patch            | 25 ---------
 debian/patches/series                              |  2 -
 3 files changed, 88 deletions(-)

diff --git a/debian/patches/disable-mem-logging-by-default.patch b/debian/patches/disable-mem-logging-by-default.patch
deleted file mode 100644
index a9d54c5..0000000
--- a/debian/patches/disable-mem-logging-by-default.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From: Joerg Kappes <kappes at math.uni-heidelberg.de>
-Date: Fri, 1 Apr 2016 22:04:09 +0200
-Subject: disable mem-logging by default,
- because it might not work on all systems
-
----
- CMakeLists.txt                       | 8 ++++++++
- include/opengm/utilities/meminfo.hxx | 2 +-
- src/unittest/CMakeLists.txt          | 6 ++++--
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d5fb1a9..3101691 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -94,7 +94,15 @@ OPTION(BUILD_PYTHON_WRAPPER "Build python wrapper" OFF)
- OPTION(BUILD_MATLAB_WRAPPER "Build matlab wrapper" OFF)
- ###Grante needs C++11. Since we have not tested OpenGM under this standard yet, using Grante is realy experimental!!!
- ###OPTION(WITH_GRANTE "Include wrapper for grante" OFF)
-+OPTION(WITH_MEMINFO "Use memory logging in visitor" OFF)
- 
-+
-+#--------------------------------------------------------------
-+# MEMINFO
-+#--------------------------------------------------------------
-+if(WITH_MEMINFO)
-+  add_definition(-DSYS_MEMORYINFO_ON)
-+endif()
- #--------------------------------------------------------------
- # Cplex
- #--------------------------------------------------------------
-diff --git a/include/opengm/utilities/meminfo.hxx b/include/opengm/utilities/meminfo.hxx
-index ce44776..ebe509a 100644
---- a/include/opengm/utilities/meminfo.hxx
-+++ b/include/opengm/utilities/meminfo.hxx
-@@ -27,7 +27,7 @@
- #include "string.h"
- 
- // uncomment this line if U have problems with memorylogging -> this will disable it.
--#define SYS_MEMORYINFO_ON
-+//#define SYS_MEMORYINFO_ON
- 
- #if ( defined(__APPLE__) &&  defined(SYS_MEMORYINFO_ON) )
- #   define SYS_MEMORYINFO_MAC
-diff --git a/src/unittest/CMakeLists.txt b/src/unittest/CMakeLists.txt
-index 8110b7a..d99f00a 100644
---- a/src/unittest/CMakeLists.txt
-+++ b/src/unittest/CMakeLists.txt
-@@ -79,8 +79,10 @@ if(BUILD_TESTING)
-       add_test(test-io-hdf5 ${CMAKE_CURRENT_BINARY_DIR}/test-io-hdf5)
-    endif()
- 
--   ADD_EXECUTABLE(test-memoryinfo test_memoryinfo.cxx ${headers})
--   add_test(test-memoryinfo ${CMAKE_CURRENT_BINARY_DIR}/test-memoryinfo) 
-+   if(WITH_MEMINFO)
-+      ADD_EXECUTABLE(test-memoryinfo test_memoryinfo.cxx ${headers})
-+      add_test(test-memoryinfo ${CMAKE_CURRENT_BINARY_DIR}/test-memoryinfo) 
-+   endif()
- 
-    add_executable(test-lp-solver test_lp_solver.cxx ${headers})
-    add_test(test-lp-solver ${CMAKE_CURRENT_BINARY_DIR}/test-lp-solver) 
diff --git a/debian/patches/fix-hdf5-detection.patch b/debian/patches/fix-hdf5-detection.patch
deleted file mode 100644
index add6268..0000000
--- a/debian/patches/fix-hdf5-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Fri, 23 Oct 2015 09:54:50 +0100
-Subject: Fix HDF5 detection in CMake find module
-
----
- cmake/modules/FindHDF5.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/FindHDF5.cmake b/cmake/modules/FindHDF5.cmake
-index e311912..9cf6031 100644
---- a/cmake/modules/FindHDF5.cmake
-+++ b/cmake/modules/FindHDF5.cmake
-@@ -1,9 +1,9 @@
- # - Find HDF5, a library for reading and writing self describing array data.
- #
--FIND_PATH(HDF5_INCLUDE_DIR hdf5.h)
-+FIND_PATH(HDF5_INCLUDE_DIR hdf5.h HINTS /usr/include/hdf5/serial)
- 
--FIND_LIBRARY(HDF5_CORE_LIBRARY NAMES hdf5dll hdf5  )
--FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hldll hdf5_hl  )
-+FIND_LIBRARY(HDF5_CORE_LIBRARY NAMES hdf5dll hdf5_serial  )
-+FIND_LIBRARY(HDF5_HL_LIBRARY NAMES hdf5_hldll hdf5_serial_hl  )
- FIND_LIBRARY(HDF5_CPP_LIBRARY NAMES hdf5_cppdll hdf5_cpp )
- 
- IF(WIN32 AND HDF5_CORE_LIBRARY MATCHES "dll.lib$")
diff --git a/debian/patches/series b/debian/patches/series
index 78fe99b..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-fix-hdf5-detection.patch
-disable-mem-logging-by-default.patch

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