[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 96da082a6d397cbb177162401a5d2059b92b3d8c
Merge: 5b30ced0ff0e8cac4fd4fd50488ba38a7ba4cc2f 20a6d2ce779a81928afe3a3b282ac46604c2b7a4
Author: Steffen Moeller <moeller at debian.org>
Date:   Tue Dec 6 22:44:48 2011 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-boinc/boinc
    
    Conflicts:
    	debian/changelog
    	debian/patches/series

diff --combined debian/changelog
index 879216b,bdf2fa0..94aebc0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,4 +1,34 @@@
- boinc (7.0.2+dfsg-2) unstable; urgency=low
 -  * Minimised client configuration.
++boinc (7.0.2+dfsg-2) UNRELEASED; urgency=low
 +
++  [Contributed by Daniel Hahler]
 +  * Adjusted CUDA dependencies for Ubuntu (lp: #410809).
++  * New window renders bug invalid (lp: #511654)
++
++  [Contributed by Oliver Bock]
++  * Client configuration fall (mostly) back to defaults.
++  * Typos in description.
 +
 + -- 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.
 +  * Adding boinc user to group video (Closes: #557871)
 +  * Testing on $DISPLAY set before executing xhost (Closes: #644388),
 +    thanks to John Feuerstein for the idea and the patch.
 +  * Fixed documentation issue with browser setting (Closes: #537695),
 +    sorry for not having addressed that earlier.
 +
 + -- Steffen Moeller <moeller at debian.org>  Fri, 02 Dec 2011 03:10:11 +0100
 +
 +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 (lp: #410809).
 +
 + -- Steffen Moeller <moeller at debian.org>  Tue, 15 Nov 2011 22:06:19 +0100
  
  boinc (6.13.12+dfsg-1) unstable; urgency=low
  

-- 
BOINC packaging