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

[Steffen Möller]

The following commit has been merged in the master branch:
commit 84768ee11bd11caf5585b147188bb708fb0c5a12
Author: Steffen Möller <steffen_moeller at gmx.de>
Date:   Tue Dec 6 15:23:32 2011 +0100

    Minimised BOINC configuration.

diff --git a/debian/boinc-client.README.Debian b/debian/boinc-client.README.Debian
index 494586f..6b3d0c4 100644
--- a/debian/boinc-client.README.Debian
+++ b/debian/boinc-client.README.Debian
@@ -29,7 +29,9 @@ directory.
 Edit the file '/etc/default/boinc-client' to configure the init
 script, to change the BOINC data directory or the user used to execute
 the core client or to disable the automatic start of the BOINC core
-client at boot time.
+client at boot time. The further behaviour of the client, e.g. the
+debug level of log files, is specified in files collected in
+'/etc/boinc-client/'.
 
 To configure a running core client (e.g. attaching a project to it)
 the 'boinccmd' console program or the graphical BOINC Manager
diff --git a/debian/changelog b/debian/changelog
index 91ff4c1..bdf2fa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,5 @@
+  * Minimised client configuration.
+
 boinc (6.13.12+dfsg-1) unstable; urgency=low
 
   * New upstream version.
diff --git a/debian/conffiles/cc_config.xml b/debian/conffiles/cc_config.xml
index a557c21..13f082e 100644
--- a/debian/conffiles/cc_config.xml
+++ b/debian/conffiles/cc_config.xml
@@ -1,38 +1,12 @@
 <!--
-This is the configuration file cc_config.xml of the BOINC core client.
+This is a minimal configuration file cc_config.xml of the BOINC core client.
 For a complete list of all available options and logging flags and their
 meaning see: http://boinc.berkeley.edu/trac/wiki/ClientMessages
 -->
 <cc_config>
-  <options>
-  </options>
   <log_flags>
     <task>1</task>
     <file_xfer>1</file_xfer>
     <sched_ops>1</sched_ops>
-
-    <cpu_sched>0</cpu_sched>
-    <cpu_sched_debug>0</cpu_sched_debug>
-    <rr_simulation>0</rr_simulation>
-    <debt_debug>0</debt_debug>
-    <task_debug>0</task_debug>
-    <work_fetch_debug>0</work_fetch_debug>
-    <unparsed_xml>0</unparsed_xml>
-    <state_debug>0</state_debug>
-    <file_xfer_debug>0</file_xfer_debug>
-    <sched_op_debug>0</sched_op_debug>
-    <http_debug>0</http_debug>
-    <proxy_debug>0</proxy_debug>
-    <time_debug>0</time_debug>
-    <http_xfer_debug>0</http_xfer_debug>
-    <benchmark_debug>0</benchmark_debug>
-    <poll_debug>0</poll_debug>
-    <gui_rpc_debug>0</gui_rpc_debug>
-    <scrsave_debug>0</scrsave_debug>
-    <app_msg_send>0</app_msg_send>
-    <app_msg_receive>0</app_msg_receive>
-    <mem_usage_debug>0</mem_usage_debug>
-    <network_status_debug>0</network_status_debug>
-    <checkpoint_debug>0</checkpoint_debug>
   </log_flags>
 </cc_config>

-- 
BOINC packaging