[pkg-boinc-commits] r401 - in branches/breezy/boinc/debian: . extra
patches
Frank S. Thomas
fst-guest at costa.debian.org
Fri Apr 14 19:41:28 UTC 2006
Author: fst-guest
Date: 2006-04-14 19:41:25 +0000 (Fri, 14 Apr 2006)
New Revision: 401
Added:
branches/breezy/boinc/debian/boinc-dev.links
branches/breezy/boinc/debian/boinc-manager.README.Debian
branches/breezy/boinc/debian/extra/
branches/breezy/boinc/debian/extra/global_prefs_override.xml
branches/breezy/boinc/debian/extra/gui_rpc_auth.cfg
branches/breezy/boinc/debian/extra/remote_hosts.cfg
branches/breezy/boinc/debian/patches/07_use-sensible-browser.dpatch
branches/breezy/boinc/debian/patches/10_exclude-sea.dpatch
Removed:
branches/breezy/boinc/debian/boinc-server.install
branches/breezy/boinc/debian/boinc-server.links
branches/breezy/boinc/debian/patches/01_amd64-gcc4-fixes.dpatch
branches/breezy/boinc/debian/patches/04_sched-makefile.am.dpatch
branches/breezy/boinc/debian/patches/05_correct-php-shebang.dpatch
branches/breezy/boinc/debian/patches/06_remove-python-shebang.dpatch
Modified:
branches/breezy/boinc/debian/boinc-client.README.Debian
branches/breezy/boinc/debian/boinc-client.default
branches/breezy/boinc/debian/boinc-client.install
branches/breezy/boinc/debian/boinc-client.postinst
branches/breezy/boinc/debian/boinc-client.postrm
branches/breezy/boinc/debian/boinc-dev.install
branches/breezy/boinc/debian/boinc-manager.desktop
branches/breezy/boinc/debian/changelog
branches/breezy/boinc/debian/control
branches/breezy/boinc/debian/patches/00list
branches/breezy/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
branches/breezy/boinc/debian/rules
Log:
Synchronized Breezy branch with the current trunk.
Modified: branches/breezy/boinc/debian/boinc-client.README.Debian
===================================================================
--- branches/breezy/boinc/debian/boinc-client.README.Debian 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-client.README.Debian 2006-04-14 19:41:25 UTC (rev 401)
@@ -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/breezy/boinc/debian/boinc-client.default
===================================================================
--- branches/breezy/boinc/debian/boinc-client.default 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-client.default 2006-04-14 19:41:25 UTC (rev 401)
@@ -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/breezy/boinc/debian/boinc-client.install
===================================================================
--- branches/breezy/boinc/debian/boinc-client.install 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-client.install 2006-04-14 19:41:25 UTC (rev 401)
@@ -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/breezy/boinc/debian/boinc-client.postinst
===================================================================
--- branches/breezy/boinc/debian/boinc-client.postinst 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-client.postinst 2006-04-14 19:41:25 UTC (rev 401)
@@ -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/breezy/boinc/debian/boinc-client.postrm
===================================================================
--- branches/breezy/boinc/debian/boinc-client.postrm 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-client.postrm 2006-04-14 19:41:25 UTC (rev 401)
@@ -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/breezy/boinc/debian/boinc-dev.install
===================================================================
--- branches/breezy/boinc/debian/boinc-dev.install 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-dev.install 2006-04-14 19:41:25 UTC (rev 401)
@@ -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/breezy/boinc/debian/boinc-dev.links
===================================================================
--- branches/breezy/boinc/debian/boinc-dev.links 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-dev.links 2006-04-14 19:41:25 UTC (rev 401)
@@ -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
Added: branches/breezy/boinc/debian/boinc-manager.README.Debian
===================================================================
--- branches/breezy/boinc/debian/boinc-manager.README.Debian 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-manager.README.Debian 2006-04-14 19:41:25 UTC (rev 401)
@@ -0,0 +1,20 @@
+BOINC Manager for Debian
+========================
+
+This README file discusses some topics that are specific to Debian's
+version of the BOINC Manager. Additional information is available on
+the Debian Wiki:
+
+ http://wiki.debian.org/BOINC
+
+
+Setting the default web browser
+-------------------------------
+
+Debian's BOINC Manager uses a more reliable way to determine the web
+browser by using the sensible-browser program. To change the default
+web browser, run as root:
+
+ % update-alternatives --config x-www-browser
+
+and select your favorite.
Modified: branches/breezy/boinc/debian/boinc-manager.desktop
===================================================================
--- branches/breezy/boinc/debian/boinc-manager.desktop 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-manager.desktop 2006-04-14 19:41:25 UTC (rev 401)
@@ -2,6 +2,7 @@
Type=Application
Encoding=UTF-8
Exec=/usr/bin/boincmgr
+Path=/var/lib/boinc-client
Icon=boincmgr-32.xpm
Categories=Monitor;Utility;GTK
Name=BOINC Manager
Deleted: branches/breezy/boinc/debian/boinc-server.install
===================================================================
--- branches/breezy/boinc/debian/boinc-server.install 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-server.install 2006-04-14 19:41:25 UTC (rev 401)
@@ -1,27 +0,0 @@
-debian/tmp/usr/bin/1sec usr/lib/boinc-server/bin
-debian/tmp/usr/bin/concat usr/lib/boinc-server/bin
-debian/tmp/usr/bin/upper_case usr/lib/boinc-server/bin
-debian/tmp/usr/bin/crypt_prog usr/lib/boinc-server/bin
-debian/tmp/usr/bin/create_work usr/lib/boinc-server/bin
-debian/tmp/usr/bin/dir_hier_move usr/lib/boinc-server/bin
-debian/tmp/usr/bin/dir_hier_path usr/lib/boinc-server/bin
-debian/tmp/usr/bin/sign_executable usr/lib/boinc-server/bin
-debian/tmp/usr/bin/start usr/share/boinc-server/bin
-debian/tmp/usr/lib/BOINC/sched usr/lib/boinc-server
-db/*.sql usr/share/boinc-server/db
-html/inc usr/share/boinc-server/html
-html/languages usr/share/boinc-server/html
-html/ops usr/share/boinc-server/html
-html/project.sample usr/share/boinc-server/html
-html/user usr/share/boinc-server/html
-py/Boinc/*.py usr/lib/python2.3/site-packages/Boinc
-tools/add usr/share/boinc-server/tools
-tools/db_query usr/share/boinc-server/tools
-tools/dbcheck_files_exist usr/share/boinc-server/tools
-tools/grep_logs usr/share/boinc-server/tools
-tools/make_project usr/share/boinc-server/tools
-tools/parse_config usr/share/boinc-server/tools
-tools/update_versions usr/share/boinc-server/tools
-tools/upgrade usr/share/boinc-server/tools
-tools/watch_tcp usr/share/boinc-server/tools
-tools/xadd usr/share/boinc-server/tools
Deleted: branches/breezy/boinc/debian/boinc-server.links
===================================================================
--- branches/breezy/boinc/debian/boinc-server.links 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/boinc-server.links 2006-04-14 19:41:25 UTC (rev 401)
@@ -1,11 +0,0 @@
-usr/lib/boinc-server/bin/1sec usr/share/boinc-server/bin/1sec
-usr/lib/boinc-server/bin/concat usr/share/boinc-server/bin/concat
-usr/lib/boinc-server/bin/create_work usr/share/boinc-server/bin/create_work
-usr/lib/boinc-server/bin/crypt_prog usr/share/boinc-server/bin/crypt_prog
-usr/lib/boinc-server/bin/dir_hier_move usr/share/boinc-server/bin/dir_hier_move
-usr/lib/boinc-server/bin/dir_hier_path usr/share/boinc-server/bin/dir_hier_path
-usr/lib/boinc-server/bin/sign_executable usr/share/boinc-server/bin/sign_executable
-usr/lib/boinc-server/bin/upper_case usr/share/boinc-server/bin/upper_case
-usr/lib/boinc-server/sched usr/share/boinc-server/sched
-usr/share/boinc-server/bin/start usr/share/boinc-server/bin/status
-usr/share/boinc-server/bin/start usr/share/boinc-server/bin/stop
Modified: branches/breezy/boinc/debian/changelog
===================================================================
--- branches/breezy/boinc/debian/changelog 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/changelog 2006-04-14 19:41:25 UTC (rev 401)
@@ -1,3 +1,98 @@
+boinc (5.4.3-1ubuntu1) breezy; urgency=low
+
+ [ Frank S. Thomas ]
+ * Synchronized with pkg-boinc/trunk/boinc, revision 399.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Fri, 14 Apr 2006 21:36:37 +0200
+
+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, 26 Jan 2006 19:25:20 +0100
+
+boinc (5.2.15-1) experimental; urgency=low
+
+ * New upstream release.
+
+ [ Frank S. Thomas ]
+ * debian/patches/:
+ - Added 07_use-sensible-browser.dpatch. The BOINC Manager now uses
+ "sensible-browser", which is part of the debianutils package, as
+ fallback if wxWidgets' method to determine the default browser fails.
+ Thanks to Olek Wojnar for the report and his helpful investigations.
+ * debian/boinc-client.postrm:
+ - Be more verbose when removing the "boinc" user/group.
+ * debian/boinc-manager.desktop:
+ - Added "Path: /var/lib/boinc-client" so that the BOINC Manager can find
+ the "gui_rpc_auth.cfg" file and does not ask for a password. This should
+ be removed when the BOINC Manager is able to store passwords in its
+ config file.
+ * debian/control:
+ - Added an extra space before the "Homepage" pseudo field according to the
+ Developer's Reference, Section 6.2.4.
+ - Added Christoph Martin <christoph.martin at uni-mainz.de> and
+ Greg Norris <adric at debian.org> to Uploaders.
+ * debian/copyright:
+ - Added more copyright and license information for various files.
+ * Created symlinks of headers and static libraries, which are required to
+ build the SETI at home application, in "/usr/share/boinc-dev/".
+ * Ship a default "gui_rpc_auth.cfg" file in "/etc/boinc-client/" and create
+ a symlink in "/var/lib/boinc-client" to this file. Old "gui_rpc_auth.cfg"
+ files are moved to "/etc/boinc-client/" before creating the symlink.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Mon, 9 Jan 2006 18:16:41 +0100
+
boinc (5.2.13a-1ubuntu1) breezy; urgency=low
[ Frank S. Thomas ]
@@ -13,7 +108,7 @@
boinc (5.2.13a-1) experimental; urgency=low
* New upstream release.
-
+
[ Frank S. Thomas ]
* debian/patches/:
- Updated 01_amd64-gcc4-fixes.dpatch for the new release.
@@ -62,12 +157,12 @@
- Use a versioned dependency for lsb-base (>= 3.0-6) to ensure that the
log_progress_msg function is available. (fixes: Alioth bug #302179)
* debian/copyright:
- - Added copyright and license informations for various PHP libraries
+ - Added copyright and license information for various PHP libraries
found in html/inc/.
- Added the full text of the Mozilla Public License 1.0 since stripchart
is distributed under the MPL.
- - Removed RSAEuro and GLUT copyright and license informations since this
- code was removed upstream.
+ - Removed RSAEuro and GLUT copyright and license information since this
+ code was removed upstream.
* debian/rules:
- Rewrote debian/rules without CDBS. CFLAGS and CXXFLAGS are now forwarded
to the build process.
@@ -144,7 +239,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
@@ -203,7 +298,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.
@@ -229,7 +324,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).
@@ -240,7 +335,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/breezy/boinc/debian/control
===================================================================
--- branches/breezy/boinc/debian/control 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/control 2006-04-14 19:41:25 UTC (rev 401)
@@ -2,67 +2,55 @@
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, libwxgtk2.6-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), docbook2x, docbook-xml, dh-buildinfo
+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, 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}, adduser, lsb-base
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.
.
- 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-manager
Section: x11
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 monitoring utility
- for the BOINC core client.
+ This package contains the BOINC Manager, a graphical monitor and control
+ 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
+ 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, libmysqlclient14-dev
-Description: BOINC development files
+Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev | libc-dev, libstdc++6-4.0-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
-
-#Package: boinc-server
-#Section: net
-#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python2.3-mysqldb, mysql-server-4.1 | virtual-mysql-server, apache2 | httpd-cgi, php4 | php5, php4-cli | php5-cli, php4-mysql | php5-mysql
-#Description: BOINC server applications and data files
-# The Berkeley Open Infrastructure for Network Computing (BOINC) is a
-# software platform for distributed computing using volunteered computer
-# resources.
-# .
-# This package contains the daemons and tools to create and run BOINC
-# projects.
-# .
-# Homepage: http://boinc.berkeley.edu
+ Homepage: http://boinc.berkeley.edu
Added: branches/breezy/boinc/debian/extra/global_prefs_override.xml
===================================================================
--- branches/breezy/boinc/debian/extra/global_prefs_override.xml 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/extra/global_prefs_override.xml 2006-04-14 19:41:25 UTC (rev 401)
@@ -0,0 +1,2 @@
+<global_preferences>
+</global_preferences>
Added: branches/breezy/boinc/debian/extra/gui_rpc_auth.cfg
===================================================================
--- branches/breezy/boinc/debian/extra/gui_rpc_auth.cfg 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/extra/gui_rpc_auth.cfg 2006-04-14 19:41:25 UTC (rev 401)
@@ -0,0 +1 @@
+
Added: branches/breezy/boinc/debian/extra/remote_hosts.cfg
===================================================================
--- branches/breezy/boinc/debian/extra/remote_hosts.cfg 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/extra/remote_hosts.cfg 2006-04-14 19:41:25 UTC (rev 401)
@@ -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/breezy/boinc/debian/patches/00list
===================================================================
--- branches/breezy/boinc/debian/patches/00list 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/patches/00list 2006-04-14 19:41:25 UTC (rev 401)
@@ -1,6 +1,4 @@
-01_amd64-gcc4-fixes.dpatch
02_wx2.6-configure.ac.dpatch
03_wx2.6-with-unicode.dpatch
-04_sched-makefile.am.dpatch
-05_correct-php-shebang.dpatch
-06_remove-python-shebang.dpatch
+07_use-sensible-browser.dpatch
+10_exclude-sea.dpatch
Deleted: branches/breezy/boinc/debian/patches/01_amd64-gcc4-fixes.dpatch
===================================================================
--- branches/breezy/boinc/debian/patches/01_amd64-gcc4-fixes.dpatch 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/patches/01_amd64-gcc4-fixes.dpatch 2006-04-14 19:41:25 UTC (rev 401)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_amd64-gcc4-fixes.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@
-
---- boinc-5.2.13a.orig/lib/shmem.C 2005-07-23 10:10:39.000000000 +0200
-+++ boinc-5.2.13a/lib/shmem.C 2005-12-01 02:21:14.000000000 +0100
-@@ -129,7 +129,7 @@
- return ERR_SHMGET;
- }
- p = shmat(id, 0, 0);
-- if ((int)p == -1) {
-+ if ((long)p == -1) {
- return ERR_SHMAT;
- }
- *pp = p;
Modified: branches/breezy/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
===================================================================
--- branches/breezy/boinc/debian/patches/03_wx2.6-with-unicode.dpatch 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/patches/03_wx2.6-with-unicode.dpatch 2006-04-14 19:41:25 UTC (rev 401)
@@ -5,878 +5,15 @@
## DP: No description.
@DPATCH@
-
-diff -Naur boinc-5.2.13a.orig/clientgui/AccountManagerProcessingPage.cpp boinc-5.2.13a/clientgui/AccountManagerProcessingPage.cpp
---- boinc-5.2.13a.orig/clientgui/AccountManagerProcessingPage.cpp 2005-10-04 01:14:15.000000000 +0200
-+++ boinc-5.2.13a/clientgui/AccountManagerProcessingPage.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -215,9 +215,9 @@
- break;
- case ATTACHACCTMGR_ATTACHACCTMGR_EXECUTE:
- // Attempt to attach to the accout manager.
-- url = ((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL().c_str();
-- username = ((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-- password = ((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountPassword().c_str();
-+ url = (const char*)((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL().mb_str();
-+ username = (const char*)((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
-+ password = (const char*)((CWizardAccountManager*)GetParent())->m_AccountInfoPage->GetAccountPassword().mb_str();
- pDoc->rpc.acct_mgr_rpc(
- url.c_str(),
- username.c_str(),
-@@ -257,7 +257,7 @@
- } else {
- strBuffer = ((CWizardAccountManager*)GetParent())->m_CompletionErrorPage->m_ServerMessages->GetLabel();
- for (i=0; i<reply.messages.size(); i++) {
-- strBuffer += wxString(reply.messages[i].c_str()) + wxString(wxT("\n"));
-+ strBuffer += wxString(reply.messages[i].c_str(), wxConvUTF8) + wxString(wxT("\n"));
- }
- ((CWizardAccountManager*)GetParent())->m_CompletionErrorPage->m_ServerMessages->SetLabel(strBuffer);
- }
-diff -Naur boinc-5.2.13a.orig/clientgui/AccountManagerPropertiesPage.cpp boinc-5.2.13a/clientgui/AccountManagerPropertiesPage.cpp
---- boinc-5.2.13a.orig/clientgui/AccountManagerPropertiesPage.cpp 2005-11-29 09:06:44.000000000 +0100
-+++ boinc-5.2.13a/clientgui/AccountManagerPropertiesPage.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -217,7 +217,7 @@
- case ACCTMGRPROP_RETRPROJECTPROPERTIES_EXECUTE:
- // Attempt to retrieve the project's account creation policies
- pDoc->rpc.get_project_config(
-- ((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL().c_str()
-+ (const char*)((CWizardAccountManager*)GetParent())->m_AccountManagerInfoPage->GetProjectURL().mb_str()
- );
-
- // Wait until we are done processing the request.
-diff -Naur boinc-5.2.13a.orig/clientgui/BOINCBaseView.cpp boinc-5.2.13a/clientgui/BOINCBaseView.cpp
---- boinc-5.2.13a.orig/clientgui/BOINCBaseView.cpp 2005-09-30 11:00:47.000000000 +0200
-+++ boinc-5.2.13a/clientgui/BOINCBaseView.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -279,7 +279,7 @@
- wxString CBOINCBaseView::OnListGetItemText(
- long WXUNUSED(item), long WXUNUSED(column)
- ) const {
-- return wxString("Undefined");
-+ return wxString(wxT("Undefined"));
- }
-
-
-@@ -299,17 +299,17 @@
-
-
- wxString CBOINCBaseView::OnDocGetItemText(long WXUNUSED(item), long WXUNUSED(column)) const {
-- return wxString("Undefined");
-+ return wxString(wxT("Undefined"));
- }
-
-
- wxString CBOINCBaseView::OnDocGetItemImage(long WXUNUSED(item)) const {
-- return wxString("Undefined");
-+ return wxString(wxT("Undefined"));
- }
-
-
- wxString CBOINCBaseView::OnDocGetItemAttr(long WXUNUSED(item)) const {
-- return wxString("Undefined");
-+ return wxString(wxT("Undefined"));
- }
-
-
-@@ -414,7 +414,7 @@
- if (existing.size() == 0) {
- existing = additional;
- } else {
-- existing = existing + ", " + additional;
-+ existing = existing + wxT(", ") + additional;
- }
- }
-
-diff -Naur boinc-5.2.13a.orig/clientgui/BOINCGUIApp.cpp boinc-5.2.13a/clientgui/BOINCGUIApp.cpp
---- boinc-5.2.13a.orig/clientgui/BOINCGUIApp.cpp 2005-10-01 10:56:37.000000000 +0200
-+++ boinc-5.2.13a/clientgui/BOINCGUIApp.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -312,7 +312,7 @@
- }
-
- #else
-- char* p = getenv("DISPLAY");
-+ wxString p = wxString(getenv("DISPLAY"), wxConvUTF8);
- if (p) m_strDefaultDisplay = p;
- #endif
-
-@@ -411,7 +411,7 @@
-
- #ifndef __WXMSW__
- // copy the path to the boinmgr from argv[0]
-- strncpy(szExecutableDirectory, wxGetApp().argv[0], sizeof(szExecutableDirectory));
-+ strncpy((char*)szExecutableDirectory, (const char*)wxGetApp().argv[0], sizeof(szExecutableDirectory));
- #endif
-
- // We are only interested in the path component of the fully qualified path.
-diff -Naur boinc-5.2.13a.orig/clientgui/BOINCGUIApp.h boinc-5.2.13a/clientgui/BOINCGUIApp.h
---- boinc-5.2.13a.orig/clientgui/BOINCGUIApp.h 2005-10-01 10:56:37.000000000 +0200
-+++ boinc-5.2.13a/clientgui/BOINCGUIApp.h 2005-12-01 08:01:32.000000000 +0100
-@@ -87,9 +87,9 @@
-
- public:
-
-- std::string m_strDefaultWindowStation;
-- std::string m_strDefaultDesktop;
-- std::string m_strDefaultDisplay;
-+ wxString m_strDefaultWindowStation;
-+ wxString m_strDefaultDesktop;
-+ wxString m_strDefaultDisplay;
-
- bool OnInit();
-
-diff -Naur boinc-5.2.13a.orig/clientgui/DlgAbout.cpp boinc-5.2.13a/clientgui/DlgAbout.cpp
---- boinc-5.2.13a.orig/clientgui/DlgAbout.cpp 2005-10-04 01:14:13.000000000 +0200
-+++ boinc-5.2.13a/clientgui/DlgAbout.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -73,7 +73,7 @@
-
- bool CDlgAbout::Create(wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style) {
- ////@begin CDlgAbout member initialisation
-- m_strVersion = BOINC_VERSION_STRING;
-+ m_strVersion = wxT(BOINC_VERSION_STRING);
- ////@end CDlgAbout member initialisation
-
- ////@begin CDlgAbout creation
-diff -Naur boinc-5.2.13a.orig/clientgui/MainDocument.cpp boinc-5.2.13a/clientgui/MainDocument.cpp
---- boinc-5.2.13a.orig/clientgui/MainDocument.cpp 2005-11-29 10:14:20.000000000 +0100
-+++ boinc-5.2.13a/clientgui/MainDocument.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -63,7 +63,7 @@
- buf[n] = 0;
- }
- }
-- strPassword = buf;
-+ strPassword = wxString(buf, wxConvUTF8);
- }
-
- // TODO: get rid of "reconnecting" stuff
-@@ -86,7 +86,7 @@
- m_bUseDefaultPassword = FALSE;
- }
-
-- retval = m_pDocument->rpc.authorize(m_strNewComputerPassword.c_str());
-+ retval = m_pDocument->rpc.authorize(m_strNewComputerPassword.mb_str());
- if (!retval) {
- wxLogTrace(wxT("Function Status"), wxT("CNetworkConnection::Poll - Connection Success"));
- SetStateSuccess(m_strNewComputerName, m_strNewComputerPassword);
-@@ -127,7 +127,7 @@
- if (IsComputerNameLocal(strComputer)) {
- retval = m_pDocument->rpc.init_asynch(NULL, 60., true);
- } else {
-- retval = m_pDocument->rpc.init_asynch(strComputer.c_str(), 60., false);
-+ retval = m_pDocument->rpc.init_asynch(strComputer.mb_str(), 60., false);
- }
-
- if (!retval) {
-@@ -326,7 +326,7 @@
- m_dtCachedStateTimestamp = m_dtCachedStateLockTimestamp;
- retval = rpc.get_state(state);
- if (retval) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedStateUpdate - Get State Failed '%d'", retval);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedStateUpdate - Get State Failed '%d'"), retval);
- m_pNetworkConnection->SetStateDisconnected();
- }
-
-@@ -334,7 +334,7 @@
-
- retval = rpc.get_host_info(host);
- if (retval) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedStateUpdate - Get Host Information Failed '%d'", retval);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedStateUpdate - Get Host Information Failed '%d'"), retval);
- m_pNetworkConnection->SetStateDisconnected();
- }
-
-@@ -590,7 +590,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_project_status(project_status);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedProjectStatusUpdate - Get Project Status Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedProjectStatusUpdate - Get Project Status Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
-
-@@ -639,7 +639,7 @@
-
-
- int CMainDocument::ProjectAttach(const wxString& strURL, const wxString& strAccountKey) {
-- return rpc.project_attach(strURL.c_str(), strAccountKey.c_str());
-+ return rpc.project_attach((const char*)strURL.mb_str(), (const char*)strAccountKey.mb_str());
- }
-
-
-@@ -650,7 +650,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("detach"));
-+ iRetVal = rpc.project_op((*pProject), "detach");
-
- return iRetVal;
- }
-@@ -663,7 +663,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("update"));
-+ iRetVal = rpc.project_op((*pProject), "update");
-
- return iRetVal;
- }
-@@ -676,7 +676,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("reset"));
-+ iRetVal = rpc.project_op((*pProject), "reset");
-
- return iRetVal;
- }
-@@ -689,7 +689,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("suspend"));
-+ iRetVal = rpc.project_op((*pProject), "suspend");
-
- return iRetVal;
- }
-@@ -702,7 +702,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("resume"));
-+ iRetVal = rpc.project_op((*pProject), "resume");
-
- return iRetVal;
- }
-@@ -714,7 +714,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("nomorework"));
-+ iRetVal = rpc.project_op((*pProject), "nomorework");
-
- return iRetVal;
- }
-@@ -726,7 +726,7 @@
- pProject = project(iIndex);
-
- if (pProject)
-- iRetVal = rpc.project_op((*pProject), wxT("allowmorework"));
-+ iRetVal = rpc.project_op((*pProject), "allowmorework");
-
- return iRetVal;
- }
-@@ -738,7 +738,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_results(results);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedResultsStatusUpdate - Get Result Status Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedResultsStatusUpdate - Get Result Status Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
- }
-@@ -791,7 +791,7 @@
- if (pResult) {
- pStateResult = state.lookup_result(pResult->project_url, pResult->name);
- if (pStateResult) {
-- iRetVal = rpc.result_op((*pStateResult), wxT("suspend"));
-+ iRetVal = rpc.result_op((*pStateResult), "suspend");
- } else {
- ForceCacheUpdate();
- }
-@@ -811,7 +811,7 @@
- if (pResult) {
- pStateResult = state.lookup_result(pResult->project_url, pResult->name);
- if (pStateResult) {
-- iRetVal = rpc.result_op((*pStateResult), wxT("resume"));
-+ iRetVal = rpc.result_op((*pStateResult), "resume");
- } else {
- ForceCacheUpdate();
- }
-@@ -854,7 +854,7 @@
- if (pResult) {
- pStateResult = state.lookup_result(pResult->project_url, pResult->name);
- if (pStateResult) {
-- iRetVal = rpc.result_op((*pStateResult), wxT("abort"));
-+ iRetVal = rpc.result_op((*pStateResult), "abort");
- } else {
- ForceCacheUpdate();
- }
-@@ -874,7 +874,7 @@
- if (IsConnected()) {
- retval = rpc.get_messages(m_iMessageSequenceNumber, messages);
- if (retval) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedMessageUpdate - Get Messages Failed '%d'", retval);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedMessageUpdate - Get Messages Failed '%d'"), retval);
- m_pNetworkConnection->SetStateDisconnected();
- goto done;
- }
-@@ -935,7 +935,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_file_transfers(ft);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedFileTransfersUpdate - Get File Transfers Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedFileTransfersUpdate - Get File Transfers Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
- }
-@@ -985,7 +985,7 @@
- pFT = file_transfer(iIndex);
-
- if (pFT)
-- iRetVal = rpc.file_transfer_op((*pFT), wxT("retry"));
-+ iRetVal = rpc.file_transfer_op((*pFT), "retry");
-
- return iRetVal;
- }
-@@ -998,7 +998,7 @@
- pFT = file_transfer(iIndex);
-
- if (pFT)
-- iRetVal = rpc.file_transfer_op((*pFT), wxT("abort"));
-+ iRetVal = rpc.file_transfer_op((*pFT), "abort");
-
- return iRetVal;
- }
-@@ -1010,7 +1010,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_disk_usage(resource_status);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedResourceStatusUpdate - Get Disk Usage Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedResourceStatusUpdate - Get Disk Usage Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
- }
-@@ -1061,7 +1061,7 @@
- if (IsConnected()) {
- iRetVal = rpc.get_statistics(statistics_status);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::CachedStatisticsStatusUpdate - Get Statistics Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::CachedStatisticsStatusUpdate - Get Statistics Failed '%d'"), iRetVal);
- m_pNetworkConnection->SetStateDisconnected();
- }
- }
-@@ -1112,7 +1112,7 @@
-
- iRetVal = rpc.get_proxy_settings(proxy_info);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::GetProxyInfo - Get Proxy Info Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::GetProxyInfo - Get Proxy Info Failed '%d'"), iRetVal);
- }
-
- return iRetVal;
-@@ -1131,7 +1131,7 @@
-
- iRetVal = rpc.set_proxy_settings(proxy_info);
- if (iRetVal) {
-- wxLogTrace(wxT("Function Status"), "CMainDocument::SetProxyInfo - Set Proxy Info Failed '%d'", iRetVal);
-+ wxLogTrace(wxT("Function Status"), wxT("CMainDocument::SetProxyInfo - Set Proxy Info Failed '%d'"), iRetVal);
- }
-
- return iRetVal;
-diff -Naur boinc-5.2.13a.orig/clientgui/MainFrame.cpp boinc-5.2.13a/clientgui/MainFrame.cpp
---- boinc-5.2.13a.orig/clientgui/MainFrame.cpp 2005-11-29 09:06:47.000000000 +0100
-+++ boinc-5.2.13a/clientgui/MainFrame.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -984,9 +984,9 @@
- CDlgAccountManagerStatus* pDlgStatus = new CDlgAccountManagerStatus(this);
-
- strTitle = pDlgStatus->GetTitle();
-- strTitle += wxT(" - ") + wxString(ami.acct_mgr_name.c_str());
-- pDlgStatus->SetAcctManagerName(ami.acct_mgr_name.c_str());
-- pDlgStatus->SetAcctManagerURL(ami.acct_mgr_url.c_str());
-+ strTitle += wxT(" - ") + wxString(wxString(ami.acct_mgr_name.c_str(), wxConvUTF8));
-+ pDlgStatus->SetAcctManagerName(wxString(ami.acct_mgr_name.c_str(), wxConvUTF8));
-+ pDlgStatus->SetAcctManagerURL(wxString(ami.acct_mgr_url.c_str(), wxConvUTF8));
- pDlgStatus->SetTitle(strTitle);
-
- iAnswer = pDlgStatus->ShowModal();
-@@ -1002,8 +1002,8 @@
- wxString strURL = wxEmptyString;
- bool bCredentialsCached = false;
- if (ID_UPDATE == iAnswer) {
-- strName = ami.acct_mgr_name.c_str();
-- strURL = ami.acct_mgr_url.c_str();
-+ strName = wxString(ami.acct_mgr_name.c_str(), wxConvUTF8);
-+ strURL = wxString(ami.acct_mgr_url.c_str(), wxConvUTF8);
- bCredentialsCached = ami.have_credentials;
- }
- pWizard->Run( strName, strURL, bCredentialsCached );
-@@ -1144,17 +1144,17 @@
- }
-
- pDlg->m_EnableHTTPProxyCtrl->SetValue(pDoc->proxy_info.use_http_proxy);
-- pDlg->m_HTTPAddressCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str());
-- pDlg->m_HTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str());
-- pDlg->m_HTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str());
-+ pDlg->m_HTTPAddressCtrl->SetValue(wxString(pDoc->proxy_info.http_server_name.c_str(), wxConvUTF8));
-+ pDlg->m_HTTPUsernameCtrl->SetValue(wxString(pDoc->proxy_info.http_user_name.c_str(), wxConvUTF8));
-+ pDlg->m_HTTPPasswordCtrl->SetValue(wxString(pDoc->proxy_info.http_user_passwd.c_str(), wxConvUTF8));
-
- strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port);
- pDlg->m_HTTPPortCtrl->SetValue(strBuffer);
-
- pDlg->m_EnableSOCKSProxyCtrl->SetValue(pDoc->proxy_info.use_socks_proxy);
-- pDlg->m_SOCKSAddressCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str());
-- pDlg->m_SOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str());
-- pDlg->m_SOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str());
-+ pDlg->m_SOCKSAddressCtrl->SetValue(wxString(pDoc->proxy_info.socks_server_name.c_str(), wxConvUTF8));
-+ pDlg->m_SOCKSUsernameCtrl->SetValue(wxString(pDoc->proxy_info.socks5_user_name.c_str(), wxConvUTF8));
-+ pDlg->m_SOCKSPasswordCtrl->SetValue(wxString(pDoc->proxy_info.socks5_user_passwd.c_str(), wxConvUTF8));
-
- strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port);
- pDlg->m_SOCKSPortCtrl->SetValue(strBuffer);
-@@ -1183,18 +1183,18 @@
- // Proxy Tabs
- if (bRetrievedProxyConfiguration) {
- pDoc->proxy_info.use_http_proxy = pDlg->m_EnableHTTPProxyCtrl->GetValue();
-- pDoc->proxy_info.http_server_name = pDlg->m_HTTPAddressCtrl->GetValue().c_str();
-- pDoc->proxy_info.http_user_name = pDlg->m_HTTPUsernameCtrl->GetValue().c_str();
-- pDoc->proxy_info.http_user_passwd = pDlg->m_HTTPPasswordCtrl->GetValue().c_str();
-+ pDoc->proxy_info.http_server_name = (const char*)pDlg->m_HTTPAddressCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.http_user_name = (const char*)pDlg->m_HTTPUsernameCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.http_user_passwd = (const char*)pDlg->m_HTTPPasswordCtrl->GetValue().mb_str();
-
- strBuffer = pDlg->m_HTTPPortCtrl->GetValue();
- strBuffer.ToLong((long*)&iBuffer);
- pDoc->proxy_info.http_server_port = iBuffer;
-
- pDoc->proxy_info.use_socks_proxy = pDlg->m_EnableSOCKSProxyCtrl->GetValue();
-- pDoc->proxy_info.socks_server_name = pDlg->m_SOCKSAddressCtrl->GetValue().c_str();
-- pDoc->proxy_info.socks5_user_name = pDlg->m_SOCKSUsernameCtrl->GetValue().c_str();
-- pDoc->proxy_info.socks5_user_passwd = pDlg->m_SOCKSPasswordCtrl->GetValue().c_str();
-+ pDoc->proxy_info.socks_server_name = (const char*)pDlg->m_SOCKSAddressCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.socks5_user_name = (const char*)pDlg->m_SOCKSUsernameCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.socks5_user_passwd = (const char*)pDlg->m_SOCKSPasswordCtrl->GetValue().mb_str();
-
- strBuffer = pDlg->m_SOCKSPortCtrl->GetValue();
- strBuffer.ToLong((long*)&iBuffer);
-@@ -1356,8 +1356,8 @@
- pDoc->rpc.acct_mgr_info(ami);
- if (ami.acct_mgr_url.size()) {
- pAMWizard = new CWizardAccountManager(this);
-- strName = ami.acct_mgr_name.c_str();
-- strURL = ami.acct_mgr_url.c_str();
-+ strName = wxString(ami.acct_mgr_name.c_str(), wxConvUTF8);
-+ strURL = wxString(ami.acct_mgr_url.c_str(), wxConvUTF8);
- if (ami.have_credentials) {
- pAMWizard->Run(strName, strURL, true);
- } else {
-@@ -1366,8 +1366,8 @@
- } else {
- pAPWizard = new CWizardAttachProject(this);
- pDoc->rpc.get_project_init_status(pis);
-- strName = pis.name.c_str();
-- strURL = pis.url.c_str();
-+ strName = wxString(pis.name.c_str(), wxConvUTF8);
-+ strURL = wxString(pis.url.c_str(), wxConvUTF8);
- if (pis.url.length() && pis.has_account_key) {
- pAPWizard->Run(strName, strURL, true);
- } else {
-@@ -1756,7 +1756,7 @@
- wxString strComputerName = wxEmptyString;
- wxString strStatusText = wxEmptyString;
- wxString strTitle = m_strBaseTitle;
-- wxString strLocale = setlocale(LC_NUMERIC, NULL);
-+ wxString strLocale = wxString(setlocale(LC_NUMERIC, NULL), wxConvUTF8);
-
- if (pDoc->IsReconnecting())
- pDoc->GetConnectingComputerName(strComputerName);
-diff -Naur boinc-5.2.13a.orig/clientgui/ProjectProcessingPage.cpp boinc-5.2.13a/clientgui/ProjectProcessingPage.cpp
---- boinc-5.2.13a.orig/clientgui/ProjectProcessingPage.cpp 2005-10-04 01:14:19.000000000 +0200
-+++ boinc-5.2.13a/clientgui/ProjectProcessingPage.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -366,25 +366,25 @@
- ai->clear();
- ao->clear();
-
-- ai->url = ((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().c_str();
-+ ai->url = (const char*)((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().mb_str();
-
- if (!((CWizardAttachProject*)GetParent())->m_AccountKeyPage->m_strAccountKey.IsEmpty() ||
- ((CWizardAttachProject*)GetParent())->m_bCredentialsCached
- ) {
- if (!((CWizardAttachProject*)GetParent())->m_bCredentialsCached) {
-- ao->authenticator = ((CWizardAttachProject*)GetParent())->m_AccountKeyPage->m_strAccountKey.c_str();
-+ ao->authenticator = (const char*)((CWizardAttachProject*)GetParent())->m_AccountKeyPage->m_strAccountKey.mb_str();
- }
- SetProjectCommunitcationsSucceeded(true);
- } else {
- if (((CWizardAttachProject*)GetParent())->m_AccountInfoPage->m_AccountCreateCtrl->GetValue()) {
- if (!((CWizardAttachProject*)GetParent())->project_config.uses_username) {
-- ai->email_addr = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-- ai->user_name = ::wxGetUserName().c_str();
-+ ai->email_addr = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
-+ ai->user_name = (const char*)wxGetUserName().mb_str();
- } else {
-- ai->email_addr = wxT("");
-- ai->user_name = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-+ ai->email_addr = "";
-+ ai->user_name = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
- }
-- ai->passwd = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountPassword().c_str();
-+ ai->passwd = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountPassword().mb_str();
- pDoc->rpc.create_account(*ai);
-
- // Wait until we are done processing the request.
-@@ -412,11 +412,11 @@
- }
- } else {
- if (!((CWizardAttachProject*)GetParent())->project_config.uses_username) {
-- ai->email_addr = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-+ ai->email_addr = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
- } else {
-- ai->user_name = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().c_str();
-+ ai->user_name = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountEmailAddress().mb_str();
- }
-- ai->passwd = ((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountPassword().c_str();
-+ ai->passwd = (const char*)((CWizardAttachProject*)GetParent())->m_AccountInfoPage->GetAccountPassword().mb_str();
-
- pDoc->rpc.lookup_account(*ai);
-
-@@ -512,8 +512,8 @@
- if (!iReturnValue && !reply.error_num && !CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTATTACH)) {
- SetProjectAttachSucceeded(true);
- ((CWizardAttachProject*)GetParent())->SetAttachedToProjectSuccessfully(true);
-- ((CWizardAttachProject*)GetParent())->SetProjectURL(ai->url.c_str());
-- ((CWizardAttachProject*)GetParent())->SetProjectAuthenticator(ao->authenticator.c_str());
-+ ((CWizardAttachProject*)GetParent())->SetProjectURL(wxString(ai->url.c_str(), wxConvUTF8));
-+ ((CWizardAttachProject*)GetParent())->SetProjectAuthenticator(wxString(ao->authenticator.c_str(), wxConvUTF8));
- } else {
- SetProjectAttachSucceeded(false);
- if ((HTTP_STATUS_INTERNAL_SERVER_ERROR == reply.error_num) || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTPROPERTIESURL)) {
-@@ -523,9 +523,9 @@
- } else {
- strBuffer = ((CWizardAttachProject*)GetParent())->m_CompletionErrorPage->m_ServerMessages->GetLabel();
- for (i=0; i<reply.messages.size(); i++) {
-- strBuffer += wxString(reply.messages[i].c_str()) + wxString(wxT("\n"));
-+ strBuffer += wxString(reply.messages[i].c_str(), wxConvUTF8) + wxString(wxT("\n"));
- }
-- ((CWizardAttachProject*)GetParent())->m_CompletionErrorPage->m_ServerMessages->SetLabel(strBuffer);
-+ ((CWizardAttachProject*)GetParent())->m_CompletionErrorPage->m_ServerMessages->SetLabel(wxString(strBuffer, wxConvUTF8));
- }
- }
- } else {
-diff -Naur boinc-5.2.13a.orig/clientgui/ProjectPropertiesPage.cpp boinc-5.2.13a/clientgui/ProjectPropertiesPage.cpp
---- boinc-5.2.13a.orig/clientgui/ProjectPropertiesPage.cpp 2005-11-29 09:06:47.000000000 +0100
-+++ boinc-5.2.13a/clientgui/ProjectPropertiesPage.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -373,7 +373,7 @@
- case PROJPROP_RETRPROJECTPROPERTIES_EXECUTE:
- // Attempt to retrieve the project's account creation policies
- pDoc->rpc.get_project_config(
-- ((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().c_str()
-+ (const char*)((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().mb_str()
- );
-
- // Wait until we are done processing the request.
-@@ -415,7 +415,7 @@
- }
-
- bSuccessfulCondition = (ERR_ALREADY_ATTACHED == pDoc->rpc.project_attach(
-- ((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().c_str(),
-+ (const char*)((CWizardAttachProject*)GetParent())->m_ProjectInfoPage->GetProjectURL().mb_str(),
- ""
- ));
- if (bSuccessfulCondition || CHECK_DEBUG_FLAG(WIZDEBUG_ERRPROJECTALREADYATTACHED)) {
-diff -Naur boinc-5.2.13a.orig/clientgui/ProxyPage.cpp boinc-5.2.13a/clientgui/ProxyPage.cpp
---- boinc-5.2.13a.orig/clientgui/ProxyPage.cpp 2005-10-04 01:14:20.000000000 +0200
-+++ boinc-5.2.13a/clientgui/ProxyPage.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -299,16 +299,16 @@
- if (event.GetDirection() == true) {
- // Moving from the previous page, get state
- pDoc->GetProxyConfiguration();
-- m_ProxyHTTPServerCtrl->SetValue(pDoc->proxy_info.http_server_name.c_str());
-- m_ProxyHTTPUsernameCtrl->SetValue(pDoc->proxy_info.http_user_name.c_str());
-- m_ProxyHTTPPasswordCtrl->SetValue(pDoc->proxy_info.http_user_passwd.c_str());
-+ m_ProxyHTTPServerCtrl->SetValue(wxString(pDoc->proxy_info.http_server_name.c_str(), wxConvUTF8));
-+ m_ProxyHTTPUsernameCtrl->SetValue(wxString(pDoc->proxy_info.http_user_name.c_str(), wxConvUTF8));
-+ m_ProxyHTTPPasswordCtrl->SetValue(wxString(pDoc->proxy_info.http_user_passwd.c_str(), wxConvUTF8));
-
- strBuffer.Printf(wxT("%d"), pDoc->proxy_info.http_server_port);
- m_ProxyHTTPPortCtrl->SetValue(strBuffer);
-
-- m_ProxySOCKSServerCtrl->SetValue(pDoc->proxy_info.socks_server_name.c_str());
-- m_ProxySOCKSUsernameCtrl->SetValue(pDoc->proxy_info.socks5_user_name.c_str());
-- m_ProxySOCKSPasswordCtrl->SetValue(pDoc->proxy_info.socks5_user_passwd.c_str());
-+ m_ProxySOCKSServerCtrl->SetValue(wxString(pDoc->proxy_info.socks_server_name.c_str(), wxConvUTF8));
-+ m_ProxySOCKSUsernameCtrl->SetValue(wxString(pDoc->proxy_info.socks5_user_name.c_str(), wxConvUTF8));
-+ m_ProxySOCKSPasswordCtrl->SetValue(wxString(pDoc->proxy_info.socks5_user_passwd.c_str(), wxConvUTF8));
-
- strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port);
- m_ProxySOCKSPortCtrl->SetValue(strBuffer);
-@@ -332,18 +332,18 @@
- if (event.GetDirection() == true) {
- // Moving to the next page, save state
- pDoc->proxy_info.use_http_proxy = (m_ProxyHTTPServerCtrl->GetValue().Length() > 0);
-- pDoc->proxy_info.http_server_name = m_ProxyHTTPServerCtrl->GetValue().c_str();
-- pDoc->proxy_info.http_user_name = m_ProxyHTTPUsernameCtrl->GetValue().c_str();
-- pDoc->proxy_info.http_user_passwd = m_ProxyHTTPPasswordCtrl->GetValue().c_str();
-+ pDoc->proxy_info.http_server_name = (const char*)m_ProxyHTTPServerCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.http_user_name = (const char*)m_ProxyHTTPUsernameCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.http_user_passwd = (const char*)m_ProxyHTTPPasswordCtrl->GetValue().mb_str();
-
- strBuffer = m_ProxyHTTPPortCtrl->GetValue();
- strBuffer.ToLong((long*)&iBuffer);
- pDoc->proxy_info.http_server_port = iBuffer;
-
- pDoc->proxy_info.use_socks_proxy = (m_ProxySOCKSServerCtrl->GetValue().Length() > 0);
-- pDoc->proxy_info.socks_server_name = m_ProxySOCKSServerCtrl->GetValue().c_str();
-- pDoc->proxy_info.socks5_user_name = m_ProxySOCKSUsernameCtrl->GetValue().c_str();
-- pDoc->proxy_info.socks5_user_passwd = m_ProxySOCKSPasswordCtrl->GetValue().c_str();
-+ pDoc->proxy_info.socks_server_name = (const char*)m_ProxySOCKSServerCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.socks5_user_name = (const char*)m_ProxySOCKSUsernameCtrl->GetValue().mb_str();
-+ pDoc->proxy_info.socks5_user_passwd = (const char*)m_ProxySOCKSPasswordCtrl->GetValue().mb_str();
-
- strBuffer = m_ProxySOCKSPortCtrl->GetValue();
- strBuffer.ToLong((long*)&iBuffer);
-diff -Naur boinc-5.2.13a.orig/clientgui/ValidateURL.cpp boinc-5.2.13a/clientgui/ValidateURL.cpp
---- boinc-5.2.13a.orig/clientgui/ValidateURL.cpp 2005-11-29 09:06:48.000000000 +0100
-+++ boinc-5.2.13a/clientgui/ValidateURL.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -63,7 +63,7 @@
- bool ok = TRUE;
- std::string canonicalize_url;
-
-- canonicalize_url = control->GetValue().Trim().Trim(false).c_str(); // trim spaces before and after
-+ canonicalize_url = control->GetValue().Trim().Trim(false).mb_str(); // trim spaces before and after
-
- if (canonicalize_url.size() == 0) {
- ok = FALSE;
-@@ -71,9 +71,9 @@
- m_errormsg = _("Please specify a URL.\nFor example:\nhttp://www.example.com/");
- } else {
- canonicalize_master_url(canonicalize_url);
-- wxURI uri(canonicalize_url.c_str());
-- wxURL url(canonicalize_url.c_str());
-- wxString strURL(canonicalize_url.c_str());
-+ wxURI uri(wxString(canonicalize_url.c_str(), wxConvUTF8));
-+ wxURL url(wxString(canonicalize_url.c_str(), wxConvUTF8));
-+ wxString strURL(canonicalize_url.c_str(), wxConvUTF8);
- wxString strServer(uri.GetServer());
- int iServerDotLocation = strServer.Find(wxT("."));
- int iFirstPart = strServer.Mid(0, iServerDotLocation).Length();
-@@ -129,7 +129,7 @@
- }
-
- if (ok) {
-- control->SetValue(canonicalize_url.c_str());
-+ control->SetValue(wxString(canonicalize_url.c_str(), wxConvUTF8));
- }
-
- return ok;
-diff -Naur boinc-5.2.13a.orig/clientgui/ViewMessages.cpp boinc-5.2.13a/clientgui/ViewMessages.cpp
---- boinc-5.2.13a.orig/clientgui/ViewMessages.cpp 2005-09-06 08:18:36.000000000 +0200
-+++ boinc-5.2.13a/clientgui/ViewMessages.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -287,7 +287,7 @@
- MESSAGE* message = wxGetApp().GetDocument()->message(item);
-
- if (message) {
-- strBuffer = wxString(message->project.c_str());
-+ strBuffer = wxString(message->project.c_str(), wxConvUTF8);
- }
-
- return 0;
-@@ -329,7 +329,7 @@
- MESSAGE* message = wxGetApp().GetDocument()->message(item);
-
- if (message) {
-- strBuffer = wxString(message->body.c_str());
-+ strBuffer = wxString(message->body.c_str(), wxConvUTF8);
- }
-
- strBuffer.Replace(wxT("\n"), wxT(""), true);
-diff -Naur boinc-5.2.13a.orig/clientgui/ViewProjects.cpp boinc-5.2.13a/clientgui/ViewProjects.cpp
---- boinc-5.2.13a.orig/clientgui/ViewProjects.cpp 2005-11-02 19:36:03.000000000 +0100
-+++ boinc-5.2.13a/clientgui/ViewProjects.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -609,9 +609,9 @@
-
- // Default project url
- pItem = new CTaskItem(
-- project->project_name.c_str(),
-+ wxString(project->project_name.c_str(), wxConvUTF8),
- wxT(""),
-- project->master_url.c_str(),
-+ wxString(project->master_url.c_str(), wxConvUTF8),
- ID_TASK_PROJECT_WEB_PROJDEF_MIN
- );
- pGroup->m_Tasks.push_back(pItem);
-@@ -620,9 +620,9 @@
- // Project defined urls
- for (i=0;(i<project->gui_urls.size())&&(i<=ID_TASK_PROJECT_WEB_PROJDEF_MAX);i++) {
- pItem = new CTaskItem(
-- _(project->gui_urls[i].name.c_str()),
-- _(project->gui_urls[i].description.c_str()),
-- project->gui_urls[i].url.c_str(),
-+ wxString(project->gui_urls[i].name.c_str(), wxConvUTF8),
-+ wxString(project->gui_urls[i].description.c_str(), wxConvUTF8),
-+ wxString(project->gui_urls[i].url.c_str(), wxConvUTF8),
- ID_TASK_PROJECT_WEB_PROJDEF_MIN + 1 + i
- );
- pGroup->m_Tasks.push_back(pItem);
-@@ -644,7 +644,7 @@
-
- if (project) {
- project->get_name(project_name);
-- strBuffer = wxString(project_name.c_str());
-+ strBuffer = wxString(project_name.c_str(), wxConvUTF8);
- }
-
- return 0;
-@@ -655,7 +655,7 @@
- PROJECT* project = wxGetApp().GetDocument()->project(item);
-
- if (project) {
-- strBuffer = wxString(project->user_name.c_str());
-+ strBuffer = wxString(project->user_name.c_str(), wxConvUTF8);
- }
-
- return 0;
-@@ -666,7 +666,7 @@
- PROJECT* project = wxGetApp().GetDocument()->project(item);
-
- if (project) {
-- strBuffer = wxString(project->team_name.c_str());
-+ strBuffer = wxString(project->team_name.c_str(), wxConvUTF8);
- }
-
- return 0;
-diff -Naur boinc-5.2.13a.orig/clientgui/ViewResources.cpp boinc-5.2.13a/clientgui/ViewResources.cpp
---- boinc-5.2.13a.orig/clientgui/ViewResources.cpp 2005-11-02 19:36:03.000000000 +0100
-+++ boinc-5.2.13a/clientgui/ViewResources.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -215,7 +215,7 @@
- state_project = doc->state.lookup_project(resource->master_url);
- if (state_project) {
- state_project->get_name(project_name);
-- strBuffer = wxString(project_name.c_str());
-+ strBuffer = wxString(project_name.c_str(), wxConvUTF8);
- }
- }
-
-diff -Naur boinc-5.2.13a.orig/clientgui/ViewTransfers.cpp boinc-5.2.13a/clientgui/ViewTransfers.cpp
---- boinc-5.2.13a.orig/clientgui/ViewTransfers.cpp 2005-11-02 19:36:03.000000000 +0100
-+++ boinc-5.2.13a/clientgui/ViewTransfers.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -368,7 +368,7 @@
- FILE_TRANSFER* transfer = wxGetApp().GetDocument()->file_transfer(item);
-
- if (transfer) {
-- strBuffer = wxString(transfer->project_name.c_str());
-+ strBuffer = wxString(transfer->project_name.c_str(), wxConvUTF8);
- }
- return 0;
- }
-@@ -378,7 +378,7 @@
- FILE_TRANSFER* transfer = wxGetApp().GetDocument()->file_transfer(item);
-
- if (transfer) {
-- strBuffer = wxString(transfer->name.c_str());
-+ strBuffer = wxString(transfer->name.c_str(), wxConvUTF8);
- }
- return 0;
- }
-diff -Naur boinc-5.2.13a.orig/clientgui/ViewWork.cpp boinc-5.2.13a/clientgui/ViewWork.cpp
---- boinc-5.2.13a.orig/clientgui/ViewWork.cpp 2005-11-27 02:58:37.000000000 +0100
-+++ boinc-5.2.13a/clientgui/ViewWork.cpp 2005-12-01 08:01:32.000000000 +0100
-@@ -220,9 +220,9 @@
- pDoc->WorkShowGraphics(
- m_pListPane->GetFirstSelected(),
- false,
-- wxGetApp().m_strDefaultWindowStation,
-- wxGetApp().m_strDefaultDesktop,
-- wxGetApp().m_strDefaultDisplay
-+ (const char*)wxGetApp().m_strDefaultWindowStation.mb_str(),
-+ (const char*)wxGetApp().m_strDefaultDesktop.mb_str(),
-+ (const char*)wxGetApp().m_strDefaultDisplay.mb_str()
- );
- }
-
-@@ -479,7 +479,7 @@
- state_result = doc->state.lookup_result(result->project_url, result->name);
- if (state_result) {
- state_result->project->get_name(project_name);
-- strBuffer = wxString(project_name.c_str());
-+ strBuffer = wxString(project_name.c_str(), wxConvUTF8);
- } else {
- doc->ForceCacheUpdate();
- }
-@@ -500,14 +500,14 @@
- if (result) {
- state_result = doc->state.lookup_result(result->project_url, result->name);
- if (state_result) {
-- wxString strLocale = setlocale(LC_NUMERIC, NULL);
-+ wxString strLocale = wxString(setlocale(LC_NUMERIC, NULL), wxConvUTF8);
- setlocale(LC_NUMERIC, "C");
- strBuffer.Printf(
- wxT("%s %.2f"),
- state_result->wup->avp->app_name.c_str(),
- state_result->wup->avp->version_num/100.0
- );
-- setlocale(LC_NUMERIC, strLocale.c_str());
-+ setlocale(LC_NUMERIC, (const char*)strLocale.mb_str());
- } else {
- doc->ForceCacheUpdate();
- }
-@@ -523,7 +523,7 @@
- wxASSERT(result);
-
- if (result) {
-- strBuffer = wxString(result->name.c_str());
-+ strBuffer = wxString(result->name.c_str(), wxConvUTF8);
- }
-
- return 0;
---- boinc-5.2.13a.orig/clientgui/ViewStatistics.h 2005-11-15 00:27:11.000000000 +0100
-+++ boinc-5.2.13a/clientgui/ViewStatistics.h 2005-12-01 12:10:39.000000000 +0100
-@@ -32,7 +32,7 @@
- {
- public:
- CPaintStatistics();
-- CPaintStatistics(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = "panel");
-+ CPaintStatistics(wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL, const wxString& name = wxT("panel") );
-
- wxInt32 m_SelectedStatistic;
- wxString heading;
---- boinc-5.2.13a.orig/clientgui/ViewStatistics.cpp 2005-11-15 00:27:11.000000000 +0100
-+++ boinc-5.2.13a/clientgui/ViewStatistics.cpp 2005-12-01 12:38:41.000000000 +0100
-@@ -144,7 +144,7 @@
- state_project = pDoc->state.lookup_project(statistic->master_url);
- if (state_project) {
- state_project->get_name(project_name);
-- name = wxString(project_name.c_str());
-+ name = wxString(project_name.c_str(), wxConvUTF8);
- }
- }
-
-@@ -188,23 +188,23 @@
-
-
- wxCoord w_temp, h_temp, des_temp, lead_temp;
-- dc.GetTextExtent(wxString::Format("%.0f", max_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-+ dc.GetTextExtent(wxString::Format(wxT("%.0f"), max_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-
- rectangle_x_start=x_start+w_temp+2;
- rectangle_y_start=y_start+heading_height+2;
- rectangle_x_end=x_end-2;
- rectangle_y_end=y_end-2-h_temp;
-
-- dc.GetTextExtent("days", &w_temp, &h_temp, &des_temp, &lead_temp);
-+ dc.GetTextExtent(wxT("days"), &w_temp, &h_temp, &des_temp, &lead_temp);
- rectangle_x_end-=w_temp;
-
-- dc.GetTextExtent(wxString::Format("%.0f", max_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-+ dc.GetTextExtent(wxString::Format(wxT("%.0f"), max_val), &w_temp, &h_temp, &des_temp, &lead_temp);
- dc.DrawRectangle(rectangle_x_start,rectangle_y_start,rectangle_x_end-rectangle_x_start,rectangle_y_end-rectangle_y_start);
-- dc.DrawText(wxString::Format("%.0f", max_val),x_start,rectangle_y_start-h_temp);
-+ dc.DrawText(wxString::Format(wxT("%.0f"), max_val),x_start,rectangle_y_start-h_temp);
-
-- dc.GetTextExtent(wxString::Format("%.0f", min_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-- dc.DrawText(wxString::Format("%.0f", min_val),rectangle_x_start-w_temp-2,rectangle_y_end-h_temp);
-- dc.DrawText("days", rectangle_x_end, rectangle_y_end);
-+ dc.GetTextExtent(wxString::Format(wxT("%.0f"), min_val), &w_temp, &h_temp, &des_temp, &lead_temp);
-+ dc.DrawText(wxString::Format(wxT("%.0f"), min_val),rectangle_x_start-w_temp-2,rectangle_y_end-h_temp);
-+ dc.DrawText(wxT("days"), rectangle_x_end, rectangle_y_end);
-
- //Draw day numbers and lines marking the days
- wxCoord xpos=rectangle_x_start;
-@@ -212,7 +212,7 @@
- double day=dday()-j->day;
- day=day/(60*60*24);
- dc.SetPen(wxPen(wxColour (0 , 0 , 0) , 1 , wxSOLID));
-- if (j!=(--(*i)->statistics.end())) dc.DrawText(wxString::Format("-%.0f", day),xpos,rectangle_y_end);
-+ if (j!=(--(*i)->statistics.end())) dc.DrawText(wxString::Format(wxT("-%.0f"), day),xpos,rectangle_y_end);
- if (j!=(--(*i)->statistics.end()) && j!=(*i)->statistics.begin()) {
- dc.SetPen(wxPen(wxColour (200 , 200 , 200) , 1 , wxSOLID));
- dc.DrawLine(xpos,rectangle_y_start+1,xpos,rectangle_y_end-1);
+diff -urNad boinc-5.4.1~/clientgui/BOINCGUIApp.cpp boinc-5.4.1/clientgui/BOINCGUIApp.cpp
+--- boinc-5.4.1~/clientgui/BOINCGUIApp.cpp 2006-03-29 06:12:28.000000000 +0200
++++ boinc-5.4.1/clientgui/BOINCGUIApp.cpp 2006-04-13 08:24:54.000000000 +0200
+@@ -847,7 +847,7 @@
+ RPC_CLIENT rpc;
+ if (!rpc.init("localhost")) {
+ m_pDocument->m_pNetworkConnection->GetLocalPassword(strPassword);
+- rpc.authorize(strPassword.c_str());
++ rpc.authorize((const char*)strPassword.mb_str());
+ if (wxProcess::Exists(m_lBOINCCoreProcessId)) {
+ rpc.quit();
+ for (iCount = 0; iCount <= 10; iCount++) {
Deleted: branches/breezy/boinc/debian/patches/04_sched-makefile.am.dpatch
===================================================================
--- branches/breezy/boinc/debian/patches/04_sched-makefile.am.dpatch 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/patches/04_sched-makefile.am.dpatch 2006-04-14 19:41:25 UTC (rev 401)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_sched-makefile.am.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@
-
---- boinc-5.2.5.orig/sched/Makefile.am 2005-09-29 13:56:28.000000000 +0200
-+++ boinc-5.2.5/sched/Makefile.am 2005-11-18 22:01:56.000000000 +0100
-@@ -2,7 +2,8 @@
-
- include $(top_srcdir)/Makefile.incl
-
--noinst_PROGRAMS = \
-+scheddir=$(libdir)/BOINC/sched
-+sched_PROGRAMS = \
- cgi \
- feeder \
- db_dump \
Deleted: branches/breezy/boinc/debian/patches/05_correct-php-shebang.dpatch
===================================================================
--- branches/breezy/boinc/debian/patches/05_correct-php-shebang.dpatch 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/patches/05_correct-php-shebang.dpatch 2006-04-14 19:41:25 UTC (rev 401)
@@ -1,89 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_correct-php-shebang.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.5.orig/html/ops/db_update.php boinc-5.2.5/html/ops/db_update.php
---- boinc-5.2.5.orig/html/ops/db_update.php 2005-09-23 01:27:08.000000000 +0200
-+++ boinc-5.2.5/html/ops/db_update.php 2005-11-19 15:55:17.000000000 +0100
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/php
-+#! /usr/bin/php
- <?php
-
- // code for one-time database updates goes here.
-diff -Naur boinc-5.2.5.orig/html/ops/make_fake_tables.php boinc-5.2.5/html/ops/make_fake_tables.php
---- boinc-5.2.5.orig/html/ops/make_fake_tables.php 2004-02-03 00:34:31.000000000 +0100
-+++ boinc-5.2.5/html/ops/make_fake_tables.php 2005-11-19 15:55:34.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- define('NUM_USERS', 200);
-diff -Naur boinc-5.2.5.orig/html/ops/migrate_tables.php boinc-5.2.5/html/ops/migrate_tables.php
---- boinc-5.2.5.orig/html/ops/migrate_tables.php 2004-06-14 22:20:05.000000000 +0200
-+++ boinc-5.2.5/html/ops/migrate_tables.php 2005-11-19 15:55:45.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- // TODO: Find out what to insert for team create_times, since that value
-diff -Naur boinc-5.2.5.orig/html/ops/mungetest.php boinc-5.2.5/html/ops/mungetest.php
---- boinc-5.2.5.orig/html/ops/mungetest.php 2004-02-03 00:34:31.000000000 +0100
-+++ boinc-5.2.5/html/ops/mungetest.php 2005-11-19 15:55:51.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- require_once('../inc/util.inc');
-diff -Naur boinc-5.2.5.orig/html/ops/update_forum_activities.php boinc-5.2.5/html/ops/update_forum_activities.php
---- boinc-5.2.5.orig/html/ops/update_forum_activities.php 2005-04-21 00:46:46.000000000 +0200
-+++ boinc-5.2.5/html/ops/update_forum_activities.php 2005-11-19 15:56:00.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- require_once("../inc/forum.inc");
-diff -Naur boinc-5.2.5.orig/html/ops/update_profile_pages.php boinc-5.2.5/html/ops/update_profile_pages.php
---- boinc-5.2.5.orig/html/ops/update_profile_pages.php 2005-10-17 21:36:42.000000000 +0200
-+++ boinc-5.2.5/html/ops/update_profile_pages.php 2005-11-19 15:56:05.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
- <?php
-
- require_once("../inc/db.inc");
-diff -Naur boinc-5.2.5.orig/html/ops/update_uotd.php boinc-5.2.5/html/ops/update_uotd.php
---- boinc-5.2.5.orig/html/ops/update_uotd.php 2004-06-09 23:42:23.000000000 +0200
-+++ boinc-5.2.5/html/ops/update_uotd.php 2005-11-19 15:56:10.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php
-+#!/usr/bin/php
-
- <?php
-
-diff -Naur boinc-5.2.5.orig/html/ops/watchdogs.php boinc-5.2.5/html/ops/watchdogs.php
---- boinc-5.2.5.orig/html/ops/watchdogs.php 2004-06-15 21:25:58.000000000 +0200
-+++ boinc-5.2.5/html/ops/watchdogs.php 2005-11-19 15:56:17.000000000 +0100
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/php
-+#! /usr/bin/php
- <?php
-
- // General-purpose watchdog script.
-diff -Naur boinc-5.2.5.orig/html/ops/wd_nresults_changing.php boinc-5.2.5/html/ops/wd_nresults_changing.php
---- boinc-5.2.5.orig/html/ops/wd_nresults_changing.php 2004-06-15 21:25:58.000000000 +0200
-+++ boinc-5.2.5/html/ops/wd_nresults_changing.php 2005-11-19 15:56:25.000000000 +0100
-@@ -1,4 +1,4 @@
--#! /usr/local/bin/php -q
-+#! /usr/bin/php -q
- <?php
-
- // watchdog script to ensure that the number of result records
Deleted: branches/breezy/boinc/debian/patches/06_remove-python-shebang.dpatch
===================================================================
--- branches/breezy/boinc/debian/patches/06_remove-python-shebang.dpatch 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/patches/06_remove-python-shebang.dpatch 2006-04-14 19:41:25 UTC (rev 401)
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_remove-python-shebang.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.5.orig/py/Boinc/add_util.py boinc-5.2.5/py/Boinc/add_util.py
---- boinc-5.2.5.orig/py/Boinc/add_util.py 2004-12-06 23:41:14.000000000 +0100
-+++ boinc-5.2.5/py/Boinc/add_util.py 2005-11-19 17:23:58.000000000 +0100
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # $Id: add_util.py,v 1.5 2004/12/06 22:41:14 boincadm Exp $
-
- # add_util.py - code shared between add and xadd
-diff -Naur boinc-5.2.5.orig/py/Boinc/boincxml.py boinc-5.2.5/py/Boinc/boincxml.py
---- boinc-5.2.5.orig/py/Boinc/boincxml.py 2004-06-15 09:25:18.000000000 +0200
-+++ boinc-5.2.5/py/Boinc/boincxml.py 2005-11-19 17:23:53.000000000 +0100
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # $Id: boincxml.py,v 1.5 2004/06/15 07:25:18 quarl Exp $
-
- # boincxml.py - xml utilities for boinc
-diff -Naur boinc-5.2.5.orig/py/Boinc/configxml.py boinc-5.2.5/py/Boinc/configxml.py
---- boinc-5.2.5.orig/py/Boinc/configxml.py 2004-01-13 07:51:17.000000000 +0100
-+++ boinc-5.2.5/py/Boinc/configxml.py 2005-11-19 17:23:50.000000000 +0100
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # $Id: configxml.py,v 1.7 2004/01/13 06:51:17 quarl Exp $
-
- # configxml.py - module to read and parse config.xml, run_state.xml
-diff -Naur boinc-5.2.5.orig/py/Boinc/projectxml.py boinc-5.2.5/py/Boinc/projectxml.py
---- boinc-5.2.5.orig/py/Boinc/projectxml.py 2004-12-06 23:41:14.000000000 +0100
-+++ boinc-5.2.5/py/Boinc/projectxml.py 2005-11-19 17:24:11.000000000 +0100
-@@ -1,5 +1,3 @@
--#!/usr/bin/env python
--
- # $Id: projectxml.py,v 1.2 2004/12/06 22:41:14 boincadm Exp $
-
- # projectxml.py - module to read and parse project.xml
Added: branches/breezy/boinc/debian/patches/07_use-sensible-browser.dpatch
===================================================================
--- branches/breezy/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-04-14 19:41:25 UTC (rev 401)
@@ -0,0 +1,62 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_use-sensible-browser.dpatch by Frank S. Thomas <frank at thomas-alfeld.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch is Debian specific. Don't use it for non Debian
+## DP: packages. The program "sensible-browser", which is part of the
+## DP: essential package debianutils, also uses the BROWSER variable, so
+## DP: we don't loose functionality here.
+
+ at DPATCH@
+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__)
+ if (!mime_type_found) {
+- cmd = ::wxGetenv(wxT("BROWSER"));
+- if(cmd.IsEmpty()) {
+- wxString strDialogTitle = wxEmptyString;
+- wxString strDialogMessage = wxEmptyString;
+-
+- // %s is the application name
+- // i.e. 'BOINC Manager', 'GridRepublic Manager'
+- strDialogTitle.Printf(
+- _("%s - Can't find web browser"),
+- wxGetApp().GetBrand()->GetApplicationName().c_str()
+- );
+-
+- // 1st %s is the application name
+- // i.e. 'BOINC Manager', 'GridRepublic Manager'
+- // 2nd %s is the URL that the browser is supposed to
+- // open.
+- // 3rd %s is the application name
+- // i.e. 'BOINC Manager', 'GridRepublic Manager'
+- strDialogMessage.Printf(
+- _("%s tried to display the web page\n"
+- "\t%s\n"
+- "but couldn't find a web browser.\n"
+- "To fix this, set the environment variable\n"
+- "BROWSER to the path of your web browser,\n"
+- "then restart the %s."),
+- wxGetApp().GetBrand()->GetApplicationName().c_str(),
+- strLink.c_str(),
+- wxGetApp().GetBrand()->GetApplicationName().c_str()
+- );
+-
+- ::wxMessageBox(
+- strDialogMessage,
+- strDialogTitle,
+- wxOK | wxICON_INFORMATION
+- );
+- } else {
+- cmd += wxT(" ") + strLink;
+- ::wxExecute(cmd,wxEXEC_ASYNC);
+- }
++ cmd = wxT("sensible-browser");
++ cmd += wxT(" ") + strLink;
++ ::wxExecute(cmd,wxEXEC_ASYNC);
+ }
+ #endif
+ }
Property changes on: branches/breezy/boinc/debian/patches/07_use-sensible-browser.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/breezy/boinc/debian/patches/10_exclude-sea.dpatch
===================================================================
--- branches/breezy/boinc/debian/patches/10_exclude-sea.dpatch 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/patches/10_exclude-sea.dpatch 2006-04-14 19:41:25 UTC (rev 401)
@@ -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/breezy/boinc/debian/patches/10_exclude-sea.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/breezy/boinc/debian/rules
===================================================================
--- branches/breezy/boinc/debian/rules 2006-04-14 15:25:47 UTC (rev 400)
+++ branches/breezy/boinc/debian/rules 2006-04-14 19:41:25 UTC (rev 401)
@@ -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_client.xml
docbook2x-man debian/manpages/boinc_cmd.xml
docbook2x-man debian/manpages/boincmgr.xml
@@ -84,6 +99,12 @@
-$(MAKE) distclean
dh_clean \
+ client/boinc.unmodified \
+ clientgui/boincmgr.unmodified \
+ lib/boinccmd \
+ lib/boinccmd.unmodified
+
+ dh_clean \
boinc_client.1 \
boinc_cmd.1 \
boincmgr.1
@@ -95,8 +116,6 @@
clientgui/Makefile.in \
db/Makefile.in \
lib/Makefile.in \
- lib/boinccmd \
- lib/boinccmd.unmodified \
m4/Makefile.in \
py/Makefile.in \
py/Boinc/Makefile.in \
@@ -152,15 +171,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
-# #
-# 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
@@ -176,7 +186,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