r656 - /branches/experimental/boinc/debian/ /branches/experimental/boinc/debian/patches/ /trunk/boinc/debian/ /trunk/boinc/debian/extra/ /trunk/boinc/debian/manpages/ /trunk/boinc/debian/patches/

fst-guest at users.alioth.debian.org fst-guest at users.alioth.debian.org
Wed May 30 12:56:36 UTC 2007


Author: fst-guest
Date: Wed May 30 12:56:36 2007
New Revision: 656

URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=656
Log:
* Merged trunk/boinc with branches/experimental/boinc.
* Updated trunk/boinc to the new upstream release 5.10.0.
* Use [ ... ] && [ ... ] instead of [ ... -a ... ] because it is easier to
  read. (debian/boinc-client.postinst)

Added:
    trunk/boinc/debian/patches/001_dont_install_ca-bundle.crt.patch
Removed:
    trunk/boinc/debian/extra/use-32bit-on-amd64.sh
    trunk/boinc/debian/patches/001_amd64_disable_platform_reset.patch
    trunk/boinc/debian/patches/101_gcc_4.3_fixes.patch
Modified:
    branches/experimental/boinc/debian/boinc-client.postinst
    branches/experimental/boinc/debian/changelog
    branches/experimental/boinc/debian/control
    branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch
    branches/experimental/boinc/debian/patches/004_exclude_sea.patch
    branches/experimental/boinc/debian/patches/series
    trunk/boinc/debian/boinc-client.README.Debian
    trunk/boinc/debian/boinc-client.default
    trunk/boinc/debian/boinc-client.examples
    trunk/boinc/debian/boinc-client.init
    trunk/boinc/debian/boinc-client.postinst
    trunk/boinc/debian/changelog
    trunk/boinc/debian/manpages/boinc_client.xml
    trunk/boinc/debian/manpages/boinc_cmd.xml
    trunk/boinc/debian/manpages/boincmgr.xml
    trunk/boinc/debian/patches/003_use_sensible-browser.patch
    trunk/boinc/debian/patches/004_exclude_sea.patch
    trunk/boinc/debian/patches/series

Modified: branches/experimental/boinc/debian/boinc-client.postinst
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.postinst?rev=656&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.postinst (original)
+++ branches/experimental/boinc/debian/boinc-client.postinst Wed May 30 12:56:36 2007
@@ -11,7 +11,7 @@
 
 mv_conffile()
 {
-    if [ ! -L "$BOINC_DIR/$1" -a -f "$BOINC_DIR/$1" ]; then
+    if [ ! -L "$BOINC_DIR/$1" ] && [ -f "$BOINC_DIR/$1" ]; then
         mv -f "$BOINC_DIR/$1" "$CONF_DIR/$1"
     fi
     ln -sf "$CONF_DIR/$1" "$BOINC_DIR/$1"
@@ -63,7 +63,7 @@
         # export-boinc script removes the curl dir).
         CA_FILE=/etc/ssl/certs/ca-certificates.crt
         CA_LINK="$BOINC_DIR/ca-bundle.crt"
-        if [ ! -e $CA_LINK -a -f $CA_FILE ]; then
+        if [ ! -e $CA_LINK ] && [ -f $CA_FILE ]; then
             ln -sf $CA_FILE $CA_LINK
         fi
     ;;

Modified: branches/experimental/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/changelog?rev=656&op=diff
==============================================================================
--- branches/experimental/boinc/debian/changelog (original)
+++ branches/experimental/boinc/debian/changelog Wed May 30 12:56:36 2007
@@ -1,4 +1,32 @@
 boinc (5.10.0-1) experimental; urgency=low
+
+  [ Frank S. Thomas ]
+
+  +++ Changes unsuitable for the trunk branch:
+
+  * Updates for the new Python policy:
+    - Added python-support (>= 0.4.2) to Build-Depends.
+    - Replaced dh_python with dh_pysupport in debian/rules.
+  * debian/control:
+    - Added "tcsh | c-shell" to boinc-server's Depends field since
+      tools/db_query and tools/watch_tcp use /bin/csh as interpreter.
+    - Removed all php4 packages from boinc-server's Depends because php4
+      will not be supported during lenny's life cycle.
+  * debian/boinc-server.README.Debian: Added README.Debian which is at the
+    moment only a pointer to http://wiki.debian.org/BOINC/Server.
+  * debian/boinc-server.install:
+    - Added: db/init_db, sched/db_dump_spec.xml, test/uc_result,
+      test/uc_wu_nodelete, tools/cleanlogs.sh, tools/create_work_example,
+      tools/makelog.sh, tools/project.xml, tools/run_in_ops and tools/updater.
+      Some of them were required by the tools/make_project script.
+    - Removed: tools/add (long deprecated upstream).
+  * debian/rules:
+    - Don't fix PHP shebang and execute permissions of files in html/ops/
+      since these were fixed upstream.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 30 May 2007 11:08:14 +0200
+
+boinc (5.10.0-1) unstable; urgency=low
 
   [ Frank S. Thomas ]
   * New upstream release.
@@ -15,30 +43,10 @@
     new release.
   * debian/boinc-client.{init,default}: Use two dashes for boinc_client's
     command line options instead of one because that is it's default now.
-
-  +++ Changes unsuitable for the trunk branch:
-
-  * Updates for the new Python policy:
-    - Added python-support (>= 0.4.2) to Build-Depends.
-    - Replaced dh_python with dh_pysupport in debian/rules.
-  * debian/control:
-    - Added "tcsh | c-shell" to boinc-server's Depends field since
-      tools/db_query and tools/watch_tcp use /bin/csh as interpreter.
-    - Removed all php4 packages from boinc-server's Depends because php4
-      will not be supported during lenny's life cycle.
-  * debian/boinc-server.README.Debian: Added README.Debian which is at the
-    moment only a pointer to http://wiki.debian.org/BOINC/Server.
-  * debian/boinc-server.install:
-    - Added: db/init_db, sched/db_dump_spec.xml, test/uc_result,
-      test/uc_wu_nodelete, tools/cleanlogs.sh, tools/create_work_example,
-      tools/makelog.sh, tools/project.xml, tools/run_in_ops and tools/updater.
-      Some of them were required by the tools/make_project script.
-    - Removed: tools/add (long deprecated upstream).
-  * debian/rules:
-    - Don't fix PHP shebang and execute permissions of files in html/ops/
-      since these were fixed upstream.
-
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 30 May 2007 11:08:14 +0200
+  * debian/boinc-client.postinst: Use "[ ... ] && [ ... ]" instead of
+    "[ ... -a ... ]" because these constructs are much easier to read.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 30 May 2007 14:50:07 +0200
 
 boinc (5.8.17-2) unstable; urgency=low
 
@@ -47,7 +55,8 @@
     - Extended boinc-manager's long description.
     - Added libcurl4-openssl-dev to Build-Depends because the libcurl packages
       have bumped sonames. The B-D on libcurl3-openssl-dev remains as
-      alternative dependency to ease backporting to etch. (closes: #424501)
+      alternative dependency to ease backporting to etch.
+      (closes: #424501, #425225)
   * Updated all BOINC URLs to point to their new location in the official
     BOINC wiki according to http://boinc.berkeley.edu/trac/wiki/FileList.
   * debian/boinc-dev.{install,links}: Install lib/common_defs.h header to fix
@@ -56,7 +65,10 @@
   * debian/manpages/*.xml: Made <ulink> elements empty if their content was
     the same as the content of their url attribute.
 
- -- Frank S. Thomas <frank at thomas-alfeld.de>  Sat, 19 May 2007 12:21:05 +0200
+  [ Steffen Moeller ]
+  * debian/control: Extended boinc-client's long description.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Sun, 20 May 2007 12:09:40 +0200
 
 boinc (5.8.17-1) unstable; urgency=low
 

Modified: branches/experimental/boinc/debian/control
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/control?rev=656&op=diff
==============================================================================
--- branches/experimental/boinc/debian/control (original)
+++ branches/experimental/boinc/debian/control Wed May 30 12:56:36 2007
@@ -15,7 +15,10 @@
 Suggests: boinc-app-seti, boinc-manager | kboincspy
 Description: core client for the BOINC distributed computing infrastructure
  The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing.
+ 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.
  .
  This package contains the BOINC core client program that is required to
  participate in any project that uses BOINC.  A central server distributes

Modified: branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch?rev=656&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch (original)
+++ branches/experimental/boinc/debian/patches/003_use_sensible-browser.patch Wed May 30 12:56:36 2007
@@ -1,10 +1,10 @@
 This patch is Debian-specific. Don't use it for non Debian packages. The
 program "sensible-browser" is part of the essential package debianutils.
 
-Index: boinc-5.8.15/clientgui/hyperlink.cpp
+Index: boinc-5.10.0/clientgui/hyperlink.cpp
 ===================================================================
---- boinc-5.8.15.orig/clientgui/hyperlink.cpp	2007-03-16 18:07:18.000000000 +0100
-+++ boinc-5.8.15/clientgui/hyperlink.cpp	2007-03-16 18:08:16.000000000 +0100
+--- boinc-5.10.0.orig/clientgui/hyperlink.cpp	2006-10-27 12:26:56.000000000 +0200
++++ boinc-5.10.0/clientgui/hyperlink.cpp	2007-05-30 08:59:31.000000000 +0200
 @@ -171,7 +171,8 @@
  }
  

Modified: branches/experimental/boinc/debian/patches/004_exclude_sea.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/004_exclude_sea.patch?rev=656&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/004_exclude_sea.patch (original)
+++ branches/experimental/boinc/debian/patches/004_exclude_sea.patch Wed May 30 12:56:36 2007
@@ -1,7 +1,7 @@
-Index: boinc-5.8.15/Makefile.am
+Index: boinc-5.10.0/Makefile.am
 ===================================================================
---- boinc-5.8.15.orig/Makefile.am	2007-03-16 18:07:17.000000000 +0100
-+++ boinc-5.8.15/Makefile.am	2007-03-16 18:08:16.000000000 +0100
+--- boinc-5.10.0.orig/Makefile.am	2006-08-31 23:16:36.000000000 +0200
++++ boinc-5.10.0/Makefile.am	2007-05-30 08:59:43.000000000 +0200
 @@ -17,7 +17,7 @@
  endif
  

Modified: branches/experimental/boinc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/series?rev=656&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/series (original)
+++ branches/experimental/boinc/debian/patches/series Wed May 30 12:56:36 2007
@@ -1,3 +1,4 @@
+001_dont_install_ca-bundle.crt.patch
 002_sched_makefile.am.patch
 003_use_sensible-browser.patch
 004_exclude_sea.patch

Modified: trunk/boinc/debian/boinc-client.README.Debian
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.README.Debian?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.README.Debian (original)
+++ trunk/boinc/debian/boinc-client.README.Debian Wed May 30 12:56:36 2007
@@ -11,8 +11,7 @@
   1. Configuring the BOINC core client
   2. Installing and configuring BOINC application packages
   3. Moving a BOINC data directory to /var/lib/boinc-client
-  4. Making the BOINC core client usable on AMD64
-  5. Mass deployment of boinc-client that automatically attach to an
+  4. Mass deployment of boinc-client that automatically attach to an
      Account Manager
 
 
@@ -91,43 +90,7 @@
      % /etc/init.d/boinc-client start
 
 
-4. Making the BOINC core client usable on AMD64
------------------------------------------------
-
-Most BOINC projects do not support AMD64 and do not provide
-applications for it. You know that a project does not support AMD64
-when your client receives a message from the BOINC server which looks
-like this:
-
-    "Message from server: platform 'x86_64-pc-linux-gnu' not found"
-
-If you still want to use the AMD64 BOINC core client you can now
-install 'boinc-app-*' packages (see paragraph 2.) which use the
-anonymous platform mechanism or additionally modify the core client to
-donwload 32bit applications which are available for almost all
-projects. The following instructions explains the latter option:
-
- 1. Install the libc6-i386 package (the 32bit GNU C library for AMD64)
-    since the BOINC core client will download and run 32bit
-    applications:
-     % apt-get install libc6-i386
-
- 2. Stop the BOINC core client:   
-     % /etc/init.d/boinc-client stop
-
- 3. Replace the string 'x86_64-pc-linux-gnu' with 'i686-pc-linux-gnu'
-    in the XML element <platform_name> in your client state file
-    '/var/lib/boinc-client/client_state.xml'. You can use this sed
-    snippet to do this for you:
-     % sed -i -e \
-         's/<platform_name>x86_64-pc-linux-gnu<\/platform_name>/<platform_name>i686-pc-linux-gnu<\/platform_name>/' \
-         /var/lib/boinc-client/client_state.xml
-
- 4. Start the BOINC core client again:
-     % /etc/init.d/boinc-client start
-
-
-5. Mass deployment of boinc-client that automatically attach to an
+4. Mass deployment of boinc-client that automatically attach to an
 ------------------------------------------------------------------
    Account Manager
    ---------------

Modified: trunk/boinc/debian/boinc-client.default
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.default?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.default (original)
+++ trunk/boinc/debian/boinc-client.default Wed May 30 12:56:36 2007
@@ -17,6 +17,6 @@
 BOINC_CLIENT="/usr/bin/boinc_client"
 
 # Here you can specify additional options to pass to the BOINC core client.
-# Type 'boinc -help' or 'man boinc' for a full summary of allowed options.
-#BOINC_OPTS="-return_results_immediately -allow_remote_gui_rpc"
+# Type 'boinc --help' or 'man boinc' for a full summary of allowed options.
+#BOINC_OPTS="--return_results_immediately --allow_remote_gui_rpc"
 BOINC_OPTS=""

Modified: trunk/boinc/debian/boinc-client.examples
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.examples?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.examples (original)
+++ trunk/boinc/debian/boinc-client.examples Wed May 30 12:56:36 2007
@@ -1,2 +1,1 @@
 debian/extra/move-boinc-dir.sh
-debian/extra/use-32bit-on-amd64.sh

Modified: trunk/boinc/debian/boinc-client.init
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.init?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.init (original)
+++ trunk/boinc/debian/boinc-client.init Wed May 30 12:56:36 2007
@@ -51,7 +51,7 @@
 PIDFILE=/var/run/boinc_client.pid
 DESC="BOINC core client"
 NAME=`basename $BOINC_CLIENT`
-BOINC_OPTS="-redirectio -dir $BOINC_DIR $BOINC_OPTS"
+BOINC_OPTS="--redirectio --dir $BOINC_DIR $BOINC_OPTS"
 
 is_running()
 {

Modified: trunk/boinc/debian/boinc-client.postinst
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/boinc-client.postinst?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/boinc-client.postinst (original)
+++ trunk/boinc/debian/boinc-client.postinst Wed May 30 12:56:36 2007
@@ -11,7 +11,7 @@
 
 mv_conffile()
 {
-    if [ ! -L "$BOINC_DIR/$1" -a -f "$BOINC_DIR/$1" ]; then
+    if [ ! -L "$BOINC_DIR/$1" ] && [ -f "$BOINC_DIR/$1" ]; then
         mv -f "$BOINC_DIR/$1" "$CONF_DIR/$1"
     fi
     ln -sf "$CONF_DIR/$1" "$BOINC_DIR/$1"
@@ -63,7 +63,7 @@
         # export-boinc script removes the curl dir).
         CA_FILE=/etc/ssl/certs/ca-certificates.crt
         CA_LINK="$BOINC_DIR/ca-bundle.crt"
-        if [ ! -e $CA_LINK -a -f $CA_FILE ]; then
+        if [ ! -e $CA_LINK ] && [ -f $CA_FILE ]; then
             ln -sf $CA_FILE $CA_LINK
         fi
     ;;

Modified: trunk/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/changelog?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/changelog (original)
+++ trunk/boinc/debian/changelog Wed May 30 12:56:36 2007
@@ -1,3 +1,25 @@
+boinc (5.10.0-1) unstable; urgency=low
+
+  [ Frank S. Thomas ]
+  * New upstream release.
+    - Fixed wrong CPU information on alpha, hppa, ia64, ppc and sparc.
+      (closes: #406853)
+    - Use i686-pc-linux-gnu as alternative platform name for
+      x86_64-pc-linux-gnu to get i386 binaries on amd64. (closes: #366741)
+      Hence all traces to our own mechanism to override the platform name on
+      amd64 have been removed:
+      - debian/patches/001_amd64_disable_platform_reset.patch
+      - debian/extra/use-32bit-on-amd64.sh
+      - the associated paragraph from debian/boinc-client.README.Debian
+  * Updated boinc_client's, boinc_cmd's and boincmgr's manual pages for the
+    new release.
+  * debian/boinc-client.{init,default}: Use two dashes for boinc_client's
+    command line options instead of one because that is it's default now.
+  * debian/boinc-client.postinst: Use "[ ... ] && [ ... ]" instead of
+    "[ ... -a ... ]" because these constructs are much easier to read.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de>  Wed, 30 May 2007 14:50:07 +0200
+
 boinc (5.8.17-2) unstable; urgency=low
 
   [ Frank S. Thomas ]
@@ -14,7 +36,7 @@
     Lucas Nussbaum's archive rebuild. (closes: #422643)
   * debian/manpages/*.xml: Made <ulink> elements empty if their content was
     the same as the content of their url attribute.
-  
+
   [ Steffen Moeller ]
   * debian/control: Extended boinc-client's long description.
 

Modified: trunk/boinc/debian/manpages/boinc_client.xml
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/manpages/boinc_client.xml?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/manpages/boinc_client.xml (original)
+++ trunk/boinc/debian/manpages/boinc_client.xml Wed May 30 12:56:36 2007
@@ -17,7 +17,7 @@
   <!ENTITY dhgroupmail "<email>pkg-boinc-devel at lists.alioth.debian.org</email>">
 
   <!ENTITY dhbinary    "boinc_client">
-  <!ENTITY dhdate      "<date>April 14, 2007</date>">
+  <!ENTITY dhdate      "<date>May 30, 2007</date>">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
@@ -85,35 +85,35 @@
 
     <variablelist>
       <varlistentry>
-        <term><option>-help</option></term>
+        <term><option>--help</option></term>
         <listitem>
           <para>show options</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>-version</option></term>
+        <term><option>--version</option></term>
         <listitem>
           <para>show version info</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>-exit_when_idle</option></term>
-        <listitem>
-          <para>get/process/report work, then exit</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-show_projects</option></term>
+        <term><option>--exit_when_idle</option></term>
+        <listitem>
+          <para>exit when there are no results</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--show_projects</option></term>
         <listitem>
           <para>show attached projects</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>-return_results_immediately</option></term>
+        <term><option>--return_results_immediately</option></term>
         <listitem>
           <para>contact server when have results</para>
         </listitem>
@@ -121,7 +121,7 @@
 
       <varlistentry>
         <term>
-          <option>-detach_project <replaceable>URL</replaceable></option>
+          <option>--detach_project <replaceable>URL</replaceable></option>
         </term>
         <listitem>
           <para>detach from a project</para>
@@ -130,7 +130,7 @@
 
       <varlistentry>
         <term>
-          <option>-reset_project <replaceable>URL</replaceable></option>
+          <option>--reset_project <replaceable>URL</replaceable></option>
         </term>
         <listitem>
           <para>reset (clear) a project</para>
@@ -139,7 +139,7 @@
 
       <varlistentry>
         <term>
-          <option>-attach_project <replaceable>URL</replaceable> 
+          <option>--attach_project <replaceable>URL</replaceable> 
             <replaceable>key</replaceable></option>
         </term>
         <listitem>
@@ -149,7 +149,7 @@
 
       <varlistentry>
         <term>
-          <option>-update_prefs <replaceable>URL</replaceable></option>
+          <option>--update_prefs <replaceable>URL</replaceable></option>
         </term>
         <listitem>
           <para>contact a project to update preferences</para>
@@ -157,21 +157,21 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>-run_cpu_benchmarks</option></term>
+        <term><option>--run_cpu_benchmarks</option></term>
         <listitem>
           <para>run the CPU benchmarks</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>-check_all_logins</option></term>
+        <term><option>--check_all_logins</option></term>
         <listitem>
           <para>for idle detection, check remote logins too</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>-allow_remote_gui_rpc</option></term>
+        <term><option>--allow_remote_gui_rpc</option></term>
         <listitem>
           <para>allow remote GUI RPC connections</para>
         </listitem>
@@ -179,7 +179,7 @@
 
       <varlistentry>
         <term>
-          <option>-gui_rpc_port <replaceable>port</replaceable></option>
+          <option>--gui_rpc_port <replaceable>port</replaceable></option>
         </term>
         <listitem>
           <para>port for GUI RPCs</para>
@@ -187,21 +187,21 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>-redirectio</option></term>
+        <term><option>--redirectio</option></term>
         <listitem>
           <para>redirect stdout and stderr to log files</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>-dir <replaceable>path</replaceable></option></term>
+        <term><option>--dir <replaceable>path</replaceable></option></term>
         <listitem>
           <para>use given dir as BOINC home</para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>-no_gui_rpc</option></term>
+        <term><option>--no_gui_rpc</option></term>
         <listitem>
           <para>Omits creation of a socket as required for the remote control
             of the client. Consequently the client cannot be controlled by
@@ -211,9 +211,44 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>-daemon</option></term>
+        <term><option>--daemon</option></term>
         <listitem>
           <para>run as daemon</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--exit_before_start</option></term>
+        <listitem>
+          <para>exit right before starting a job</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--exit_after_finish</option></term>
+        <listitem>
+          <para>exit right after finishing a job</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--insecure</option></term>
+        <listitem>
+          <para>disable BOINC security users and permissions</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--launched_by_manager</option></term>
+        <listitem>
+          <para>core client was launched by Manager</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--run_by_updater</option></term>
+        <listitem>
+          <para>set by updater</para>
         </listitem>
       </varlistentry>
     </variablelist>

Modified: trunk/boinc/debian/manpages/boinc_cmd.xml
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/manpages/boinc_cmd.xml?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/manpages/boinc_cmd.xml (original)
+++ trunk/boinc/debian/manpages/boinc_cmd.xml Wed May 30 12:56:36 2007
@@ -450,14 +450,6 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>--read_global_prefs_override</option></term>
-        <listitem>
-          <para>Tell the core client to read the global_prefs_override.xml file
-            and incorporate any global preferences indicated there.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
         <term>
           <option>--lookup_account
             <replaceable>url</replaceable>
@@ -476,6 +468,29 @@
             <replaceable>name</replaceable>
           </option>
         </term>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--read_global_prefs_override</option></term>
+        <listitem>
+          <para>Tell the core client to read the global_prefs_override.xml file
+            and incorporate any global preferences indicated there.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--read_cc_config</option></term>
+         <listitem>
+          <para>Reread the configuration file (cc_config.xml).</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--network_available</option></term>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--get_cc_status</option></term>
       </varlistentry>
 
       <varlistentry>

Modified: trunk/boinc/debian/manpages/boincmgr.xml
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/manpages/boincmgr.xml?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/manpages/boincmgr.xml (original)
+++ trunk/boinc/debian/manpages/boincmgr.xml Wed May 30 12:56:36 2007
@@ -17,7 +17,7 @@
   <!ENTITY dhgroupmail "<email>pkg-boinc-devel at lists.alioth.debian.org</email>">
 
   <!ENTITY dhbinary    "boincmgr">
-  <!ENTITY dhdate      "<date>April 14, 2006</date>">
+  <!ENTITY dhdate      "<date>April 14, 2007</date>">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
@@ -37,6 +37,7 @@
     <copyright>
       <year>2005</year>
       <year>2006</year>
+      <year>2007</year>
       <holder>&dhgroupname;</holder>
     </copyright>
     &dhdate;
@@ -92,7 +93,14 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>-insecure, --insecure</option></term>
+        <term><option>-b, --boincargs</option></term>
+        <listitem>
+          <para>Startup BOINC with these optional arguments.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>-i, --insecure</option></term>
         <listitem>
           <para>Disable BOINC security users and permissions.</para>
         </listitem>

Added: trunk/boinc/debian/patches/001_dont_install_ca-bundle.crt.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/001_dont_install_ca-bundle.crt.patch?rev=656&op=file
==============================================================================
--- trunk/boinc/debian/patches/001_dont_install_ca-bundle.crt.patch (added)
+++ trunk/boinc/debian/patches/001_dont_install_ca-bundle.crt.patch Wed May 30 12:56:36 2007
@@ -1,0 +1,13 @@
+Index: boinc-5.10.0/client/Makefile.am
+===================================================================
+--- boinc-5.10.0.orig/client/Makefile.am	2007-05-30 08:58:52.000000000 +0200
++++ boinc-5.10.0/client/Makefile.am	2007-05-30 08:59:08.000000000 +0200
+@@ -66,7 +66,7 @@
+ boinc_client_LDADD = -L../lib -lboinc $(PTHREAD_LIBS)
+ 
+ boinc_clientdir = $(bindir)
+-boinc_client_DATA = ../curl/ca-bundle.crt
++#boinc_client_DATA = ../curl/ca-bundle.crt
+ 
+ switcher_SOURCES = switcher.C
+ 

Modified: trunk/boinc/debian/patches/003_use_sensible-browser.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/003_use_sensible-browser.patch?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/patches/003_use_sensible-browser.patch (original)
+++ trunk/boinc/debian/patches/003_use_sensible-browser.patch Wed May 30 12:56:36 2007
@@ -1,10 +1,10 @@
 This patch is Debian-specific. Don't use it for non Debian packages. The
 program "sensible-browser" is part of the essential package debianutils.
 
-Index: boinc-5.8.15/clientgui/hyperlink.cpp
+Index: boinc-5.10.0/clientgui/hyperlink.cpp
 ===================================================================
---- boinc-5.8.15.orig/clientgui/hyperlink.cpp	2007-03-16 18:07:18.000000000 +0100
-+++ boinc-5.8.15/clientgui/hyperlink.cpp	2007-03-16 18:08:16.000000000 +0100
+--- boinc-5.10.0.orig/clientgui/hyperlink.cpp	2006-10-27 12:26:56.000000000 +0200
++++ boinc-5.10.0/clientgui/hyperlink.cpp	2007-05-30 08:59:31.000000000 +0200
 @@ -171,7 +171,8 @@
  }
  

Modified: trunk/boinc/debian/patches/004_exclude_sea.patch
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/004_exclude_sea.patch?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/patches/004_exclude_sea.patch (original)
+++ trunk/boinc/debian/patches/004_exclude_sea.patch Wed May 30 12:56:36 2007
@@ -1,7 +1,7 @@
-Index: boinc-5.8.15/Makefile.am
+Index: boinc-5.10.0/Makefile.am
 ===================================================================
---- boinc-5.8.15.orig/Makefile.am	2007-03-16 18:07:17.000000000 +0100
-+++ boinc-5.8.15/Makefile.am	2007-03-16 18:08:16.000000000 +0100
+--- boinc-5.10.0.orig/Makefile.am	2006-08-31 23:16:36.000000000 +0200
++++ boinc-5.10.0/Makefile.am	2007-05-30 08:59:43.000000000 +0200
 @@ -17,7 +17,7 @@
  endif
  

Modified: trunk/boinc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/debian/patches/series?rev=656&op=diff
==============================================================================
--- trunk/boinc/debian/patches/series (original)
+++ trunk/boinc/debian/patches/series Wed May 30 12:56:36 2007
@@ -1,4 +1,3 @@
-001_amd64_disable_platform_reset.patch
+001_dont_install_ca-bundle.crt.patch
 003_use_sensible-browser.patch
 004_exclude_sea.patch
-101_gcc_4.3_fixes.patch




More information about the pkg-boinc-commits mailing list