[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 c0f9852047662ee68a02a19c05a3bec31221361d
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Dec 2 03:05:21 2011 +0100

    Preparing for boinc 7.

diff --git a/debian/changelog b/debian/changelog
index 2edf297..daf490c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,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
+  * Added boinc-cuda package in contrib.
 
  -- Steffen Moeller <moeller at debian.org>  Tue, 15 Nov 2011 22:06:19 +0100
 
diff --git a/debian/control b/debian/control
index 7c1ae29..c46eb50 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Homepage: http://boinc.berkeley.edu/
 Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-boinc/boinc.git
 
+
 Package: boinc
 Architecture: all
 Depends: ${misc:Depends},
@@ -36,6 +37,50 @@ Description: metapackage for the BOINC client and the manager
  BOINC Manager, a graphical monitor and control utility for the
  BOINC core client.
 
+
+Package: boinc-cuda
+Architecture: amd64 i386
+Section: contrib/net
+Depends: ${misc:Depends}, boinc, libcuda1, libcuda1-ia32 [amd64], ia32-libs [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
+ various scientific disciplines all compete for the idle time of
+ desktop computers. The developers' web site at the University of
+ Berkeley serves as a common portal to the otherwise independently run
+ projects.
+ .
+ Regular users (rightously) often find it an unbearable nuissance to
+ care for the configuration of BOINC for CUDA-savvy graphics cards.
+ This package adds a series of dependencies from the non-free section
+ to the regular boinc package. This also meant this binary package
+ to be redistributed in the contrib section of Debian.
+
+
+Package: boinc-amdopencl
+Architecture: amd64 i386
+Section: contrib/net
+Depends: ${misc:Depends}, boinc, fglrx-driver, amd-libopencl1
+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
+ various scientific disciplines all compete for the idle time of
+ desktop computers. The developers' web site at the University of
+ Berkeley serves as a common portal to the otherwise independently run
+ projects.
+ .
+ Regular users (rightously) often find it an unbearable nuissance to
+ care for the configuration of BOINC for the OpenCL-savvy AMD/ATI
+ graphics cards.  This package adds a series of dependencies from the
+ non-free section to the regular boinc package. This also meant this
+ binary package to be redistributed in the contrib section of Debian.
+ .
+ This package is not perfect, yet. A major problem for the moment
+ is the availability of the OpenCL driver for 32bit binaries for
+ amd64. If this is planned, install the amd-app package provided
+ through the AMD developer forum.
+
+
 Package: boinc-client
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser,
@@ -58,6 +103,7 @@ Description: core client for the BOINC distributed computing infrastructure
  dynamically download the projects application's program to be then
  wrapped by the BOINC core client.
 
+
 Package: boinc-manager
 Section: x11
 Architecture: any
@@ -83,6 +129,7 @@ Description: GUI to control and monitor the BOINC core client
  boinc-client package, not the boinc-manager, is required for every
  machine contributing.
 
+
 Package: boinc-dev
 Section: devel
 Architecture: any
@@ -97,6 +144,7 @@ Description: development files to build applications for BOINC projects
  needed to develop and compile applications which utilizes the BOINC
  infrastructure.
 
+
 Package: boinc-server-maker
 Section: net
 Architecture: any
@@ -120,6 +168,7 @@ Description: BOINC server applications and data files
  This package contains the daemons and tools to create and run BOINC
  projects.
 
+
 Package: boinc-app-examples
 Section: net
 Architecture: any
@@ -142,6 +191,7 @@ Description: example binaries for BOINC servers
  The package also features the wrapper application, which is likely
  to find its audience also in real projects.
 
+
 Package: boinc-dbg
 Section: debug
 Priority: extra
@@ -158,6 +208,7 @@ Description: debugging symbols for BOINC binaries
  with names in a debugger, this makes it somewhat easier to interpret
  core dumps.
 
+
 Package: boinc-cgi-stripchart
 Section: libs
 Priority: extra
diff --git a/debian/rules b/debian/rules
index 76e7d03..b122d40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -140,7 +140,7 @@ clean:
 	find . -name "Makefile" | grep -v samples | xargs -r rm
 	rm -f configure
 	rm -rf py/lib.linux-*-2.*
-	rm -f override_dh_auto_install
+	rm -f override_dh_auto_install client_state.xml gui_rpc_auth.cfg
 
 # Commands not to execute - empty overrides
 override_dh_auto_test:

-- 
BOINC packaging