[pkg-boinc-commits] r400 - in branches/sarge/boinc/debian: . extra
patches
Frank S. Thomas
fst-guest at costa.debian.org
Fri Apr 14 15:25:49 UTC 2006
Author: fst-guest
Date: 2006-04-14 15:25:47 +0000 (Fri, 14 Apr 2006)
New Revision: 400
Added:
branches/sarge/boinc/debian/boinc-dev.links
branches/sarge/boinc/debian/extra/
branches/sarge/boinc/debian/extra/global_prefs_override.xml
branches/sarge/boinc/debian/extra/gui_rpc_auth.cfg
branches/sarge/boinc/debian/extra/remote_hosts.cfg
branches/sarge/boinc/debian/patches/
branches/sarge/boinc/debian/patches/00list
branches/sarge/boinc/debian/patches/01_add-assert-header.dpatch
branches/sarge/boinc/debian/patches/10_exclude-sea.dpatch
branches/sarge/boinc/debian/watch
Modified:
branches/sarge/boinc/debian/boinc-client.README.Debian
branches/sarge/boinc/debian/boinc-client.default
branches/sarge/boinc/debian/boinc-client.install
branches/sarge/boinc/debian/boinc-client.postinst
branches/sarge/boinc/debian/boinc-client.postrm
branches/sarge/boinc/debian/boinc-dev.install
branches/sarge/boinc/debian/changelog
branches/sarge/boinc/debian/control
branches/sarge/boinc/debian/rules
Log:
Synchronized the Sarge branch with pkg-boinc/trunk/boinc, revision 399.
Modified: branches/sarge/boinc/debian/boinc-client.README.Debian
===================================================================
--- branches/sarge/boinc/debian/boinc-client.README.Debian 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/boinc-client.README.Debian 2006-04-14 15:25:47 UTC (rev 400)
@@ -1,9 +1,9 @@
BOINC core client for Debian
============================
-This README file discusses some topics that are specific to Debian's default
-configuration of the BOINC core client. Additional information is available
-on the Debian Wiki:
+This README file discusses some topics that are specific to Debian's
+default configuration of the BOINC core client. Additional information
+is available on the Debian Wiki:
http://wiki.debian.org/BOINC
@@ -14,11 +14,12 @@
On Debian systems the BOINC core client is started by default after
boot by the '/etc/init.d/boinc-client' init script. In the default
configuration the BOINC core client uses '/var/lib/boinc-client' as
-BOINC home and for security reasons it is executed as the system user
-'boinc' which only has write access in the BOINC home directory.
+BOINC data directory and for security reasons it is executed as the
+system user 'boinc' which only has write access in the BOINC data
+directory.
Edit the file '/etc/default/boinc-client' to configure the init
-script, to change the BOINC home directory or the user used to execute
+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.
@@ -28,21 +29,29 @@
for more information.
-Moving a BOINC home directory to /var/lib/boinc-client
+Moving a BOINC data directory to /var/lib/boinc-client
------------------------------------------------------
-To move an existing BOINC home directory to Debian's default directory
+To move an existing BOINC data directory to Debian's default directory
follow these instructions:
1. Stop the BOINC core client:
- % /etc/init.d/boinc-client stop
+ % /etc/init.d/boinc-client stop
- 2. Copy the entire content of your old BOINC home directory to
+ 2. Copy the entire content of your old BOINC data directory to
'/var/lib/boinc-client'.
3. Make all files in that directory writeable by the user and group
boinc:
- % chown -R boinc:boinc /var/lib/boinc-client
+ % chown -R boinc:boinc /var/lib/boinc-client
- 4. Start the BOINC core client again:
- % /etc/init.d/boinc-client start
+ 4. Move configuration files to /etc/boinc-client/ and create symlinks
+ for the core client:
+ % mv -f /var/lib/boinc-client/gui_rpc_auth.cfg /etc/boinc-client/
+ % ln -s /etc/boinc-client/gui_rpc_auth.cfg /var/lib/boinc-client/gui_rpc_auth.cfg
+
+ Repeat the last step for the configuration files 'global_prefs_override.xml'
+ and 'remote_hosts.cfg' if they exist in your old BOINC data directory.
+
+ 5. Start the BOINC core client again:
+ % /etc/init.d/boinc-client start
Modified: branches/sarge/boinc/debian/boinc-client.default
===================================================================
--- branches/sarge/boinc/debian/boinc-client.default 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/boinc-client.default 2006-04-14 15:25:47 UTC (rev 400)
@@ -7,11 +7,11 @@
# The BOINC core client will be started with the permissions of this user.
BOINC_USER="boinc"
-# This is the working directory of the BOINC core client.
+# This is the data directory of the BOINC core client.
BOINC_DIR="/var/lib/boinc-client"
# This is the location of the BOINC core client, that the init script uses.
-# If you do not want use the client program provided by the boinc-client
+# If you do not want to use the client program provided by the boinc-client
# package, you can specify here an alternative client program.
#BOINC_CLIENT="/usr/local/bin/boinc_4.25"
BOINC_CLIENT="/usr/bin/boinc_client"
Modified: branches/sarge/boinc/debian/boinc-client.install
===================================================================
--- branches/sarge/boinc/debian/boinc-client.install 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/boinc-client.install 2006-04-14 15:25:47 UTC (rev 400)
@@ -1 +1,4 @@
+debian/extra/global_prefs_override.xml etc/boinc-client
+debian/extra/gui_rpc_auth.cfg etc/boinc-client
+debian/extra/remote_hosts.cfg etc/boinc-client
debian/tmp/usr/bin/boinc_cmd usr/bin
Modified: branches/sarge/boinc/debian/boinc-client.postinst
===================================================================
--- branches/sarge/boinc/debian/boinc-client.postinst 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/boinc-client.postinst 2006-04-14 15:25:47 UTC (rev 400)
@@ -4,27 +4,34 @@
set -e
BOINC_DIR=/var/lib/boinc-client
+CONF_DIR=/etc/boinc-client
+move_configfile_and_symlink()
+{
+ if [ ! -L $BOINC_DIR/$1 -a -f $BOINC_DIR/$1 ]; then
+ mv -f $BOINC_DIR/$1 $CONF_DIR/$1
+ fi
+ ln -sf $CONF_DIR/$1 $BOINC_DIR/$1
+ chown boinc:boinc $BOINC_DIR/$1
+}
+
case "$1" in
configure)
if ! getent passwd boinc >/dev/null; then
adduser --quiet --system --group --home $BOINC_DIR \
- --gecos "BOINC Core Client" boinc
+ --gecos "BOINC core client" boinc
fi
- # make sure the /var/lib/boinc-client dir exists and
- # is owned by the boinc user
+ # Make sure the /var/lib/boinc-client directory exists and
+ # is owned by the boinc user.
mkdir $BOINC_DIR 2>/dev/null || true
chown boinc:boinc $BOINC_DIR 2>/dev/null || true
-
- # If there is no gui_rpc_auth.cfg file create one and make it
- # readable by everyone. This allows every user on the same host
- # to control the boinc-client.
- if [ ! -f $BOINC_DIR/gui_rpc_auth.cfg ]; then
- touch $BOINC_DIR/gui_rpc_auth.cfg
- chown boinc:boinc $BOINC_DIR/gui_rpc_auth.cfg
- chmod 0664 $BOINC_DIR/gui_rpc_auth.cfg
- fi
+
+ # Move old configuration files to /etc/boinc-client/ and
+ # create symlinks for the BOINC core client.
+ move_configfile_and_symlink global_prefs_override.xml
+ move_configfile_and_symlink gui_rpc_auth.cfg
+ move_configfile_and_symlink remote_hosts.cfg
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: branches/sarge/boinc/debian/boinc-client.postrm
===================================================================
--- branches/sarge/boinc/debian/boinc-client.postrm 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/boinc-client.postrm 2006-04-14 15:25:47 UTC (rev 400)
@@ -3,12 +3,19 @@
set -e
+BOINC_DIR=/var/lib/boinc-client
+
case "$1" in
purge)
- rm -rf /var/lib/boinc-client
-
- deluser --quiet boinc 2>/dev/null || true
- delgroup --quiet boinc 2>/dev/null || true
+ if [ -d $BOINC_DIR ]; then
+ rm -r $BOINC_DIR
+ fi
+ if getent passwd boinc >/dev/null; then
+ deluser boinc
+ fi
+ if getent group boinc >/dev/null; then
+ delgroup boinc
+ fi
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
Modified: branches/sarge/boinc/debian/boinc-dev.install
===================================================================
--- branches/sarge/boinc/debian/boinc-dev.install 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/boinc-dev.install 2006-04-14 15:25:47 UTC (rev 400)
@@ -1,2 +1,8 @@
debian/tmp/usr/include/BOINC/* usr/include/BOINC
-debian/tmp/usr/lib/* usr/lib
+debian/tmp/usr/lib/lib* usr/lib
+
+api/graphics_data.h usr/include/BOINC/api
+api/reduce.h usr/include/BOINC/api
+lib/error_numbers.h usr/include/BOINC/lib
+lib/std_fixes.h usr/include/BOINC/lib
+Makefile.am usr/share/boinc-dev
Added: branches/sarge/boinc/debian/boinc-dev.links
===================================================================
--- branches/sarge/boinc/debian/boinc-dev.links 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/boinc-dev.links 2006-04-14 15:25:47 UTC (rev 400)
@@ -0,0 +1,30 @@
+usr/include/BOINC/boinc_api.h usr/share/boinc-dev/api/boinc_api.h
+usr/include/BOINC/graphics_api.h usr/share/boinc-dev/api/graphics_api.h
+usr/include/BOINC/graphics_impl.h usr/share/boinc-dev/api/graphics_impl.h
+usr/include/BOINC/graphics_lib.h usr/share/boinc-dev/api/graphics_lib.h
+usr/include/BOINC/gutil.h usr/share/boinc-dev/api/gutil.h
+usr/include/BOINC/app_ipc.h usr/share/boinc-dev/lib/app_ipc.h
+usr/include/BOINC/boinc_win.h usr/share/boinc-dev/lib/boinc_win.h
+usr/include/BOINC/crypt.h usr/share/boinc-dev/lib/crypt.h
+usr/include/BOINC/diagnostics.h usr/share/boinc-dev/lib/diagnostics.h
+usr/include/BOINC/exception.h usr/share/boinc-dev/lib/exception.h
+usr/include/BOINC/filesys.h usr/share/boinc-dev/lib/filesys.h
+usr/include/BOINC/hostinfo.h usr/share/boinc-dev/lib/hostinfo.h
+usr/include/BOINC/mfile.h usr/share/boinc-dev/lib/mfile.h
+usr/include/BOINC/miofile.h usr/share/boinc-dev/lib/miofile.h
+usr/include/BOINC/msg_log.h usr/share/boinc-dev/lib/msg_log.h
+usr/include/BOINC/parse.h usr/share/boinc-dev/lib/parse.h
+usr/include/BOINC/prefs.h usr/share/boinc-dev/lib/prefs.h
+usr/include/BOINC/proxy_info.h usr/share/boinc-dev/lib/proxy_info.h
+usr/include/BOINC/util.h usr/share/boinc-dev/lib/util.h
+
+usr/include/BOINC/api/graphics_data.h usr/share/boinc-dev/api/graphics_data.h
+usr/include/BOINC/api/reduce.h usr/share/boinc-dev/api/reduce.h
+usr/include/BOINC/lib/error_numbers.h usr/share/boinc-dev/lib/error_numbers.h
+usr/include/BOINC/lib/std_fixes.h usr/share/boinc-dev/lib/std_fixes.h
+
+usr/lib/libboinc.a usr/share/boinc-dev/lib/libboinc.a
+usr/lib/libboinc_api.a usr/share/boinc-dev/api/libboinc_api.a
+usr/lib/libboinc_graphics_api.a usr/share/boinc-dev/api/libboinc_graphics_api.a
+usr/lib/libboinc_graphics_impl.a usr/share/boinc-dev/api/libboinc_graphics_impl.a
+usr/lib/libboinc_graphics_lib.a usr/share/boinc-dev/api/libboinc_graphics_lib.a
Modified: branches/sarge/boinc/debian/changelog
===================================================================
--- branches/sarge/boinc/debian/changelog 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/changelog 2006-04-14 15:25:47 UTC (rev 400)
@@ -1,3 +1,14 @@
+boinc (5.4.3-1sarge1) stable; urgency=low
+
+ [ Frank S. Thomas ]
+ * New upstream release.
+ * Synchronized with pkg-boinc/trunk/boinc, revision 399.
+ * debian/patches/:
+ - Added 01_add-assert-header.dpatch which is needed to compile BOINC on
+ Sarge.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Fri, 14 Apr 2006 16:19:31 +0200
+
boinc (5.2.5-1sarge2) stable; urgency=low
[ Frank S. Thomas ]
@@ -23,6 +34,7 @@
boinc (5.2.4-2) experimental; urgency=low
+ [ Frank S. Thomas ]
* debian/patches/:
- Added 01_amd64-gcc4-fixes.dpatch again, it is still needed to compile
BOINC on AMD64.
@@ -131,7 +143,7 @@
- Added libxmu-dev and freeglut3-dev (instead of the virtual package
freeglut-dev) to Build-Depends. Both are needed for the graphical parts
of the BOINC API library.
-
+
-- Frank S. Thomas <frank at thomas-alfeld.de> Wed, 20 Jul 2005 23:54:37 +0200
boinc (4.70-1) experimental; urgency=low
@@ -190,7 +202,7 @@
* debian/rules:
- The BOINC_BUILD_TYPE environment variable can be used to specify
DEB_BUILD_GNU_TYPE in debian/rules. This is an interim solution for
- the "platform '...' not found" problem.
+ the "platform '...' not found" problem.
- Create symlinks of BOINC libraries and header files under
/usr/share/boinc/ in the boinc-dev package.
@@ -216,7 +228,7 @@
are now created with the docbook2x-man tool.
* debian/control:
- Added build dependences on libmysqlclient-dev, freeglut-dev,
- libwxgtk2.4-dev and docbook2x.
+ libwxgtk2.4-dev and docbook2x.
- Added build conflict with automake1.4.
- Changed section from "science" to "net" (boinc-client), "x11" (boinc-gui)
and "devel" (boinc-dev).
@@ -227,7 +239,7 @@
* New upstream release.
* Cleaned up the debian directory and rewrote debian/rules for cdbs.
-
+
-- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 27 Jan 2005 15:51:54 +0100
boinc (4.18-1) experimental; urgency=low
Modified: branches/sarge/boinc/debian/control
===================================================================
--- branches/sarge/boinc/debian/control 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/control 2006-04-14 15:25:47 UTC (rev 400)
@@ -2,38 +2,38 @@
Section: net
Priority: optional
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
-Uploaders: Steffen Moeller <moeller at inb.uni-luebeck.de>, Frank S. Thomas <frank at thomas-alfeld.de>
+Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <frank at thomas-alfeld.de>, Christoph Martin <christoph.martin at uni-mainz.de>, Greg Norris <adric at debian.org>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.2.21), dpatch, python, libmysqlclient14-dev, zlib1g-dev, libssl-dev, libcurl3-dev (>= 7.13.2), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), docbook2x, docbook-xml
+Build-Depends: debhelper (>= 4.2.21), dpatch, libmysqlclient14-dev, zlib1g-dev, libssl-dev, libcurl3-dev (>= 7.13.2), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), autotools-dev, docbook2x, docbook-xml, dh-buildinfo
Package: boinc-client
Section: net
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
Suggests: kboincspy
-Description: BOINC core client
- This package contains the BOINC core client program, that is required to
- participate in any project that uses BOINC.
- .
+Description: core client for the BOINC distributed computing infrastructure
The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing. A central server
- distributes work units and collects results via this client.
- When attaching a local machine to a project, this client will also
- dynamically download the projects application's program to be then
- wrapped by the BOINC core client.
+ software platform for distributed computing.
.
- Homepage: http://boinc.berkeley.edu
+ This package contains the BOINC core client program that is required to
+ participate in any project that uses BOINC. A central server distributes
+ work units and collects results via this client. When attaching a
+ local machine to a project, this client will also dynamically download
+ the projects application's program to be then wrapped by the BOINC
+ core client.
+ .
+ Homepage: http://boinc.berkeley.edu
Package: boinc-dev
Section: devel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev, libstdc++6-dev, libssl-dev, libmysqlclient14-dev
-Description: BOINC development files
+Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev | libc-dev, libstdc++6-dev | libstdc++-dev, libssl-dev, libmysqlclient14-dev
+Description: development files to build applications for BOINC projects
The Berkeley Open Infrastructure for Network Computing (BOINC) is a
software platform for distributed computing using volunteered computer
resources.
.
- This package contains static libraries and header files needed to develop
- and compile applications which utilize the BOINC infrastructure.
+ This package contains header files and static libraries that are needed
+ to develop and compile applications which utilizes the BOINC infrastructure.
.
- Homepage: http://boinc.berkeley.edu
+ Homepage: http://boinc.berkeley.edu
Added: branches/sarge/boinc/debian/extra/global_prefs_override.xml
===================================================================
--- branches/sarge/boinc/debian/extra/global_prefs_override.xml 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/extra/global_prefs_override.xml 2006-04-14 15:25:47 UTC (rev 400)
@@ -0,0 +1,2 @@
+<global_preferences>
+</global_preferences>
Added: branches/sarge/boinc/debian/extra/gui_rpc_auth.cfg
===================================================================
--- branches/sarge/boinc/debian/extra/gui_rpc_auth.cfg 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/extra/gui_rpc_auth.cfg 2006-04-14 15:25:47 UTC (rev 400)
@@ -0,0 +1 @@
+
Added: branches/sarge/boinc/debian/extra/remote_hosts.cfg
===================================================================
--- branches/sarge/boinc/debian/extra/remote_hosts.cfg 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/extra/remote_hosts.cfg 2006-04-14 15:25:47 UTC (rev 400)
@@ -0,0 +1,7 @@
+# This file contains a list of hostnames or IP addresses (one per line)
+# of remote hosts, that are allowed to connect and to control the local
+# BOINC core client via GUI RPCs.
+# Lines beginning with a # or a ; will be ignored.
+#
+#host.example.com
+#192.168.0.180
Added: branches/sarge/boinc/debian/patches/00list
===================================================================
--- branches/sarge/boinc/debian/patches/00list 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/patches/00list 2006-04-14 15:25:47 UTC (rev 400)
@@ -0,0 +1,2 @@
+01_add-assert-header.dpatch
+10_exclude-sea.dpatch
Added: branches/sarge/boinc/debian/patches/01_add-assert-header.dpatch
===================================================================
--- branches/sarge/boinc/debian/patches/01_add-assert-header.dpatch 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/patches/01_add-assert-header.dpatch 2006-04-14 15:25:47 UTC (rev 400)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## add-assert-header.dpatch by Frank S. Thomas <frank at thomas-alfeld.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad boinc-5.4.3~/client/cpu_sched.C boinc-5.4.3/client/cpu_sched.C
+--- boinc-5.4.3~/client/cpu_sched.C 2006-04-05 07:50:34.000000000 +0200
++++ boinc-5.4.3/client/cpu_sched.C 2006-04-14 17:07:32.000000000 +0200
+@@ -20,6 +20,8 @@
+ #include "client_msgs.h"
+ #include "client_state.h"
+
++#include <assert.h>
++
+ using std::vector;
+
+ #define MAX_DEBT (86400)
Property changes on: branches/sarge/boinc/debian/patches/01_add-assert-header.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/sarge/boinc/debian/patches/10_exclude-sea.dpatch
===================================================================
--- branches/sarge/boinc/debian/patches/10_exclude-sea.dpatch 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/patches/10_exclude-sea.dpatch 2006-04-14 15:25:47 UTC (rev 400)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_exclude-sea.dpatch by Frank S. Thomas <frank at thomas-alfeld.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+
+diff -Naur boinc-5.2.15.orig/Makefile.am boinc-5.2.15/Makefile.am
+--- boinc-5.2.15.orig/Makefile.am 2005-09-30 02:19:38.000000000 +0200
++++ boinc-5.2.15/Makefile.am 2006-03-21 19:03:49.000000000 +0100
+@@ -17,7 +17,7 @@
+ endif
+
+ if BUILD_CLIENTGUI
+- CLIENTGUI_SUBDIRS = clientgui sea
++ CLIENTGUI_SUBDIRS = clientgui
+ endif
+
+ # ORDER MATTERS below. One must build dependencies FIRST, then things
Property changes on: branches/sarge/boinc/debian/patches/10_exclude-sea.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/sarge/boinc/debian/rules
===================================================================
--- branches/sarge/boinc/debian/rules 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/rules 2006-04-14 15:25:47 UTC (rev 400)
@@ -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 i386-pc-linux-gnu it won't
+# download any application or work units, so we use i686-linux as argument
+# for configure's --build and --host switches on i386 hosts.
+ifeq ($(DEB_HOST_GNU_TYPE), i386-linux)
+ DEB_HOST_GNU_TYPE = i686-linux
+endif
ifeq ($(DEB_BUILD_GNU_TYPE), i386-linux)
DEB_BUILD_GNU_TYPE = i686-linux
endif
@@ -20,31 +32,31 @@
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 \
--without-wx-config \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
CFGFLAGS_boinc-client = \
- --build=$(DEB_BUILD_GNU_TYPE) \
+ $(TYPE_FLAGS) \
--enable-client \
--disable-server \
--with-ssl \
@@ -54,7 +66,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_client.xml
docbook2x-man debian/manpages/boinc_cmd.xml
touch $@
@@ -84,6 +99,11 @@
-$(MAKE) distclean
dh_clean \
+ client/boinc.unmodified \
+ lib/boinccmd \
+ lib/boinccmd.unmodified
+
+ dh_clean \
boinc_client.1 \
boinc_cmd.1
@@ -117,7 +137,7 @@
rm -f build-stamp-boinc-client
dh_clean client/boinc_client.optimized
-install: install-indep install-arch
+install: install-arch
install-arch: build
dh_testdir
dh_testroot
@@ -142,6 +162,7 @@
dh_installmenu -a
dh_installinit -a
dh_installman -a
+ dh_buildinfo -a
dh_link -a
dh_strip -a
dh_compress -a
@@ -152,6 +173,6 @@
dh_md5sums -a
dh_builddeb -a
-binary: binary-indep binary-arch
-.PHONY: build clean clean-patched binary-indep binary-arch binary install \
- install-indep install-arch patch unpatch
+binary: binary-arch
+.PHONY: build clean clean-patched binary-arch binary install install-arch \
+ patch unpatch
Added: branches/sarge/boinc/debian/watch
===================================================================
--- branches/sarge/boinc/debian/watch 2006-04-14 13:30:24 UTC (rev 399)
+++ branches/sarge/boinc/debian/watch 2006-04-14 15:25:47 UTC (rev 400)
@@ -0,0 +1,2 @@
+version=3
+http://boinc.berkeley.edu/source/nightly/boinc-cvs-([0-9-]+)\.tar\.gz
More information about the pkg-boinc-commits
mailing list