[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-347-g96da082

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 5b30ced0ff0e8cac4fd4fd50488ba38a7ba4cc2f
Author: Steffen Moeller <moeller at debian.org>
Date:   Tue Dec 6 22:31:08 2011 +0100

    Smallish corrections.

diff --git a/debian/changelog b/debian/changelog
index aff12b1..879216b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+boinc (7.0.2+dfsg-2) unstable; urgency=low
+
+  * Adjusted CUDA dependencies for Ubuntu (lp: #410809).
+
+ -- Steffen Moeller <moeller at debian.org>  Tue, 06 Dec 2011 22:32:48 +0100
+
 boinc (7.0.2+dfsg-1) unstable; urgency=low
 
   * New upstream version.
@@ -14,7 +20,7 @@ boinc (6.13.12+dfsg-2) UNRELEASED; urgency=low
   * Added explicit dependencies on x11-common and network-manager
     for boot sequence, as indicated by
     http://wiki.debian.org/LSBInitScripts (lp: #820246)
-  * Added boinc-nvidia-cuda and boinc-amd-opencl packages in contrib.
+  * Added boinc-nvidia-cuda and boinc-amd-opencl packages in contrib (lp: #410809).
 
  -- Steffen Moeller <moeller at debian.org>  Tue, 15 Nov 2011 22:06:19 +0100
 
diff --git a/debian/control b/debian/control
index 19bebae..272d5b3 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Description: metapackage for the BOINC client and the manager
 Package: boinc-nvidia-cuda
 Architecture: amd64 i386
 Section: contrib/net
-Depends: ${misc:Depends}, boinc, libcuda1, libcuda1-ia32 [amd64], ia32-libs [amd64]
+Depends: ${misc:Depends}, boinc, libcuda1|nvidia-current, libcuda1-ia32|nvidia-current [amd64], ia32-libs|nvidia-current [amd64]
 Description: metapackage for CUDA-savvy BOINC client and manager
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
  software platform for distributed computing: several initiatives of
@@ -61,7 +61,7 @@ Package: boinc-amd-opencl
 Architecture: amd64 i386
 Section: contrib/net
 Depends: ${misc:Depends}, boinc, fglrx-driver, amd-libopencl1
-Description: metapackage for CUDA-savvy BOINC client and manager
+Description: metapackage for AMD/ATI OpenCL-savvy BOINC client and manager
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
  software platform for distributed computing: several initiatives of
  various scientific disciplines all compete for the idle time of

-- 
BOINC packaging