[SCM] ViennaCL packaging branch, master, updated. debian/1.1.2-6-20-g412b4cd

[Michael Wild]

The following commit has been merged in the master branch:
commit 9efdf23c790472b28f3a5173af4caeabd1070f8c
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Tue Feb 21 07:39:38 2012 +0100

    Added 0003-Fix-adding-a-new-compute-device.patch
    
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/patches/0003-Fix-adding-a-new-compute-device.patch b/debian/patches/0003-Fix-adding-a-new-compute-device.patch
new file mode 100644
index 0000000..035bf12
--- /dev/null
+++ b/debian/patches/0003-Fix-adding-a-new-compute-device.patch
@@ -0,0 +1,27 @@
+From: Michael Wild <themiwi at users.sourceforge.net>
+Date: Tue, 21 Feb 2012 07:33:01 +0100
+Subject: Fix adding a new compute device
+
+The existing code only added a device if it already was in the list of
+devices, instead of adding it if *not* in the list.
+
+Origin: http://sourceforge.net/mailarchive/message.php?msg_id=28862919
+Author: Karl Rupp <rupp at iue.tuwien.ac.at>
+---
+ viennacl/ocl/context.hpp |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/viennacl/ocl/context.hpp b/viennacl/ocl/context.hpp
+index e2355fc..cac6e74 100644
+--- a/viennacl/ocl/context.hpp
++++ b/viennacl/ocl/context.hpp
+@@ -123,7 +123,7 @@ namespace viennacl
+           #if defined(VIENNACL_DEBUG_ALL) || defined(VIENNACL_DEBUG_CONTEXT)
+           std::cout << "ViennaCL: Adding new device to context " << h_ << std::endl;
+           #endif
+-          if (std::find(devices_.begin(), devices_.end(), d) != devices_.end())
++          if (std::find(devices_.begin(), devices_.end(), d) == devices_.end())
+             devices_.push_back(d);
+         }
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index b7d8f95..5e2da2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Define-OPENCL_INCLUDE_DIRS-in-cmake-FindOpenCL.cmake.patch
 0002-Double-precision-on-AMD-GPUs-in-version-1.2.0.patch
+0003-Fix-adding-a-new-compute-device.patch

-- 
ViennaCL packaging