[shark] 02/04: Refresh 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 shark.

commit 6bc321485edabe24cecb4897a9bae9de04735bed
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Mar 16 11:04:47 2016 +0000

    Refresh patch queue.
---
 debian/patches/Fix-CBLAS-detection-on-Debian.patch | 15 +++------------
 debian/patches/Fix-CMake-package-creation.patch    |  6 +++---
 debian/patches/Use-GNUInstallDirs.patch            |  2 +-
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/debian/patches/Fix-CBLAS-detection-on-Debian.patch b/debian/patches/Fix-CBLAS-detection-on-Debian.patch
index a5f7112..959bad5 100644
--- a/debian/patches/Fix-CBLAS-detection-on-Debian.patch
+++ b/debian/patches/Fix-CBLAS-detection-on-Debian.patch
@@ -3,11 +3,11 @@ Date: Mon, 8 Feb 2016 18:50:03 +0000
 Subject: Fix CBLAS detection on Debian.
 
 ---
- CMakeLists.txt | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 83ebecd..d39d310 100644
+index 558a0a8..bf453af 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -236,16 +236,16 @@ if( ENABLE_CBLAS )
@@ -32,12 +32,3 @@ index 83ebecd..d39d310 100644
  		)
  		mark_as_advanced(
  			OPENBLAS_LIBRARY
-@@ -261,7 +261,7 @@ if( ENABLE_CBLAS )
- 		endif()
- 		if(CBLAS_LIB_PATH)
- 			find_file(CBLAS_INCLUDES cblas.h 
--				PATHS ${CBLAS_LIB_PATH} ${CBLAS_LIB_PATH}/../include ${CBLAS_LIB_PATH}/../../include/atlas
-+				PATHS ${CBLAS_LIB_PATH} ${CBLAS_LIB_PATH}/../include ${CBLAS_LIB_PATH}/../../include ${CBLAS_LIB_PATH}/../../include/atlas ${CBLAS_LIB_PATH}/../../include/openblas
- 			)
- 			get_filename_component(CBLAS_INCLUDES ${CBLAS_INCLUDES} PATH )
- 		endif()
diff --git a/debian/patches/Fix-CMake-package-creation.patch b/debian/patches/Fix-CMake-package-creation.patch
index fd37131..ba6b9d9 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 3351088..83ebecd 100644
+index c6bc27b..558a0a8 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -411,7 +411,7 @@ endif()
+@@ -423,7 +423,7 @@ endif()
  ###################################################################
  #                       CPACK PACKAGING
  ###################################################################
@@ -19,7 +19,7 @@ index 3351088..83ebecd 100644
  
  # Add all targets to the build-tree export set
  export(TARGETS shark SharkVersion FILE "${shark_BINARY_DIR}/SharkTargets.cmake")
-@@ -427,22 +427,10 @@ set(SHARK_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/in
+@@ -439,22 +439,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/Use-GNUInstallDirs.patch b/debian/patches/Use-GNUInstallDirs.patch
index 5b6ce91..3d4d4e7 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 5e5c5cd..3351088 100644
+index f33374c..c6bc27b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -92,12 +92,15 @@ set( CPACK_DEBIAN_PACKAGE_MAINTAINER "Christian Igel <c.igel at ieee.org>" )

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