[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 ccd857a952a5af446b2e627d6b7e596983a843c8
Author: Steffen Moeller <moeller at debian.org>
Date:   Sun Dec 4 01:24:05 2011 +0100

    Removed const patches, extra test in init

diff --git a/debian/boinc-client.init b/debian/boinc-client.init
index 415b3a1..6d306ae 100644
--- a/debian/boinc-client.init
+++ b/debian/boinc-client.init
@@ -90,7 +90,7 @@ start()
   if is_running; then
     log_progress_msg "already running"
   else
-    if [ -x /usr/bin/xhost ]; then
+    if [ -n "$DISPLAY" -a -x /usr/bin/xhost ]; then
        # grant the boinc client to perform GPU computing
        xhost local:boinc || echo -n "xhost error ignored, GPU computing may not be possible"
     fi
diff --git a/debian/boinc-manager.README.Debian b/debian/boinc-manager.README.Debian
index 6924dd5..63e91c8 100644
--- a/debian/boinc-manager.README.Debian
+++ b/debian/boinc-manager.README.Debian
@@ -12,12 +12,23 @@ Setting the default web browser
 -------------------------------
 
 Debian's BOINC Manager uses a more reliable way to determine the web
-browser by using the sensible-browser program. To change the default
-web browser, run as root:
-  
-  % update-alternatives --config x-www-browser
+browser by using the sensible-browser (1) program. Its man page suggests
+to set the BROWSER environment variable to teach what browser to open.
+For a system-wide change of the default web browser, run as root:
+
+  % update-alternatives --config gnome-www-browser
+
+and select your favorite. Admittedly, the line one should think to be
   
-and select your favorite. If this does not work, set the alternative
-manually (Firefox is used in this example):
+  $ update-alternatives --config x-www-browser
+
+and maybe you want to configure both.  If this does not work, set the
+alternative manually along the following lines:
+
+  $ for i in iceweasel firefox chromium-browser; do
+      if [ -x /usr/bin/$i ]; then
+        update-alternatives --set gnome-www-browser $i
+        break
+      fi
+    done
 
-  % update-alternatives --set x-www-browser /usr/bin/firefox
diff --git a/debian/changelog b/debian/changelog
index 13f22a9..aff12b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ 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
 
diff --git a/debian/patches/series b/debian/patches/series
index da062cd..20b8ef0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,7 @@ upstream_sztaki_reduce_accessibility_of_php_inc_file.patch
 debian_debian_AdjustBoincTopdirPython.patch
 libnotify-0.7.patch
 stripchart_security.patch
-AddSomeConstToMakeClearMemoryIsNotAllocated.patch
-AddingMoreConst.patch
-evenMoreConst03.patch
+#AddSomeConstToMakeClearMemoryIsNotAllocated.patch
+#AddingMoreConst.patch
+#evenMoreConst03.patch
 #andYetMorePatches04.patch

-- 
BOINC packaging