[pkg-boinc-commits] r374 - in branches/experimental/boinc/debian: . manpages

Frank S. Thomas fst-guest at costa.debian.org
Tue Mar 7 16:22:47 UTC 2006


Author: fst-guest
Date: 2006-03-07 16:22:46 +0000 (Tue, 07 Mar 2006)
New Revision: 374

Modified:
   branches/experimental/boinc/debian/manpages/boinc_client.xml
   branches/experimental/boinc/debian/manpages/boinc_cmd.xml
   branches/experimental/boinc/debian/manpages/boincmgr.xml
   branches/experimental/boinc/debian/rules
Log:
Merged manpages and debian/rules with current trunk.


Modified: branches/experimental/boinc/debian/manpages/boinc_client.xml
===================================================================
--- branches/experimental/boinc/debian/manpages/boinc_client.xml	2006-03-07 00:48:55 UTC (rev 373)
+++ branches/experimental/boinc/debian/manpages/boinc_client.xml	2006-03-07 16:22:46 UTC (rev 374)
@@ -7,20 +7,17 @@
  Version 2 or any later version published by the Free Software Foundation.
 
  Copyright © 2004 Steffen Moeller
+             2005, 2006 Debian BOINC Maintainers
 -->
 
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "file:///usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd" [
 
   <!ENTITY dhgroupname "Debian BOINC Maintainers">
+  <!ENTITY dhgroupmail "<email>pkg-boinc-devel at lists.alioth.debian.org</email>">
   
-  <!ENTITY dhfirstname "<firstname>Steffen</firstname>">
-  <!ENTITY dhsurname   "<surname>Moeller</surname>">
-  <!ENTITY dhusername  "Steffen Moeller">
-  <!ENTITY dhemail     "<email>moeller at pzr.uni-rostock.de</email>">
-  
   <!ENTITY dhbinary    "boinc_client">
-  <!ENTITY dhdate      "<date>June 26, 2005</date>">
+  <!ENTITY dhdate      "<date>January 27, 2006</date>">
 
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
@@ -30,15 +27,28 @@
 <refentry>
   <refentryinfo>
     <address>
-      &dhemail;
+      &dhgroupmail;
     </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
+    <authorgroup>
+      <author>
+        <firstname>Steffen</firstname>
+        <lastname>Moeller</lastname>
+        <email>moeller at pzr.uni-rostock.de</email>
+      </author>
+
+      <author>
+        <firstname>Frank</firstname>
+        <lastname>Thomas</lastname>
+        <email>frank at thomas-alfeld.de</email>
+      </author>
+    </authorgroup>
     <copyright>
       <year>2004</year>
-      <holder>&dhusername;</holder>
+      <holder>Steffen Moeller</holder>
+      
+      <year>2005</year>
+      <year>2006</year>
+      <holder>&dhgroupname;</holder>
     </copyright>
     &dhdate;
   </refentryinfo>
@@ -177,6 +187,13 @@
           <para>use given dir as BOINC home</para>
         </listitem>
       </varlistentry>
+      
+      <varlistentry>
+        <term><option>-no_gui_rpc</option></term>
+        <listitem>
+          <para>don't allow GUI RPC, don't make socket</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
   </refsect1>
 
@@ -189,18 +206,16 @@
   
   <refsect1>
     <title>SEE ALSO</title>
-    <para><ulink url="http://setiweb.ssl.berkeley.edu"
-      >http://setiweb.ssl.berkeley.edu</ulink></para>
-    <para><ulink url="http://boinc.berkeley.edu"
-      >http://boinc.berkeley.edu</ulink></para>
+    <para><ulink url="http://boinc.berkeley.edu/client_unix.php"
+      >http://boinc.berkeley.edu/client_unix.php</ulink></para>
   </refsect1>
   
   <refsect1>
     <title>AUTHOR</title>
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for the
-      &debian; project (but may be used by others). Permission is granted to
-      copy, distribute and/or modify this document under the terms of the &gnu;
-      General Public License, Version 2 or any later version published by the
-      Free Software Foundation.</para>
+    <para>This manual page was written by the &dhgroupname;
+      &lt;&dhgroupmail;&gt; for the &debian; project (but may be used by
+      others). Permission is granted to copy, distribute and/or modify this
+      document under the terms of the &gnu; General Public License, Version 2
+      or any later version published by the Free Software Foundation.</para>
   </refsect1>
 </refentry>

Modified: branches/experimental/boinc/debian/manpages/boinc_cmd.xml
===================================================================
--- branches/experimental/boinc/debian/manpages/boinc_cmd.xml	2006-03-07 00:48:55 UTC (rev 373)
+++ branches/experimental/boinc/debian/manpages/boinc_cmd.xml	2006-03-07 16:22:46 UTC (rev 374)
@@ -7,19 +7,15 @@
  This file is licensed under the terms of the GNU General Public License,
  Version 2 or any later version published by the Free Software Foundation.
 
- Copyright © 2005-2006 Debian BOINC Maintainers
+ Copyright © 2005, 2006 Debian BOINC Maintainers
 -->
 
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "file:///usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd" [
 
-  <!ENTITY dhgroupname "Debian BOINC Maintainers">  
+  <!ENTITY dhgroupname "Debian BOINC Maintainers">
+  <!ENTITY dhgroupmail "<email>pkg-boinc-devel at lists.alioth.debian.org</email>">
 
-  <!ENTITY dhfirstname "<firstname>Frank</firstname>">
-  <!ENTITY dhsurname   "<surname>Thomas</surname>">
-  <!ENTITY dhusername  "Frank S. Thomas">
-  <!ENTITY dhemail     "<email>frank at thomas-alfeld.de</email>">
-
   <!ENTITY dhbinary    "boinc_cmd">
   <!ENTITY dhdate      "<date>January 20, 2006</date>">
 
@@ -31,14 +27,16 @@
 <refentry>
   <refentryinfo>
     <address>
-      &dhemail;
+      &dhgroupmail;
     </address>
     <author>
-      &dhfirstname;
-      &dhsurname;
+      <firstname>Frank</firstname>
+      <lastname>Thomas</lastname>
+      <email>frank at thomas-alfeld.de</email>
     </author>
     <copyright>
-      <year>2005-2006</year>
+      <year>2005</year>
+      <year>2006</year>
       <holder>&dhgroupname;</holder>
     </copyright>
     &dhdate;
@@ -78,6 +76,7 @@
 
   <refsect1>
     <title>OPTIONS</title>
+    <para></para>
 
     <variablelist>
       <varlistentry>
@@ -198,18 +197,25 @@
 
       <varlistentry>
         <term><option>--get_run_mode</option></term>
+        <listitem>
+          <para>Show current run mode.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
         <term>
           <option>--set_run_mode {always | auto | never}</option>
         </term>
+        <listitem>
+          <para>Set run mode.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>
-          <option>--get_network_mode</option>
-        </term>
+        <term><option>--get_network_mode</option></term>
+        <listitem>
+          <para>Show current network mode.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
@@ -234,12 +240,18 @@
         <term>
           <option>--get_messages <replaceable>seqno</replaceable></option>
         </term>
+        <listitem>
+          <para>Show messages with sequence numbers beyond
+            <replaceable>seqno</replaceable>.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term>
-          <option>--get_host_info</option>
-        </term>
+        <term><option>--get_host_info</option></term>
+        <listitem>
+          <para>Show system information about the host where the BOINC core
+            client is running.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>
@@ -330,10 +342,10 @@
 
   <refsect1>
     <title>AUTHOR</title>
-    <para>This manual page was written by &dhusername; for the &debian;
-      project (but may be used by others). Permission is granted to copy,
-      distribute and/or modify this document under the terms of the &gnu;
-      General Public License, Version 2 or any later version published 
-      by the Free Software Foundation.</para>
+    <para>This manual page was written by the &dhgroupname; 
+      &lt;&dhgroupmail;&gt; for the &debian; project (but may be used by
+      others). Permission is granted to copy, distribute and/or modify this
+      document under the terms of the &gnu; General Public License, Version 2
+      or any later version published by the Free Software Foundation.</para>
   </refsect1>
 </refentry>

Modified: branches/experimental/boinc/debian/manpages/boincmgr.xml
===================================================================
--- branches/experimental/boinc/debian/manpages/boincmgr.xml	2006-03-07 00:48:55 UTC (rev 373)
+++ branches/experimental/boinc/debian/manpages/boincmgr.xml	2006-03-07 16:22:46 UTC (rev 374)
@@ -7,21 +7,17 @@
  This file is licensed under the terms of the GNU General Public License,
  Version 2 or any later version published by the Free Software Foundation.
 
- Copyright © 2005 Debian BOINC Maintainers
+ Copyright © 2005, 2006 Debian BOINC Maintainers
 -->
 
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "file:///usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd" [
 
   <!ENTITY dhgroupname "Debian BOINC Maintainers">  
-  
-  <!ENTITY dhfirstname "<firstname>Frank</firstname>">
-  <!ENTITY dhsurname   "<surname>Thomas</surname>">
-  <!ENTITY dhusername  "Frank S. Thomas">
-  <!ENTITY dhemail     "<email>frank at thomas-alfeld.de</email>">
-  
+  <!ENTITY dhgroupmail "<email>pkg-boinc-devel at lists.alioth.debian.org</email>">
+
   <!ENTITY dhbinary    "boincmgr">
-  <!ENTITY dhdate      "<date>April 04, 2005</date>">
+  <!ENTITY dhdate      "<date>January 27, 2006</date>">
   
   <!ENTITY debian      "<productname>Debian</productname>">
   <!ENTITY gnu         "<acronym>GNU</acronym>">
@@ -31,14 +27,16 @@
 <refentry>
   <refentryinfo>
     <address>
-      &dhemail;
+      &dhgroupmail;
     </address>
     <author>
-      &dhfirstname;
-      &dhsurname;
+      <firstname>Frank</firstname>
+      <lastname>Thomas</lastname>
+      <email>frank at thomas-alfeld.de</email>
     </author>
     <copyright>
       <year>2005</year>
+      <year>2006</year>
       <holder>&dhgroupname;</holder>
     </copyright>
     &dhdate;
@@ -72,10 +70,7 @@
 
     <variablelist>
       <varlistentry>
-        <term>
-          <option>-h</option>,
-          <option>--help</option>
-        </term>
+        <term><option>-h, --help</option></term>
         <listitem>
           <para>Show all options.</para>
         </listitem>
@@ -89,10 +84,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term>
-          <option>-s</option>,
-          <option>--systray</option>
-        </term>
+        <term><option>-s, --systray</option></term>
         <listitem>
           <para>Startup BOINC Manager so only the system tray icon is
             visible.</para>
@@ -100,13 +92,19 @@
       </varlistentry>
     </variablelist>
   </refsect1>
-  
+
   <refsect1>
+    <title>SEE ALSO</title>
+    <para><ulink url="http://boinc.berkeley.edu/manager.php"
+      >http://boinc.berkeley.edu/manager.php</ulink></para>
+  </refsect1>
+
+  <refsect1>
     <title>AUTHOR</title>
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; project (but may be used by others). Permission is granted to
-      copy, distribute and/or modify this document under the terms of the &gnu;
-      General Public License, Version 2 or any later version published by the
-      Free Software Foundation.</para>
+    <para>This manual page was written by the &dhgroupname;
+      &lt;&dhgroupmail;&gt; for the &debian; project (but may be used by
+      others). Permission is granted to copy, distribute and/or modify this
+      document under the terms of the &gnu; General Public License, Version 2
+      or any later version published by the Free Software Foundation.</para>
   </refsect1>
 </refentry>

Modified: branches/experimental/boinc/debian/rules
===================================================================
--- branches/experimental/boinc/debian/rules	2006-03-07 00:48:55 UTC (rev 373)
+++ branches/experimental/boinc/debian/rules	2006-03-07 16:22:46 UTC (rev 374)
@@ -3,12 +3,24 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Include dpatch makefile.
 include /usr/share/dpatch/dpatch.make
 
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# Most BOINC projects only provide applications for i686.
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  TYPE_FLAGS = --build $(DEB_HOST_GNU_TYPE)
+else
+  TYPE_FLAGS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+# Most BOINC projects only provide their applications for i686-pc-linux-gnu.
+# If the core client reports that it was built for i486-pc-linux-gnu it won't
+# download any application or work units, so we use i686-linux-gnu as argument
+# for configure's --build and --host switches on i386 hosts.
+ifeq ($(DEB_HOST_GNU_TYPE), i486-linux-gnu)
+  DEB_HOST_GNU_TYPE = i686-linux-gnu
+endif
 ifeq ($(DEB_BUILD_GNU_TYPE), i486-linux-gnu)
   DEB_BUILD_GNU_TYPE = i686-linux-gnu
 endif
@@ -20,30 +32,30 @@
 CXXFLAGS_boinc-client := $(CXXFLAGS)
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  DEB_OPT_FLAG = -O0
-  DEB_OPT_FLAG_boinc-client = -O0
+  DEB_OPT_FLAGS = -O0
+  DEB_OPT_FLAGS_boinc-client = -O0
 else
-  DEB_OPT_FLAG = -O2
-  DEB_OPT_FLAG_boinc-client = -O3 -ffast-math
+  DEB_OPT_FLAGS = -O2
+  DEB_OPT_FLAGS_boinc-client = -O3 -ffast-math
 endif
 
-CFLAGS += $(DEB_OPT_FLAG)
-CXXFLAGS += $(DEB_OPT_FLAG)
+CFLAGS += $(DEB_OPT_FLAGS)
+CXXFLAGS += $(DEB_OPT_FLAGS)
 
-CFLAGS_boinc-client += $(DEB_OPT_FLAG_boinc-client)
-CXXFLAGS_boinc-client += $(DEB_OPT_FLAG_boinc-client)
+CFLAGS_boinc-client += $(DEB_OPT_FLAGS_boinc-client)
+CXXFLAGS_boinc-client += $(DEB_OPT_FLAGS_boinc-client)
 
 CFGFLAGS = \
-  --build=$(DEB_BUILD_GNU_TYPE) \
+  $(TYPE_FLAGS) \
   --prefix=/usr \
   --enable-client \
-  --enable-server \
+  --disable-server \
   --with-ssl \
   CFLAGS="$(CFLAGS)" \
   CXXFLAGS="$(CXXFLAGS)"
 
 CFGFLAGS_boinc-client = \
-  --build=$(DEB_BUILD_GNU_TYPE) \
+  $(TYPE_FLAGS) \
   --enable-client \
   --disable-server \
   --with-ssl \
@@ -53,7 +65,10 @@
 
 pre-build: patch pre-build-stamp
 pre-build-stamp:
+	cp -f /usr/share/misc/config.guess config.guess
+	cp -f /usr/share/misc/config.sub config.sub
 	aclocal-1.9 -I m4 && autoheader && automake-1.9 && autoconf
+	
 	docbook2x-man debian/manpages/boinc_applinks.xml
 	docbook2x-man debian/manpages/boinc_client.xml
 	docbook2x-man debian/manpages/boinc_cmd.xml
@@ -85,6 +100,12 @@
 	-$(MAKE) distclean
 	
 	dh_clean \
+	  client/boinc.unmodified \
+	  clientgui/boincmgr.unmodified \
+	  lib/boinccmd \
+	  lib/boinccmd.unmodified
+	
+	dh_clean \
 	  boinc_applinks.1 \
 	  boinc_client.1 \
 	  boinc_cmd.1 \
@@ -152,20 +173,6 @@
 # The en_US po file is actually a po template, thus the corresponding
 # "BOINC Manager.mo" is empty and useless. 
 	rm -rf debian/boinc-manager/usr/share/locale/en_US/
-	
-	#
-	# boinc-server
-	#
-	for i in debian/boinc-server/usr/lib/boinc-server/sched/*; do \
-	  dh_link -pboinc-server \
-	    usr/lib/boinc-server/sched/`basename $$i` \
-	    usr/share/boinc-server/sched/`basename $$i`; \
-	done;
-# Fix some file permissions.
-	chmod +x debian/boinc-server/usr/share/boinc-server/html/ops/db_update.php
-	chmod +x debian/boinc-server/usr/share/boinc-server/html/ops/watchdogs.php
-	chmod +x debian/boinc-server/usr/share/boinc-server/html/ops/wd_nresults_changing.php
-	chmod +x debian/boinc-server/usr/share/boinc-server/tools/watch_tcp
 
 binary-arch: build install-arch
 	dh_testdir -a
@@ -181,7 +188,6 @@
 	dh_strip -a
 	dh_compress -a
 	dh_fixperms -a
-	dh_python -a
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a




More information about the pkg-boinc-commits mailing list