[SCM] ViennaCL packaging branch, master, updated. debian/1.1.2-6-15-g1630552

Michael Wild themiwi at users.sourceforge.net
Thu Feb 16 19:56:47 UTC 2012


The following commit has been merged in the master branch:
commit f074a6d143fb3ec0aa347b5d169608d4b26cf7c7
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Wed Feb 15 16:58:03 2012 +0100

    Removed obsolete patches
    
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/patches/0001-Properly-link-tests-against-libOpenCL.patch b/debian/patches/0001-Properly-link-tests-against-libOpenCL.patch
deleted file mode 100644
index aa5706b..0000000
--- a/debian/patches/0001-Properly-link-tests-against-libOpenCL.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Tue, 5 Jul 2011 17:24:52 +0200
-Subject: Properly link tests against libOpenCL
-
-Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
----
- tests/CMakeLists.txt |   14 +-------------
- 1 files changed, 1 insertions(+), 13 deletions(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index d5cf057..8400799 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -90,17 +90,5 @@ ENDFOREACH(PROG)
- 
- ADD_EXECUTABLE(external_linkage  ../src/external_1.cpp
-                                  ../src/external_2.cpp)
--
--#-----------------------------------------------------------------------------
--
--#-----------------------------------------------------------------------------
--# Mac OS X specific linker part
--IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--   set(CMAKE_EXE_LINKER_FLAGS "-framework OpenCL")
--ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
--
--# Linux specific linker part
--IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--   set(CMAKE_EXE_LINKER_FLAGS "-lOpenCL")
--ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+TARGET_LINK_LIBRARIES(external_linkage OpenCL)
- #-----------------------------------------------------------------------------
--- 
diff --git a/debian/patches/0002-Link-auxiliary-converter-against-libboost_system-mt.patch b/debian/patches/0002-Link-auxiliary-converter-against-libboost_system-mt.patch
deleted file mode 100644
index 448be6c..0000000
--- a/debian/patches/0002-Link-auxiliary-converter-against-libboost_system-mt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Mon, 1 Aug 2011 14:15:50 +0200
-Subject: Link auxiliary/converter against libboost_system-mt
-
-Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
----
- auxiliary/convert.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/auxiliary/convert.sh b/auxiliary/convert.sh
-index d554fa4..e0ec83f 100755
---- a/auxiliary/convert.sh
-+++ b/auxiliary/convert.sh
-@@ -5,5 +5,5 @@ g++ generate-blas3-prod-align1.cpp -o generate-blas3-prod-align1
- 
- ./generate-blas3.sh
- 
--g++ converter.cpp -o converter -lboost_filesystem-mt
-+g++ converter.cpp -o converter -lboost_filesystem-mt -lboost_system-mt
- ./converter
--- 
diff --git a/debian/patches/0003-Force-Boost.Filesystem-version-2-API-for-auxiliary-c.patch b/debian/patches/0003-Force-Boost.Filesystem-version-2-API-for-auxiliary-c.patch
deleted file mode 100644
index 25da2cb..0000000
--- a/debian/patches/0003-Force-Boost.Filesystem-version-2-API-for-auxiliary-c.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Michael Wild <themiwi at users.sourceforge.net>
-Date: Tue, 2 Aug 2011 09:31:49 +0200
-Subject: Force Boost.Filesystem version 2 API for auxiliary/converter.cpp
-
-Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
----
- auxiliary/convert.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/auxiliary/convert.sh b/auxiliary/convert.sh
-index e0ec83f..f198dfa 100755
---- a/auxiliary/convert.sh
-+++ b/auxiliary/convert.sh
-@@ -5,5 +5,5 @@ g++ generate-blas3-prod-align1.cpp -o generate-blas3-prod-align1
- 
- ./generate-blas3.sh
- 
--g++ converter.cpp -o converter -lboost_filesystem-mt -lboost_system-mt
-+g++ converter.cpp -DBOOST_FILESYSTEM_VERSION=2 -o converter -lboost_filesystem-mt -lboost_system-mt
- ./converter
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 5dec887..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +0,0 @@
-0001-Properly-link-tests-against-libOpenCL.patch
-0002-Link-auxiliary-converter-against-libboost_system-mt.patch
-0003-Force-Boost.Filesystem-version-2-API-for-auxiliary-c.patch

-- 
ViennaCL packaging



More information about the debian-science-commits mailing list