[clfft] 02/12: d/patches: - Remove fix-missing-stdlib.patch, applied upstream. - Refresh debian-enable-multiarch.patch, disable-multilib-cflags.patch, - use-boost-dynamic-libs.patch.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch debian/sid
in repository clfft.

commit ee99ae215cd589ffdba0e1cf29342c930cece789
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Oct 27 10:31:22 2015 +0000

    d/patches:
      - Remove fix-missing-stdlib.patch, applied upstream.
      - Refresh debian-enable-multiarch.patch, disable-multilib-cflags.patch,
      - use-boost-dynamic-libs.patch.
---
 debian/patches/debian-enable-multiarch.patch | 11 +----------
 debian/patches/disable-multilib-cflags.patch |  2 +-
 debian/patches/fix-missing-stdlib.patch      | 16 ----------------
 debian/patches/series                        |  1 -
 debian/patches/use-boost-dynamic-libs.patch  |  2 +-
 5 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/debian/patches/debian-enable-multiarch.patch b/debian/patches/debian-enable-multiarch.patch
index 85cd7a2..0655df8 100644
--- a/debian/patches/debian-enable-multiarch.patch
+++ b/debian/patches/debian-enable-multiarch.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -124,7 +124,7 @@
+@@ -125,7 +125,7 @@
  	message( STATUS "32bit build - FIND_LIBRARY_USE_LIB64_PATHS FALSE" )
  endif( )
  
@@ -14,12 +14,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  set( SUFFIX_BIN ${SUFFIX_BIN_DEFAULT} CACHE STRING "String to append to 'bin' install path" )
  
  # Useful variables to configure FindBoost.cake
-@@ -290,7 +290,7 @@
- if(WIN32)
-   set(destdir CMake)
- else()
--  set(destdir share/clFFT)
-+  set(destdir lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/clFFT)
- endif()
- string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
- configure_file(
diff --git a/debian/patches/disable-multilib-cflags.patch b/debian/patches/disable-multilib-cflags.patch
index 10396fe..9ca88ed 100644
--- a/debian/patches/disable-multilib-cflags.patch
+++ b/debian/patches/disable-multilib-cflags.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -212,13 +212,13 @@
+@@ -220,13 +220,13 @@
  		add_definitions( "/D_DEBUG" )
  	endif( )
  
diff --git a/debian/patches/fix-missing-stdlib.patch b/debian/patches/fix-missing-stdlib.patch
deleted file mode 100644
index 736c7e7..0000000
--- a/debian/patches/fix-missing-stdlib.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix missing inclusion of stdlib within the project
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Bug: https://github.com/clMathLibraries/clFFT/pull/101
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/library/fft_binary_lookup.cpp
-+++ b/src/library/fft_binary_lookup.cpp
-@@ -25,7 +25,7 @@
- #include <fcntl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--
-+#include <stdlib.h>
- 
- #ifdef _WIN32
- #include <windows.h>
diff --git a/debian/patches/series b/debian/patches/series
index 40f420d..eb7c8e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ fix-docs-output.patch
 use-system-mathjax.patch
 reproducible-build.patch
 use-boost-dynamic-libs.patch
-fix-missing-stdlib.patch
diff --git a/debian/patches/use-boost-dynamic-libs.patch b/debian/patches/use-boost-dynamic-libs.patch
index 1f81f5a..9bac18c 100644
--- a/debian/patches/use-boost-dynamic-libs.patch
+++ b/debian/patches/use-boost-dynamic-libs.patch
@@ -5,7 +5,7 @@ Forwarded: no
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -136,7 +136,7 @@
+@@ -137,7 +137,7 @@
  # Client is built only if boost is found; on windows, we need vs10 or higher
  # Find Boost on the system, and configure the type of boost build we want
  if( NOT DEFINED Boost_USE_STATIC_LIBS )

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