[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 9ddee8e3f2a2d0bd28e36bb4132bc84bc8a1317c
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Dec 3 00:19:54 2011 +0100

    Updated patches. Added boinc to video group.
    
    Closing some bugs.

diff --git a/debian/boinc-client.postinst b/debian/boinc-client.postinst
index 0139f3c..a8e7174 100644
--- a/debian/boinc-client.postinst
+++ b/debian/boinc-client.postinst
@@ -39,6 +39,11 @@ case "$1" in
              --gecos "BOINC core client" boinc
         fi
 
+	# Assign boinc user to group video if not already the case
+	if ! getent group video | grep -q boinc; then
+	    usermod -a -G video boinc || echo "Could not assign boinc user to group 'video'."
+	fi
+
         # Make sure the /var/lib/boinc-client directory exists and
         # is owned by the boinc user.
         mkdir $BOINC_DIR 2>/dev/null || true
diff --git a/debian/changelog b/debian/changelog
index e9eb8fb..13f22a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 boinc (7.0.2+dfsg-1) unstable; urgency=low
 
   * New upstream version.
+  * Adding boinc user to group video (Closes: #557871)
 
  -- Steffen Moeller <moeller at debian.org>  Fri, 02 Dec 2011 03:10:11 +0100
 
@@ -8,7 +9,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
+    http://wiki.debian.org/LSBInitScripts (lp: #820246)
   * Added boinc-nvidia-cuda and boinc-amd-opencl packages 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 953552f..19bebae 100644
--- a/debian/control
+++ b/debian/control
@@ -51,10 +51,10 @@ Description: metapackage for CUDA-savvy BOINC client and manager
  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.
+ care for the exact 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-amd-opencl
diff --git a/debian/patches/annoying_warning_const_image.patch b/debian/patches/annoying_warning_const_image.patch
deleted file mode 100644
index daf6c3f..0000000
--- a/debian/patches/annoying_warning_const_image.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: boinc/clientgui/res/linuxicon.xpm
-===================================================================
---- boinc.orig/clientgui/res/linuxicon.xpm	2011-11-13 20:04:29.000000000 +0100
-+++ boinc/clientgui/res/linuxicon.xpm	2011-11-13 22:51:17.000000000 +0100
-@@ -1,5 +1,5 @@
- /* XPM */
--static char *Linux_xpm[] = {
-+static const char *Linux_xpm[] = {
- /* columns rows colors chars-per-pixel */
- "14 14 17 1",
- ". c #8F8979",
-Index: boinc/clientgui/res/macosicon.xpm
-===================================================================
---- boinc.orig/clientgui/res/macosicon.xpm	2011-11-13 20:04:29.000000000 +0100
-+++ boinc/clientgui/res/macosicon.xpm	2011-11-13 22:51:17.000000000 +0100
-@@ -1,5 +1,5 @@
- /* XPM */
--static char *MacOS_xpm[] = {
-+static const char *MacOS_xpm[] = {
- /* columns rows colors chars-per-pixel */
- "14 14 14 1",
- "= c #295A9C",
-Index: boinc/clientgui/res/windowsicon.xpm
-===================================================================
---- boinc.orig/clientgui/res/windowsicon.xpm	2011-11-13 20:04:29.000000000 +0100
-+++ boinc/clientgui/res/windowsicon.xpm	2011-11-13 22:51:17.000000000 +0100
-@@ -1,5 +1,5 @@
- /* XPM */
--static char *Win32_xpm[] = {
-+static const char *Win32_xpm[] = {
- /* columns rows colors chars-per-pixel */
- "14 14 23 1",
- "4 c #6CC0EE",
diff --git a/debian/patches/libnotify-0.7.patch b/debian/patches/libnotify-0.7.patch
index ddb2056..764b4e4 100644
--- a/debian/patches/libnotify-0.7.patch
+++ b/debian/patches/libnotify-0.7.patch
@@ -1,8 +1,8 @@
 Index: boinc/clientgui/Makefile.am
 ===================================================================
---- boinc.orig/clientgui/Makefile.am	2011-08-08 01:43:01.000000000 +0200
-+++ boinc/clientgui/Makefile.am	2011-08-08 01:44:54.000000000 +0200
-@@ -117,9 +117,13 @@
+--- boinc.orig/clientgui/Makefile.am	2011-12-02 02:55:57.000000000 +0100
++++ boinc/clientgui/Makefile.am	2011-12-03 00:16:43.000000000 +0100
+@@ -118,9 +118,13 @@
      ../lib/error_numbers.h \
      locale $(mac_headers)
  
@@ -21,8 +21,8 @@ Index: boinc/clientgui/Makefile.am
  	grep '#define.*BOINC.*VERSION' $^ > $@
 Index: boinc/configure.ac
 ===================================================================
---- boinc.orig/configure.ac	2011-08-08 01:44:54.000000000 +0200
-+++ boinc/configure.ac	2011-08-08 01:44:54.000000000 +0200
+--- boinc.orig/configure.ac	2011-12-03 00:16:37.000000000 +0100
++++ boinc/configure.ac	2011-12-03 00:16:43.000000000 +0100
 @@ -709,14 +709,12 @@
  
  dnl ---------- libNotify --------------------------------------------------
diff --git a/debian/patches/series b/debian/patches/series
index a4cb98c..da062cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
 debian_debian_AdjustBoincTopdirPython.patch
 libnotify-0.7.patch
 stripchart_security.patch
-annoying_warning_const_image.patch
 AddSomeConstToMakeClearMemoryIsNotAllocated.patch
 AddingMoreConst.patch
 evenMoreConst03.patch

-- 
BOINC packaging