[arrayfire] 01/01: d/p: remove unused patches (all applied upstream)

[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 arrayfire.

commit 94d2f9641fe05346a60e3ab560f11723aa16f04b
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Jun 2 19:22:06 2015 +0100

    d/p: remove unused patches (all applied upstream)
---
 debian/patches/0001-set-the-lib-version.patch | 89 ---------------------------
 debian/patches/0002-enable-multiarch.patch    | 27 --------
 2 files changed, 116 deletions(-)

diff --git a/debian/patches/0001-set-the-lib-version.patch b/debian/patches/0001-set-the-lib-version.patch
deleted file mode 100644
index 32ea05f..0000000
--- a/debian/patches/0001-set-the-lib-version.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Gaetan Lehmann <gaetan.lehmann at gmail.com>
-Subject: [PATCH] set the lib version
-Origin: upstream, https://github.com/arrayfire/arrayfire/commit/c9260c82f806cecbaa4cad21a233c83872e83f74
-
----
- CMakeModules/Version.cmake        | 6 ++++--
- CMakeModules/version.h.in         | 2 ++
- src/backend/cpu/CMakeLists.txt    | 4 ++++
- src/backend/cuda/CMakeLists.txt   | 4 ++++
- src/backend/opencl/CMakeLists.txt | 4 ++++
- 5 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeModules/Version.cmake b/CMakeModules/Version.cmake
-index 25379b0..a5aff0c 100644
---- a/CMakeModules/Version.cmake
-+++ b/CMakeModules/Version.cmake
-@@ -1,8 +1,10 @@
- #
- # Make a version file that includes the ArrayFire version and git revision
- #
--SET(AF_VERSION "3.0")
--SET(AF_VERSION_MINOR ".beta")
-+SET(AF_VERSION_MAJOR "3")
-+SET(AF_VERSION_MINOR "0")
-+SET(AF_VERSION_PATCH "beta")
-+SET(AF_VERSION "${AF_VERSION_MAJOR}.${AF_VERSION_MINOR}.${AF_VERSION_PATCH}")
- EXECUTE_PROCESS(
-     COMMAND git log -1 --format=%h
-     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-diff --git a/CMakeModules/version.h.in b/CMakeModules/version.h.in
-index f1241f5..1462394 100644
---- a/CMakeModules/version.h.in
-+++ b/CMakeModules/version.h.in
-@@ -1,5 +1,7 @@
- #pragma once
- 
- #define AF_VERSION "@AF_VERSION@"
-+#define AF_VERSION_MAJOR "@AF_VERSION_MAJOR@"
- #define AF_VERSION_MINOR "@AF_VERSION_MINOR@"
-+#define AF_VERSION_PATCH "@AF_VERSION_PATCH@"
- #define AF_REVISION "@GIT_COMMIT_HASH@"
-diff --git a/src/backend/cpu/CMakeLists.txt b/src/backend/cpu/CMakeLists.txt
-index 3dd090b..3ee7ed8 100755
---- a/src/backend/cpu/CMakeLists.txt
-+++ b/src/backend/cpu/CMakeLists.txt
-@@ -79,6 +79,10 @@ ADD_LIBRARY(afcpu SHARED
- 
- TARGET_LINK_LIBRARIES(afcpu ${lib_deps} ${CBLAS_LIBRARIES} ${FFTW_LIBRARIES})
- 
-+SET_TARGET_PROPERTIES(afcpu PROPERTIES
-+    VERSION "${AF_VERSION}"
-+    SOVERSION "${AF_VERSION_MAJOR}")
-+
- INSTALL(TARGETS afcpu EXPORT CPU DESTINATION lib COMPONENT libraries)
- 
- export(TARGETS afcpu FILE ArrayFireCPU.cmake)
-diff --git a/src/backend/cuda/CMakeLists.txt b/src/backend/cuda/CMakeLists.txt
-index 5906c16..d709e65 100755
---- a/src/backend/cuda/CMakeLists.txt
-+++ b/src/backend/cuda/CMakeLists.txt
-@@ -165,6 +165,10 @@ ADD_DEPENDENCIES(afcuda ${ptx_targets})
- 
- TARGET_LINK_LIBRARIES(afcuda ${CUDA_CUBLAS_LIBRARIES} ${CUDA_LIBRARIES} ${lib_deps} ${CUDA_CUFFT_LIBRARIES} ${CUDA_NVVM_LIBRARIES} ${CUDA_CUDA_LIBRARY})
- 
-+SET_TARGET_PROPERTIES(afcuda PROPERTIES
-+    VERSION "${AF_VERSION}"
-+    SOVERSION "${AF_VERSION_MAJOR}")
-+
- INSTALL(TARGETS afcuda EXPORT CUDA DESTINATION lib COMPONENT libraries)
- 
- export(TARGETS afcuda FILE ArrayFireCUDA.cmake)
-diff --git a/src/backend/opencl/CMakeLists.txt b/src/backend/opencl/CMakeLists.txt
-index 537fb7e..68ddc62 100755
---- a/src/backend/opencl/CMakeLists.txt
-+++ b/src/backend/opencl/CMakeLists.txt
-@@ -168,6 +168,10 @@ ADD_DEPENDENCIES(afopencl ${cl_kernel_targets})
- 
- TARGET_LINK_LIBRARIES(afopencl ${OPENCL_LIBRARIES} ${lib_deps} ${CLBLAS_LIBRARIES} ${CLFFT_LIBRARIES} ${CMAKE_DL_LIBS} ${Boost_LIBRARIES})
- 
-+SET_TARGET_PROPERTIES(afopencl PROPERTIES
-+    VERSION "${AF_VERSION}"
-+    SOVERSION "${AF_VERSION_MAJOR}")
-+
- # locally built but not installed libraries (clBLAS and clFFT) must NOT appear in the
- # link interface. The best option would be to use LINK_PRIVATE, but unfortunately
- # it is not available for older cmake than 2.8.7, so they must be remove from
--- 
-2.1.4
-
diff --git a/debian/patches/0002-enable-multiarch.patch b/debian/patches/0002-enable-multiarch.patch
deleted file mode 100644
index 41bff63..0000000
--- a/debian/patches/0002-enable-multiarch.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: enable multiarch installation paths
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- arrayfire.orig/CMakeLists.txt
-+++ arrayfire/CMakeLists.txt
-@@ -69,7 +69,7 @@
- IF(WIN32)
-     SET(ARRAYFIRE_CMAKE_DIR cmake)
- ELSE()
--    SET(ARRAYFIRE_CMAKE_DIR share/ArrayFire)
-+    SET(ARRAYFIRE_CMAKE_DIR lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/ArrayFire)
- ENDIF()
- 
- IF(${BUILD_CPU})
---- arrayfire.orig/src/backend/cpu/CMakeLists.txt
-+++ arrayfire/src/backend/cpu/CMakeLists.txt
-@@ -83,7 +83,7 @@
-     VERSION "${AF_VERSION}"
-     SOVERSION "${AF_VERSION_MAJOR}")
- 
--INSTALL(TARGETS afcpu EXPORT CPU DESTINATION lib COMPONENT libraries)
-+INSTALL(TARGETS afcpu EXPORT CPU DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE} COMPONENT libraries)
- 
- export(TARGETS afcpu FILE ArrayFireCPU.cmake)
- INSTALL(EXPORT CPU DESTINATION ${ARRAYFIRE_CMAKE_DIR} 

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