[shark] 02/06: Update patch queue.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Aug 31 08:37:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository shark.
commit 8fbaf0df885e557f7ab41ab45fe006cd9be2bd57
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Tue Aug 30 11:49:07 2016 +0100
Update patch queue.
- Refresh the following patches:
- Fix-CBLAS-detection-on-Debian.patch,
- Fix-CMake-package-creation.patch,
- Fix-missing-iostream-include.patch,
- Use-GNUInstallDirs.patch.
- Drop HDF5 testing patch series, applied upstream.
- Drop HDF5 detection patch, applied upstream.
Gbp-Dch: Full
---
debian/patches/Fix-CBLAS-detection-on-Debian.patch | 4 +--
debian/patches/Fix-CMake-package-creation.patch | 6 ++--
.../Fix-HDF5-detection-with-CMake-3.6.patch | 24 -------------
.../Fix-code-and-setup-of-HDF5-testcase.patch | 40 ----------------------
debian/patches/Fix-library-install-target.patch | 21 ------------
.../Fix-missing-boost-namespace-prefix.patch | 21 ------------
debian/patches/Fix-missing-iostream-include.patch | 8 ++---
debian/patches/Use-GNUInstallDirs.patch | 9 ++---
...-for-C-11-test-works-however-only-when-ev.patch | 22 ------------
.../patches/fixed-HDF5-test.-fixes-64-and-43.patch | 21 ------------
debian/patches/series | 6 ----
11 files changed, 12 insertions(+), 170 deletions(-)
diff --git a/debian/patches/Fix-CBLAS-detection-on-Debian.patch b/debian/patches/Fix-CBLAS-detection-on-Debian.patch
index 959bad5..cfd0d29 100644
--- a/debian/patches/Fix-CBLAS-detection-on-Debian.patch
+++ b/debian/patches/Fix-CBLAS-detection-on-Debian.patch
@@ -7,10 +7,10 @@ Subject: Fix CBLAS detection on Debian.
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 558a0a8..bf453af 100644
+index 545786b..784abfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -236,16 +236,16 @@ if( ENABLE_CBLAS )
+@@ -235,16 +235,16 @@ if( ENABLE_CBLAS )
else()
#todo: do a propper vendor check
find_library(OPENBLAS_LIBRARY openblas
diff --git a/debian/patches/Fix-CMake-package-creation.patch b/debian/patches/Fix-CMake-package-creation.patch
index ba6b9d9..fb5c045 100644
--- a/debian/patches/Fix-CMake-package-creation.patch
+++ b/debian/patches/Fix-CMake-package-creation.patch
@@ -7,10 +7,10 @@ Subject: Fix CMake package creation.
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c6bc27b..558a0a8 100644
+index d8f3d3c..545786b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -423,7 +423,7 @@ endif()
+@@ -422,7 +422,7 @@ endif()
###################################################################
# CPACK PACKAGING
###################################################################
@@ -19,7 +19,7 @@ index c6bc27b..558a0a8 100644
# Add all targets to the build-tree export set
export(TARGETS shark SharkVersion FILE "${shark_BINARY_DIR}/SharkTargets.cmake")
-@@ -439,22 +439,10 @@ set(SHARK_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/in
+@@ -438,22 +438,10 @@ set(SHARK_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/in
configure_file(SharkConfig.cmake.in "${PROJECT_BINARY_DIR}/SharkConfig.cmake")
configure_file(SharkConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/SharkConfigVersion.cmake")
diff --git a/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch b/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch
deleted file mode 100644
index eacd221..0000000
--- a/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Wed, 24 Aug 2016 14:53:03 +0100
-Subject: Fix HDF5 detection with CMake 3.6.
-
----
- CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bf453af..784abfe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -202,9 +202,8 @@ mark_as_advanced(HDF5_DIR)
- if(HDF5_FOUND)
- if(HDF5_C_COMPILER_EXECUTABLE AND HDF5_CXX_COMPILER_EXECUTABLE)
- message(STATUS "Checking HDF5 installation: HDF5 installation seems ok.")
-- include_directories( ${HDF5_INCLUDE_DIR} )
-- link_directories( ${HDF5_LIBRARY_DIR} )
-- list(APPEND LINK_LIBRARIES ${HDF5_LIBRARIES})
-+ include_directories( ${HDF5_INCLUDE_DIRS} )
-+ list(APPEND LINK_LIBRARIES ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES})
- else()
- message(STATUS "Checking HDF5 installation:HDF5 package might be broken.")
- if(NOT( HDF5_C_COMPILER_EXECUTABLE))
diff --git a/debian/patches/Fix-code-and-setup-of-HDF5-testcase.patch b/debian/patches/Fix-code-and-setup-of-HDF5-testcase.patch
deleted file mode 100644
index f0d7635..0000000
--- a/debian/patches/Fix-code-and-setup-of-HDF5-testcase.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Mon, 18 Jul 2016 09:49:32 +0100
-Subject: Fix code and setup of HDF5 testcase.
-
----
- Test/CMakeLists.txt | 7 ++++++-
- Test/Data/HDF5Tests.cpp | 2 +-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/Test/CMakeLists.txt b/Test/CMakeLists.txt
-index 478e315..54c7f6d 100644
---- a/Test/CMakeLists.txt
-+++ b/Test/CMakeLists.txt
-@@ -263,7 +263,12 @@ shark_add_test( RBM/ExactGradientTraining.cpp RBM_ExactGradientTraining)
-
- # Copy test file
- if(HDF5_FOUND)
-- file( COPY test_data/ DESTINATION test_data/ )
-+ add_custom_command(
-+ TARGET Data_HDF5
-+ POST_BUILD
-+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/test_data
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_data
-+ )
- endif()
-
- # Create output dir
-diff --git a/Test/Data/HDF5Tests.cpp b/Test/Data/HDF5Tests.cpp
-index df765c2..2c1331d 100644
---- a/Test/Data/HDF5Tests.cpp
-+++ b/Test/Data/HDF5Tests.cpp
-@@ -16,7 +16,7 @@ class HDF5Fixture
- public:
- HDF5Fixture()
- :
-- m_exampleFileName("../Test/test_data/testfile_for_import.h5"),
-+ m_exampleFileName("./test_data/testfile_for_import.h5"),
- m_datasetNameData1("data/data1"),
- m_labelNameLabel1("data/label1"),
- m_labelNameWrongLabel("data/wrong_label"),
diff --git a/debian/patches/Fix-library-install-target.patch b/debian/patches/Fix-library-install-target.patch
deleted file mode 100644
index cfd34a7..0000000
--- a/debian/patches/Fix-library-install-target.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Tue, 24 Nov 2015 19:48:51 +0000
-Subject: Fix library install target.
-
----
- src/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 701daf1..4a4dfa8 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -54,7 +54,7 @@ install(TARGETS shark
- ARCHIVE DESTINATION ${SHARK_INSTALL_LIB_DIR})
-
- install(TARGETS SharkVersion
-- EXPORT SharkTargets
-+ EXPORT SharkVersionTargets
- RUNTIME DESTINATION ${SHARK_INSTALL_BIN_DIR})
-
-
diff --git a/debian/patches/Fix-missing-boost-namespace-prefix.patch b/debian/patches/Fix-missing-boost-namespace-prefix.patch
deleted file mode 100644
index f166754..0000000
--- a/debian/patches/Fix-missing-boost-namespace-prefix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Sat, 13 Aug 2016 13:55:46 +0100
-Subject: Fix missing boost namespace prefix.
-
----
- include/shark/Core/utility/ZipPair.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/shark/Core/utility/ZipPair.h b/include/shark/Core/utility/ZipPair.h
-index 24cf730..a9cf0a2 100644
---- a/include/shark/Core/utility/ZipPair.h
-+++ b/include/shark/Core/utility/ZipPair.h
-@@ -142,7 +142,7 @@ boost::iterator_range<
- >
- zipPairRange(Iterator1 begin1, Iterator1 end1, Iterator2 begin2,Iterator2 end2){
- typedef PairIterator<PairType,Iterator1,Iterator2> iterator;
-- return make_iterator_range(iterator(begin1,begin2),iterator(end1,end2));
-+ return boost::make_iterator_range(iterator(begin1,begin2),iterator(end1,end2));
- }
-
- template<class PairType, class Range1, class Range2>
diff --git a/debian/patches/Fix-missing-iostream-include.patch b/debian/patches/Fix-missing-iostream-include.patch
index cac92eb..f1c02d9 100644
--- a/debian/patches/Fix-missing-iostream-include.patch
+++ b/debian/patches/Fix-missing-iostream-include.patch
@@ -7,12 +7,12 @@ Subject: Fix missing iostream include.
1 file changed, 2 insertions(+)
diff --git a/Test/LinAlg/BLAS/triangular_matrix.cpp b/Test/LinAlg/BLAS/triangular_matrix.cpp
-index 11f8e8b..e1ea334 100644
+index e1ea334..2cbbe9e 100644
--- a/Test/LinAlg/BLAS/triangular_matrix.cpp
+++ b/Test/LinAlg/BLAS/triangular_matrix.cpp
-@@ -5,6 +5,8 @@
- #include <shark/LinAlg/BLAS/triangular_matrix.hpp>
- #include <shark/LinAlg/BLAS/matrix.hpp>
+@@ -7,6 +7,8 @@
+
+ #include <iostream>
+#include <iostream>
+
diff --git a/debian/patches/Use-GNUInstallDirs.patch b/debian/patches/Use-GNUInstallDirs.patch
index 3d4d4e7..fbd87a8 100644
--- a/debian/patches/Use-GNUInstallDirs.patch
+++ b/debian/patches/Use-GNUInstallDirs.patch
@@ -8,7 +8,7 @@ Subject: Use GNUInstallDirs.
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f33374c..c6bc27b 100644
+index 17fd588..d8f3d3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,12 +92,15 @@ set( CPACK_DEBIAN_PACKAGE_MAINTAINER "Christian Igel <c.igel at ieee.org>" )
@@ -33,10 +33,10 @@ index f33374c..c6bc27b 100644
set( SHARK_INSTALL_LIB_DIR lib/ )
set( SHARK_INSTALL_CONTRIB_DIR contrib/ )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6405ad0..701daf1 100644
+index 8f9b1ec..d532ab2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -49,12 +49,12 @@ set_target_properties( shark PROPERTIES
+@@ -49,9 +49,9 @@ set_target_properties( shark PROPERTIES
install(TARGETS shark
EXPORT SharkTargets
@@ -48,8 +48,5 @@ index 6405ad0..701daf1 100644
+ ARCHIVE DESTINATION ${SHARK_INSTALL_LIB_DIR})
install(TARGETS SharkVersion
- EXPORT SharkTargets
- RUNTIME DESTINATION bin)
+ RUNTIME DESTINATION ${SHARK_INSTALL_BIN_DIR})
-
-
diff --git a/debian/patches/change-necessary-for-C-11-test-works-however-only-when-ev.patch b/debian/patches/change-necessary-for-C-11-test-works-however-only-when-ev.patch
deleted file mode 100644
index d041480..0000000
--- a/debian/patches/change-necessary-for-C-11-test-works-however-only-when-ev.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Christian Igel <igel at diku.dk>
-Date: Fri, 25 Mar 2016 15:29:01 +0100
-Subject: change necessary for C++11, test works, however,
- only when evolked from top directory becauzse of sample file location
-
----
- Test/Data/HDF5Tests.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Test/Data/HDF5Tests.cpp b/Test/Data/HDF5Tests.cpp
-index ab46bb7..3e8cfd1 100644
---- a/Test/Data/HDF5Tests.cpp
-+++ b/Test/Data/HDF5Tests.cpp
-@@ -36,7 +36,7 @@ public:
- list_of(10.0)(11.0)(12.0);
-
- // vector of 4 elements
-- m_expectedFromLabel1 = list_of(80.0)(81.0)(82.0)(83.0);
-+ m_expectedFromLabel1 = list_of(80.0)(81.0)(82.0)(83.0).convert_to_container<std::vector<boost::int32_t> >();
- }
-
- /// Verify the @a actual matrix is the same as @a expected
diff --git a/debian/patches/fixed-HDF5-test.-fixes-64-and-43.patch b/debian/patches/fixed-HDF5-test.-fixes-64-and-43.patch
deleted file mode 100644
index 98d5e74..0000000
--- a/debian/patches/fixed-HDF5-test.-fixes-64-and-43.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Oswin Krause <oswin.krause at di.ku.dk>
-Date: Fri, 3 Jun 2016 14:27:03 +0200
-Subject: fixed HDF5 test. fixes #64 and 43
-
----
- Test/Data/HDF5Tests.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Test/Data/HDF5Tests.cpp b/Test/Data/HDF5Tests.cpp
-index 3e8cfd1..df765c2 100644
---- a/Test/Data/HDF5Tests.cpp
-+++ b/Test/Data/HDF5Tests.cpp
-@@ -16,7 +16,7 @@ class HDF5Fixture
- public:
- HDF5Fixture()
- :
-- m_exampleFileName("./Test/test_data/testfile_for_import.h5"),
-+ m_exampleFileName("../Test/test_data/testfile_for_import.h5"),
- m_datasetNameData1("data/data1"),
- m_labelNameLabel1("data/label1"),
- m_labelNameWrongLabel("data/wrong_label"),
diff --git a/debian/patches/series b/debian/patches/series
index 6a71228..52e5136 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,13 +5,7 @@ Disable-HTML-timestamps.patch
Disable-doxylink.patch
Fix-documentation-install-target.patch
Fix-examples-install-target.patch
-Fix-library-install-target.patch
Disable-doxygen-generate-tagfile.patch
Disable-privacy-breaching-content.patch
Fix-CBLAS-detection-on-Debian.patch
Fix-missing-iostream-include.patch
-Fix-missing-boost-namespace-prefix.patch
-change-necessary-for-C-11-test-works-however-only-when-ev.patch
-fixed-HDF5-test.-fixes-64-and-43.patch
-Fix-code-and-setup-of-HDF5-testcase.patch
-Fix-HDF5-detection-with-CMake-3.6.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/shark.git
More information about the debian-science-commits
mailing list