[pkg-boinc-commits] r403 - in branches/experimental/boinc/debian: .
extra patches
Frank S. Thomas
fst-guest at costa.debian.org
Sat Apr 15 10:34:34 UTC 2006
Author: fst-guest
Date: 2006-04-15 10:34:33 +0000 (Sat, 15 Apr 2006)
New Revision: 403
Added:
branches/experimental/boinc/debian/extra/remote_hosts.cfg
branches/experimental/boinc/debian/patches/10_exclude-sea.dpatch
Modified:
branches/experimental/boinc/debian/boinc-client.README.Debian
branches/experimental/boinc/debian/boinc-client.init
branches/experimental/boinc/debian/boinc-client.install
branches/experimental/boinc/debian/boinc-client.links
branches/experimental/boinc/debian/boinc-client.postinst
branches/experimental/boinc/debian/changelog
branches/experimental/boinc/debian/control
branches/experimental/boinc/debian/patches/00list
branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch
Log:
Merged experimental branch with pkg-boinc/trunk/boinc, revision 399.
Modified: branches/experimental/boinc/debian/boinc-client.README.Debian
===================================================================
--- branches/experimental/boinc/debian/boinc-client.README.Debian 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/boinc-client.README.Debian 2006-04-15 10:34:33 UTC (rev 403)
@@ -50,5 +50,8 @@
% 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/experimental/boinc/debian/boinc-client.init
===================================================================
--- branches/experimental/boinc/debian/boinc-client.init 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/boinc-client.init 2006-04-15 10:34:33 UTC (rev 403)
@@ -38,7 +38,7 @@
fi
if [ ! -d "$BOINC_DIR" ]; then
- log_failure_msg "BOINC working directory '$BOINC_DIR' does not exist."
+ log_failure_msg "BOINC data directory '$BOINC_DIR' does not exist."
exit 3
fi
@@ -48,7 +48,7 @@
exit 7
fi
-PIDFILE=/var/run/boinc.pid
+PIDFILE=/var/run/boinc_client.pid
DESC="BOINC core client"
NAME=`basename $BOINC_CLIENT`
BOINC_OPTS="-redirectio -dir $BOINC_DIR $BOINC_OPTS"
Modified: branches/experimental/boinc/debian/boinc-client.install
===================================================================
--- branches/experimental/boinc/debian/boinc-client.install 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/boinc-client.install 2006-04-15 10:34:33 UTC (rev 403)
@@ -1,4 +1,5 @@
-debian/extra/gui_rpc_auth.cfg etc/boinc-client
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/extra/boinc_applinks usr/bin
debian/tmp/usr/bin/boinc_cmd usr/bin
Modified: branches/experimental/boinc/debian/boinc-client.links
===================================================================
--- branches/experimental/boinc/debian/boinc-client.links 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/boinc-client.links 2006-04-15 10:34:33 UTC (rev 403)
@@ -1,3 +1,2 @@
-etc/boinc-client/global_prefs_override.xml var/lib/boinc-client/global_prefs_override.xml
usr/bin/boinc_client usr/bin/boinc
usr/share/man/man1/boinc_client.1.gz usr/share/man/man1/boinc.1.gz
Modified: branches/experimental/boinc/debian/boinc-client.postinst
===================================================================
--- branches/experimental/boinc/debian/boinc-client.postinst 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/boinc-client.postinst 2006-04-15 10:34:33 UTC (rev 403)
@@ -4,7 +4,17 @@
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
@@ -17,15 +27,11 @@
mkdir $BOINC_DIR 2>/dev/null || true
chown boinc:boinc $BOINC_DIR 2>/dev/null || true
- # Move old gui_rpc_auth.cfg files to /etc/boinc-client/ and create
- # a symlink for the BOINC core client.
- if [ ! -L $BOINC_DIR/gui_rpc_auth.cfg -a \
- -f $BOINC_DIR/gui_rpc_auth.cfg ]; then
- mv -f $BOINC_DIR/gui_rpc_auth.cfg /etc/boinc-client/gui_rpc_auth.cfg
- fi
-
- ln -sf /etc/boinc-client/gui_rpc_auth.cfg $BOINC_DIR/gui_rpc_auth.cfg
- chown boinc:boinc $BOINC_DIR/gui_rpc_auth.cfg
+ # 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/experimental/boinc/debian/changelog
===================================================================
--- branches/experimental/boinc/debian/changelog 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/changelog 2006-04-15 10:34:33 UTC (rev 403)
@@ -1,21 +1,69 @@
-boinc (5.3.31-1) experimental; urgency=low
+boinc (5.4.3-1exp1) experimental; urgency=low
- * NOT RELEASED YET
- * New experimental upstream release.
-
[ Frank S. Thomas ]
- * debian/patches/:
- - Removed 01_amd64-gcc4-fixes.dpatch and 03_wx2.6-with-unicode.dpatch,
- these were included upstream.
- - Updated 07_use-sensible-browser.dpatch for the new upstream release.
+ * Synchronized with pkg-boinc/trunk/boinc, revision 399.
* Added the boinc_applinks tool that creates symlinks to "anonymous" BOINC
applications and their app_info.xml files in a given data directory.
The "anonymous" applications and their app_info.xml files are provided
by boinc-app-* packages (e.g.: boinc-app-seti).
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 23 Mar 2006 11:10:59 +0100
+
+boinc (5.4.3-1) unstable; urgency=low
+
+ [ Frank S. Thomas ]
+ * New upstream release.
+ - BOINC Manager: Allow a connection request to reset a connection attempt
+ to the local computer or another computer. Thanks to Zlatko Calusic for
+ the report. (closes: #360143)
+ * debian/control:
+ - Improved the short description of all three packages. Thanks to
+ Martin Schulze for his suggestions. (closes: #359332)
+ * debian/patches/:
+ - Removed 01_amd64-gcc4-fixes.dpatch, it was applied upstream.
+ - Updated 03_wx2.6-with-unicode.dpatch and 07_use-sensible-browser.dpatch
+ for the new upstream release.
+ * Added conffile /etc/boinc-client/global_prefs_override.xml which can be
+ used to edit preferences locally. For more information about this file,
+ see http://boinc.berkeley.edu/prefs_override.php
+ * Clarified and expanded the explanation of the -no_gui_rpc option in
+ boinc_client's manpage based on Steffen's suggestion. Thanks to
+ David Coe for the report. (closes: #362257)
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 13 Apr 2006 16:33:57 +0200
+
+boinc (5.2.15-3) unstable; urgency=low
+
+ [ Frank S. Thomas ]
+ * debian/rules:
+ - Call configure properly with the --build and --host switches as
+ described in autotools-dev's README.Debian.
+ - Remove *.unmodified binaries in the clean target, because those files
+ are not removed by make distclean. This is needed to rebuild the
+ packages in an already used source tree.
+ - Update config.guess and config.sub from the autotools-dev package to add
+ support for GNU/k*BSD.
+ * debian/patches/:
+ - Added 10_exclude-sea.dpatch to prevent building the self-extracting
+ archive, since we don't need it in any case and this fixes a FTBFS on
+ non-Linux hosts.
+ - Modified 03_wx2.6-with-unicode.dpatch to fix Alioth bug #303021.
+ Thanks to Steven Altermatt for the bug report.
+ * Fixed FTBFS with G++ 4.1, thanks to Martin Michlmayr. (closes: #358650)
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 23 Mar 2006 21:26:01 +0100
+
+boinc (5.2.15-2) unstable; urgency=low
+
+ * Uploaded to Debian (closes: #281890).
+
+ [ Frank S. Thomas ]
* Added boinc-manager.README.Debian to explain how to set the web browser
that the BOINC Manager uses.
+ * Added the conffile "remote_hosts.cfg" to "/etc/boinc-client/". Old files
+ are handled the same way as old "gui_rpc_auth.cfg" files.
- -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 23 Mar 2006 11:10:59 +0100
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 26 Jan 2006 19:25:20 +0100
boinc (5.2.15-1) experimental; urgency=low
@@ -150,7 +198,7 @@
* The "You are a credit junkie!" release.
* New upstream release.
-
+
[ Frank S. Thomas ]
* debian/rules:
- Set default C/C++ compiler flags to "-g -O3 -ffast-math".
Modified: branches/experimental/boinc/debian/control
===================================================================
--- branches/experimental/boinc/debian/control 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/control 2006-04-15 10:34:33 UTC (rev 403)
@@ -2,26 +2,26 @@
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>, Christoph Martin <christoph.martin at uni-mainz.de>, Greg Norris <adric at debian.org>
+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 (>= 5), dpatch, python, libmysqlclient15-dev, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.13.2), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), docbook2x, docbook-xml, dh-buildinfo
+Build-Depends: debhelper (>= 5), dpatch, python, libmysqlclient15-dev, zlib1g-dev, libssl-dev, libcurl3-openssl-dev (>= 7.13.2), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-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}, ${python:Depends}, adduser, lsb-base (>= 3.0-6)
Suggests: boinc-manager | 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.
.
+ 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-manager
@@ -29,21 +29,23 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: boinc-client
-Description: control and monitor utility for the BOINC core client
+Description: GUI to control and monitor the BOINC core client
The Berkeley Open Infrastructure for Network Computing (BOINC) is a
software platform for distributed computing using volunteered computer
resources.
.
This package contains the BOINC Manager, a graphical monitor and control
- utility for the BOINC core client.
+ utility for the BOINC core client. For active participation in any BOINC
+ project the recommended client package, not the manager, is required for
+ every machine contributing.
.
Homepage: http://boinc.berkeley.edu
Package: boinc-dev
Section: devel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev, libstdc++6-4.0-dev, libssl-dev, libmysqlclient15-dev
-Description: BOINC platform for distributed computing (development files)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev | libc-dev, libstdc++6-4.0-dev | libstdc++-dev, libssl-dev, libmysqlclient15-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.
Added: branches/experimental/boinc/debian/extra/remote_hosts.cfg
===================================================================
--- branches/experimental/boinc/debian/extra/remote_hosts.cfg 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/extra/remote_hosts.cfg 2006-04-15 10:34:33 UTC (rev 403)
@@ -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
Modified: branches/experimental/boinc/debian/patches/00list
===================================================================
--- branches/experimental/boinc/debian/patches/00list 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/patches/00list 2006-04-15 10:34:33 UTC (rev 403)
@@ -5,3 +5,4 @@
06_remove-python-shebang.dpatch
07_use-sensible-browser.dpatch
08_boinc-path-config.dpatch
+10_exclude-sea.dpatch
Modified: branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch
===================================================================
--- branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-04-15 10:34:33 UTC (rev 403)
@@ -8,9 +8,9 @@
## DP: we don't loose functionality here.
@DPATCH@
-diff -urNad boinc-5.3.27~/clientgui/hyperlink.cpp boinc-5.3.27/clientgui/hyperlink.cpp
---- boinc-5.3.27~/clientgui/hyperlink.cpp 2006-03-09 11:21:07.000000000 +0100
-+++ boinc-5.3.27/clientgui/hyperlink.cpp 2006-03-21 11:24:27.000000000 +0100
+diff -urNad boinc-5.4.1~/clientgui/hyperlink.cpp boinc-5.4.1/clientgui/hyperlink.cpp
+--- boinc-5.4.1~/clientgui/hyperlink.cpp 2006-03-09 11:21:07.000000000 +0100
++++ boinc-5.4.1/clientgui/hyperlink.cpp 2006-04-13 08:12:19.000000000 +0200
@@ -196,45 +196,9 @@
#if defined(__WXGTK__) || defined(__WXMOTIF__)
Added: branches/experimental/boinc/debian/patches/10_exclude-sea.dpatch
===================================================================
--- branches/experimental/boinc/debian/patches/10_exclude-sea.dpatch 2006-04-14 19:47:06 UTC (rev 402)
+++ branches/experimental/boinc/debian/patches/10_exclude-sea.dpatch 2006-04-15 10:34:33 UTC (rev 403)
@@ -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/experimental/boinc/debian/patches/10_exclude-sea.dpatch
___________________________________________________________________
Name: svn:executable
+ *
More information about the pkg-boinc-commits
mailing list