[pkg-boinc-commits] r455 - in branches/sarge/boinc/debian: . extra
icons manpages patches
Frank S. Thomas
fst-guest at costa.debian.org
Tue Jun 13 16:04:36 UTC 2006
Author: fst-guest
Date: 2006-06-13 16:04:34 +0000 (Tue, 13 Jun 2006)
New Revision: 455
Added:
branches/sarge/boinc/debian/boinc-manager.README.Debian
branches/sarge/boinc/debian/boinc-manager.desktop
branches/sarge/boinc/debian/boinc-manager.install
branches/sarge/boinc/debian/boinc-manager.manpages
branches/sarge/boinc/debian/boinc-manager.menu
branches/sarge/boinc/debian/extra/update-boinc-applinks
branches/sarge/boinc/debian/icons/
branches/sarge/boinc/debian/icons/boincmgr-16.xpm
branches/sarge/boinc/debian/icons/boincmgr-32.xpm
branches/sarge/boinc/debian/manpages/boincmgr.xml
branches/sarge/boinc/debian/manpages/update-boinc-applinks.xml
branches/sarge/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
branches/sarge/boinc/debian/patches/07_use-sensible-browser.dpatch
Removed:
branches/sarge/boinc/debian/patches/01_add-assert-header.dpatch
branches/sarge/boinc/debian/watch
Modified:
branches/sarge/boinc/debian/boinc-client.README.Debian
branches/sarge/boinc/debian/boinc-client.init
branches/sarge/boinc/debian/boinc-client.install
branches/sarge/boinc/debian/boinc-client.manpages
branches/sarge/boinc/debian/boinc-client.postinst
branches/sarge/boinc/debian/boinc-dev.install
branches/sarge/boinc/debian/boinc-dev.links
branches/sarge/boinc/debian/changelog
branches/sarge/boinc/debian/control
branches/sarge/boinc/debian/patches/00list
branches/sarge/boinc/debian/rules
Log:
Resynchronized with pkg-boinc/trunk/boinc, revision 454. I also added all
BOINC Manager stuff to make the diff as small as possible.
Modified: branches/sarge/boinc/debian/boinc-client.README.Debian
===================================================================
--- branches/sarge/boinc/debian/boinc-client.README.Debian 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-client.README.Debian 2006-06-13 16:04:34 UTC (rev 455)
@@ -7,10 +7,15 @@
http://wiki.debian.org/BOINC
+Contents:
+ 1. Configuring the BOINC core client
+ 2. Installing and configuring BOINC application packages
+ 3. Moving a BOINC data directory to /var/lib/boinc-client
-Configuring the BOINC core client
----------------------------------
+1. Configuring the BOINC core client
+------------------------------------
+
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
@@ -29,9 +34,34 @@
for more information.
-Moving a BOINC data directory to /var/lib/boinc-client
-------------------------------------------------------
+2. Installing and configuring BOINC application packages
+--------------------------------------------------------
+Normally the BOINC core client downloads project's applications itself
+if they are available for the platform (e.g. i686-pc-linux-gnu) the
+client was build for. If this is not the case, one can install Debian
+packages of these applications. These packages are called
+'boinc-app-<project>' where <project> is an abbreviation of the project
+name, e.g. 'boinc-app-seti' or 'boinc-app-einstein'. To get a list of
+all available application packages run:
+
+ % apt-cache search boinc-app-*
+
+If you are using the default BOINC data directory
+'/var/lib/boinc-client' just installing 'boinc-app-<project>' packages
+is enough. If you are not using the default data directory you have to
+create some symbolic links manually. E.g if your BOINC data directory
+is '/home/john/boinc' just run
+
+ % update-boinc-applinks --create --data-dir=/home/john/boinc
+
+after the installation of the 'boinc-app-<project>' package and restart
+your BOINC core client.
+
+
+3. Moving a BOINC data directory to /var/lib/boinc-client
+---------------------------------------------------------
+
To move an existing BOINC data directory to Debian's default directory
follow these instructions:
Modified: branches/sarge/boinc/debian/boinc-client.init
===================================================================
--- branches/sarge/boinc/debian/boinc-client.init 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-client.init 2006-06-13 16:04:34 UTC (rev 455)
@@ -1,7 +1,18 @@
#! /bin/sh
+### BEGIN INIT INFO
+# Provides: boinc_client
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: BOINC core client
+# Description: core client for the BOINC distributed computing
+# infrastructure
+### END INIT INFO
+
# Debian init.d script for the BOINC core client
-# Copyright © 2005 Debian BOINC Maintainers
-# <pkg-boinc-devel at lists.alioth.debian.org>
+# Copyright © 2005, 2006
+# Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
#
# This file is licensed under the terms of the GNU General Public License,
# Version 2 or any later version published by the Free Software Foundation.
@@ -22,21 +33,21 @@
if [ ! -x "$BOINC_CLIENT" ]; then
echo "BOINC client '$BOINC_CLIENT' does not exist or is not executable." >&2
- exit 2
+ exit 5
fi
if [ ! -d "$BOINC_DIR" ]; then
- echo "BOINC working directory '$BOINC_DIR' does not exist." >&2
- exit 3
+ echo "BOINC data directory '$BOINC_DIR' does not exist." >&2
+ exit 6
fi
if [ -z "$BOINC_USER" ]; then
echo "BOINC_USER variable is empty. Set it to a user to run " \
"the BOINC core client." >&2
- exit 7
+ exit 6
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/sarge/boinc/debian/boinc-client.install
===================================================================
--- branches/sarge/boinc/debian/boinc-client.install 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-client.install 2006-06-13 16:04:34 UTC (rev 455)
@@ -1,4 +1,5 @@
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
+debian/extra/gui_rpc_auth.cfg etc/boinc-client
+debian/extra/remote_hosts.cfg etc/boinc-client
+debian/extra/update-boinc-applinks usr/bin
+debian/tmp/usr/bin/boinc_cmd usr/bin
Modified: branches/sarge/boinc/debian/boinc-client.manpages
===================================================================
--- branches/sarge/boinc/debian/boinc-client.manpages 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-client.manpages 2006-06-13 16:04:34 UTC (rev 455)
@@ -1,2 +1,3 @@
boinc_client.1
boinc_cmd.1
+update-boinc-applinks.1
Modified: branches/sarge/boinc/debian/boinc-client.postinst
===================================================================
--- branches/sarge/boinc/debian/boinc-client.postinst 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-client.postinst 2006-06-13 16:04:34 UTC (rev 455)
@@ -17,8 +17,14 @@
case "$1" in
configure)
+ # Create boinc group if it doesn't already exist.
+ if ! getent group boinc >/dev/null; then
+ addgroup --quiet --system boinc
+ fi
+
+ # Create boinc user if it doesn't already exist.
if ! getent passwd boinc >/dev/null; then
- adduser --quiet --system --group --home $BOINC_DIR \
+ adduser --quiet --system --ingroup boinc --home $BOINC_DIR \
--gecos "BOINC core client" boinc
fi
Modified: branches/sarge/boinc/debian/boinc-dev.install
===================================================================
--- branches/sarge/boinc/debian/boinc-dev.install 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-dev.install 2006-06-13 16:04:34 UTC (rev 455)
@@ -3,6 +3,10 @@
api/graphics_data.h usr/include/BOINC/api
api/reduce.h usr/include/BOINC/api
+api/boinc_gl.h usr/include/BOINC/api
+api/txf_util.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
+config.h usr/share/boinc-dev
+version.h usr/share/boinc-dev
Modified: branches/sarge/boinc/debian/boinc-dev.links
===================================================================
--- branches/sarge/boinc/debian/boinc-dev.links 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-dev.links 2006-06-13 16:04:34 UTC (rev 455)
@@ -18,6 +18,7 @@
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/boinc_gl.h usr/share/boinc-dev/api/boinc_gl.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
Added: branches/sarge/boinc/debian/boinc-manager.README.Debian
===================================================================
--- branches/sarge/boinc/debian/boinc-manager.README.Debian 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-manager.README.Debian 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,23 @@
+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. If this does not work, set the alternative
+manually (Firefox is used in this example):
+
+ % update-alternatives --set x-www-browser /usr/bin/firefox
Added: branches/sarge/boinc/debian/boinc-manager.desktop
===================================================================
--- branches/sarge/boinc/debian/boinc-manager.desktop 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-manager.desktop 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+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
+GenericName=BOINC monitor and control utility
+GenericName[de]=BOINC Überwachungs- und Kontrollprogramm
+Comment=Configure or monitor a BOINC core client
+Comment[de]=BOINC Basis Client konfigurieren oder überwachen
Added: branches/sarge/boinc/debian/boinc-manager.install
===================================================================
--- branches/sarge/boinc/debian/boinc-manager.install 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-manager.install 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,2 @@
+debian/icons/boincmgr-*.xpm usr/share/pixmaps
+debian/boinc-manager.desktop usr/share/applications
Added: branches/sarge/boinc/debian/boinc-manager.manpages
===================================================================
--- branches/sarge/boinc/debian/boinc-manager.manpages 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-manager.manpages 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1 @@
+boincmgr.1
Added: branches/sarge/boinc/debian/boinc-manager.menu
===================================================================
--- branches/sarge/boinc/debian/boinc-manager.menu 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/boinc-manager.menu 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,9 @@
+?package(boinc-manager):\
+ needs="X11"\
+ section="Apps/Tools"\
+ hints="BOINC,Science,Monitoring"\
+ title="BOINC Manager"\
+ longtitle="monitoring utility for the BOINC core client"\
+ icon16x16="/usr/share/pixmaps/boincmgr-16.xpm"\
+ icon32x32="/usr/share/pixmaps/boincmgr-32.xpm"\
+ command="/usr/bin/boincmgr"
Modified: branches/sarge/boinc/debian/changelog
===================================================================
--- branches/sarge/boinc/debian/changelog 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/changelog 2006-06-13 16:04:34 UTC (rev 455)
@@ -1,13 +1,49 @@
-boinc (5.4.3-1sarge1) stable; urgency=low
+boinc (5.4.9-2) unstable; urgency=low
+ * NOT RELEASED YET
+
[ Frank S. Thomas ]
- * Synchronized with pkg-boinc/trunk/boinc, revision 399.
+ * debian/control:
+ - Really bumped the Standards-Version to 3.7.2.
+ * Added the boinc_gl.h header to the boinc-dev package. This file is needed
+ to compile SETI at home's graphics component.
* debian/patches/:
- - Added 01_add-assert-header.dpatch which is needed to compile BOINC on
- Sarge.
+ - Added new 03_wx2.6-with-unicode.dpatch to display the AM name correctly.
+ See also Ubuntu bug #48246.
+ * Added a hint to use "update-alternatives --set x-www-browser [...]" to
+ manually set the x-www-browser alternative to boinc-manager's
+ README.Debian. See Ubuntu bug #48766 for more details.
+ * Use /usr/bin/python as interpreter for update-boinc-applinks instead of
+ /usr/bin/python2.4 and make boinc-client depend on "python (>= 2.3)" to
+ avoid the unnecessary strict dependency on Python 2.4.
+ * Made debian/rules compatible with sarge's version of dpkg-architecture and
+ added libcurl-ssl-dev as alternative for the libcurl3-openssl-dev build
+ dependency. These changes aid in backporting BOINC to sarge. Thanks to
+ Robert Millan for the patch. (closes: #373089)
+ * debian/boinc-client.postinst:
+ - Make sure that the group boinc exists before trying to create the user
+ boinc. Thanks to Christoph Martin for the report. (closes: #372950)
- -- Frank S. Thomas <frank at thomas-alfeld.de> Fri, 14 Apr 2006 16:19:31 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Tue, 13 Jun 2006 12:00:49 +0200
+boinc (5.4.9-1) unstable; urgency=low
+
+ [ Frank S. Thomas ]
+ * New upstream release.
+ - Really fix the connection to a remote machine bug. (closes: #360143)
+ - Fix another FTBFS bug with G++ 4.1, thanks again to Martin Michlmayr.
+ (closes: #358650)
+ * Removed watch file because upstream stopped providing nightly tarballs.
+ * debian/control:
+ - Bumped Standards-Version from 3.6.2 to 3.7.2, no changes required.
+ * debian/patches/:
+ - Removed 02_wx2.6-configure.ac.dpatch and 03_wx2.6-with-unicode.dpatch,
+ both were included upstream.
+ - Updated 07_use-sensible-browser.dpatch to use sensible-browser only,
+ because upstream's attempt to start a browser fails miserably.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Sat, 6 May 2006 16:41:01 +0200
+
boinc (5.4.3-1) unstable; urgency=low
[ Frank S. Thomas ]
@@ -28,8 +64,13 @@
* 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)
+ * Added the update-boinc-applinks tool that creates (or removes) 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). Note that
+ currently there are no boinc-app-* packages in the Debian archive.
- -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 13 Apr 2006 16:33:57 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Sun, 16 Apr 2006 00:29:41 +0200
boinc (5.2.15-3) unstable; urgency=low
@@ -128,7 +169,7 @@
* New upstream release.
[ Frank S. Thomas]
- * First attempt to backport BOINC to Debian 3.1 ("sarge").
+ * First attempt to backport BOINC to Debian 3.1 ("sarge").
- Remove the boinc-manager package because it needs wxWidgets 2.6,
which is not available in sarge.
- Don't use LSB init-functions and remove the dependency on lsb-base
@@ -165,12 +206,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.
@@ -214,7 +255,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/sarge/boinc/debian/control
===================================================================
--- branches/sarge/boinc/debian/control 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/control 2006-06-13 16:04:34 UTC (rev 455)
@@ -4,12 +4,12 @@
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.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 (>= 4.2.21), dpatch, libmysqlclient14-dev, zlib1g-dev, libssl-dev, libcurl3-dev (>= 7.13.2), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), autotools-dev, docbook2x, docbook-xml, dh-buildinfo
+Build-Depends: debhelper (>= 4.2.21), dpatch, zlib1g-dev, libssl-dev, libcurl3-dev (>= 7.13.2) | libcurl-ssl-dev, freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), autotools-dev, docbook2x, docbook-xml, dh-buildinfo
Package: boinc-client
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser
Suggests: kboincspy
Description: core client for the BOINC distributed computing infrastructure
The Berkeley Open Infrastructure for Network Computing (BOINC) is a
Added: branches/sarge/boinc/debian/extra/update-boinc-applinks
===================================================================
--- branches/sarge/boinc/debian/extra/update-boinc-applinks 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/extra/update-boinc-applinks 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,120 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# This script creates symlinks for anonymous BOINC applications.
+# Copyright © 2006 Debian BOINC Maintainers
+# <pkg-boinc-devel at lists.alioth.debian.org>
+#
+# This file is licensed under the terms of the GNU General Public License,
+# Version 2 or any later version published by the Free Software Foundation.
+#
+# $Id: update-boinc-applinks 451 2006-06-13 06:26:05Z fst-guest $
+
+import ConfigParser
+import optparse
+import os
+import sys
+
+APPS_INFO_DIR = '/usr/share/boinc-apps/info/'
+
+def main():
+ opts = parse_options()
+
+ if not os.path.isdir(APPS_INFO_DIR):
+ sys.exit(0)
+
+ projects = parse_app_info_files()
+
+ # Show list of all available projects.
+ if opts.list_projects == True:
+ for project in projects:
+ print project
+
+ # Manage symbolic links and directories.
+ if opts.create == None:
+ return
+ for project in projects:
+ if opts.project == '' or project == opts.project:
+ for url in projects[project]['urls']:
+ project_dir = opts.data_dir + '/projects/' + url + '/'
+ manage_symlink(projects[project]['app_info'],
+ project_dir + 'app_info.xml', opts.create)
+
+ for app_src in projects[project]['apps']:
+ app_dst = project_dir + os.path.basename(app_src)
+ manage_symlink(app_src, app_dst, opts.create)
+ return
+
+def get_list(res):
+ """ convert a space separated option value to a list """
+ res = res.replace('\n', ' ')
+ if ' ' in res:
+ res = res.split(' ')
+ else:
+ res = [res]
+ while '' in res:
+ res.remove('')
+ return res
+
+def parse_app_info_files():
+ projects = {}
+
+ for file in os.listdir(APPS_INFO_DIR):
+ if file.endswith('.cfg'):
+ cfg = ConfigParser.ConfigParser()
+ cfg.readfp(open(APPS_INFO_DIR + file))
+
+ project = cfg.get('DEFAULT', 'project')
+ cfg.remove_option('DEFAULT', 'project')
+
+ projects[project] = {}
+ list_options = ['apps', 'urls']
+ for item in cfg.items('DEFAULT'):
+ if item[0] in list_options:
+ projects[project][item[0]] = get_list(item[1])
+ else:
+ projects[project][item[0]] = item[1]
+ return projects
+
+def manage_symlink(src, dst, bool):
+ dirname = os.path.dirname(dst)
+
+ try:
+ if bool == True:
+ if not os.path.isdir(dirname):
+ os.makedirs(dirname)
+ os.symlink(src, dst)
+ else:
+ if os.path.isfile(dst) and not os.path.islink(dst):
+ return
+ elif os.path.islink(dst):
+ os.remove(dst)
+ os.removedirs(dirname)
+ except OSError:
+ pass
+ return
+
+def parse_options():
+ parser = optparse.OptionParser()
+
+ parser.add_option('--create', action='store_true', dest='create',
+ help='create symlinks and project directories')
+
+ parser.add_option('--remove', action='store_false', dest='create',
+ help='remove symlinks and empty project directories')
+
+ parser.add_option('--data-dir', dest='data_dir', default='.',
+ metavar='DIR', help='destination directory for the symlinks')
+
+ parser.add_option('--project', dest='project', default='',
+ metavar='PROJECT', help='create only symlinks for project PROJECT')
+
+ parser.add_option('--list-projects', action='store_true',
+ dest='list_projects', default=False,
+ help='list all available projects')
+
+ (opts, args) = parser.parse_args()
+ return opts
+
+if __name__ == '__main__':
+ main()
Property changes on: branches/sarge/boinc/debian/extra/update-boinc-applinks
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/sarge/boinc/debian/icons/boincmgr-16.xpm
===================================================================
--- branches/sarge/boinc/debian/icons/boincmgr-16.xpm 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/icons/boincmgr-16.xpm 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,51 @@
+/* XPM */
+static char * boinc_gui_16_xpm[] = {
+"16 16 32 1",
+" c None",
+". c #000066",
+"+ c #000033",
+"@ c #333333",
+"# c #555555",
+"$ c #000080",
+"% c #4D4D4D",
+"& c #996666",
+"* c #393939",
+"= c #000099",
+"- c #424242",
+"; c #FFCC99",
+"> c #FFCC66",
+", c #999933",
+"' c #808080",
+") c #CC9966",
+"! c #CC9933",
+"~ c #CCCC33",
+"{ c #333366",
+"] c #292929",
+"^ c #FFCC33",
+"/ c #5F5F5F",
+"( c #666633",
+"_ c #333399",
+": c #666666",
+"< c #996633",
+"[ c #CCCC66",
+"} c #666699",
+"| c #777777",
+"1 c #666600",
+"2 c #868686",
+"3 c #969696",
+" .+@# ",
+" $.++++++# ",
+" $.++%&&&*+# ",
+" =$+-;;;>>>,+' ",
+" =$$+);>!.~~,{* ",
+" $$.+]>^/.^,(#{ ",
+"_$$.+:>^#!^<#{{%",
+"$$.++[^!,~^<-{]]",
+"...+]>!:}%^!<{@]",
+"{.++(>!|_+!!1#{{",
+" +++,^,{++^(#}{ ",
+" +++<^<++!,-2}{ ",
+" |+++!!!!</32/ ",
+" /++(((:22}/ ",
+" |@{:22}:# ",
+" |::| "};
Added: branches/sarge/boinc/debian/icons/boincmgr-32.xpm
===================================================================
--- branches/sarge/boinc/debian/icons/boincmgr-32.xpm 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/icons/boincmgr-32.xpm 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,78 @@
+/* XPM */
+static char * boinc_gui_32_xpm[] = {
+"32 32 43 1",
+" c None",
+". c #CBCBCB",
+"+ c #9999CC",
+"@ c #666699",
+"# c #333399",
+"$ c #6666CC",
+"% c #333366",
+"& c #000080",
+"* c #000066",
+"= c #000033",
+"- c #0C0C0C",
+"; c #333333",
+"> c #666666",
+", c #996666",
+"' c #ADA990",
+") c #666633",
+"! c #1C1C1C",
+"~ c #5F5F5F",
+"{ c #CCCC99",
+"] c #FFFF99",
+"^ c #FFCC99",
+"/ c #FFCC66",
+"( c #555555",
+"_ c #999966",
+": c #FFCC33",
+"< c #CC9933",
+"[ c #424242",
+"} c #996633",
+"| c #777777",
+"1 c #CCCC33",
+"2 c #999933",
+"3 c #663300",
+"4 c #393939",
+"5 c #292929",
+"6 c #CC9966",
+"7 c #333300",
+"8 c #4D4D4D",
+"9 c #868686",
+"0 c #330066",
+"a c #CCCC66",
+"b c #222222",
+"c c #808080",
+"d c #A0A0A4",
+" .+++++++ ",
+" ++@@@####@@@ ",
+" +$@#%&*****%%##@ ",
+" +@#***=========*%%@ ",
+" @#%*===-------===**%# ",
+" @#**==--;>,''''>)!=***# ",
+" @#**==-~{]]^^/^^^//(=***# ",
+" @#&**=-_]]^/:<<:://::[**** ",
+" +@%***=[^^//:})|~1:::<)%%**% ",
+" @#****=2//::23~@*<::<))##*** ",
+" $#&*****451:1}3|#=6/1)7(@#***% ",
+" @#*****==8//1})%=5^:}7;9@#***= ",
+"+#%*****==_//12)*!{^:);9$@%***=|",
+"$#*****==!^/:<<(;{^/<)@@##*****%",
+"@#*****==)^/:<}2://:}(*********;",
+"##*****=-_^/<}))}<<::::(*******=",
+"#%*****=-^/:23>+@(}1::::4*****==",
+"#%****==8^/:}79+@%0::::<)%%***=5",
+"@%****==_^/<3[@@#*=<::<})##***=[",
+"$%****=-a/:}7~@#*==6/:}3(@#***=|",
+" *****=5//1);@@%==!^/<37|@#***= ",
+" %****=(/:<)(#%==->^:)7>+@%**=5 ",
+" ****=)::<}&*=--;^:}7~+@#&**= ",
+" %****;<::<);--~^:}7>+$@%**=b ",
+" *****=<:::/^^/:)[c+$@%**== ",
+" #****4<<<<<<<);|++@#%**==( ",
+" %****()3777[|+++@#%**==4 ",
+" %=**#@@|cd+++@#%***==4 ",
+" (=0%#@@@@@@#%&**==-( ",
+" ;=%%%###%***===b ",
+" 5=========-5 ",
+" |[b==b[| "};
Added: branches/sarge/boinc/debian/manpages/boincmgr.xml
===================================================================
--- branches/sarge/boinc/debian/manpages/boincmgr.xml 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/manpages/boincmgr.xml 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ This is the manual page for the BOINC manager (boincmgr), a monitor and
+ control utility for the core client.
+
+ This file is licensed under the terms of the GNU General Public License,
+ Version 2 or any later version published by the Free Software Foundation.
+
+ Copyright © 2005, 2006 Debian BOINC Maintainers
+-->
+
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"file:///usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd" [
+
+ <!ENTITY dhgroupname "Debian BOINC Maintainers">
+ <!ENTITY dhgroupmail "<email>pkg-boinc-devel at lists.alioth.debian.org</email>">
+
+ <!ENTITY dhbinary "boincmgr">
+ <!ENTITY dhdate "<date>January 27, 2006</date>">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhgroupmail;
+ </address>
+ <author>
+ <firstname>Frank</firstname>
+ <lastname>Thomas</lastname>
+ <email>frank at thomas-alfeld.de</email>
+ </author>
+ <copyright>
+ <year>2005</year>
+ <year>2006</year>
+ <holder>&dhgroupname;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>&dhbinary;</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>&dhbinary;</refname>
+ <refpurpose>The graphical BOINC manager for the core client.</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhbinary;</command>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>The BOINC manager (<command>&dhbinary;</command>) is a controling
+ and monitoring utility for the BOINC core client.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>OPTIONS</title>
+ <para>A full summary of options is included below.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>-h, --help</option></term>
+ <listitem>
+ <para>Show all options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--verbose</option></term>
+ <listitem>
+ <para>Generate verbose log messages.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>-s, --systray</option></term>
+ <listitem>
+ <para>Startup BOINC Manager so only the system tray icon is
+ visible.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>SEE ALSO</title>
+ <para><ulink url="http://boinc.berkeley.edu/manager.php"
+ >http://boinc.berkeley.edu/manager.php</ulink></para>
+ </refsect1>
+
+ <refsect1>
+ <title>AUTHOR</title>
+ <para>This manual page was written by the &dhgroupname;
+ <&dhgroupmail;> for the &debian; project (but may be used by
+ others). Permission is granted to copy, distribute and/or modify this
+ document under the terms of the &gnu; General Public License, Version 2
+ or any later version published by the Free Software Foundation.</para>
+ </refsect1>
+</refentry>
Added: branches/sarge/boinc/debian/manpages/update-boinc-applinks.xml
===================================================================
--- branches/sarge/boinc/debian/manpages/update-boinc-applinks.xml 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/manpages/update-boinc-applinks.xml 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ This is the manual page for update-boinc-applinks, a tool that creates/removes
+ symlinks for anonymous platform applications and their associated app_info.xml
+ files in a given BOINC data directory.
+
+ This file is licensed under the terms of the GNU General Public License,
+ Version 2 or any later version published by the Free Software Foundation.
+
+ Copyright © 2006 Debian BOINC Maintainers
+-->
+
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"file:///usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd" [
+
+ <!ENTITY dhgroupname "Debian BOINC Maintainers">
+ <!ENTITY dhgroupmail "<email>pkg-boinc-devel at lists.alioth.debian.org</email>">
+
+ <!ENTITY dhbinary "update-boinc-applinks">
+ <!ENTITY dhdate "<date>March 05, 2006</date>">
+
+ <!ENTITY debian "<productname>Debian</productname>">
+ <!ENTITY gnu "<acronym>GNU</acronym>">
+ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+ <refentryinfo>
+ <address>
+ &dhgroupmail;
+ </address>
+ <author>
+ <firstname>Frank</firstname>
+ <lastname>Thomas</lastname>
+ <email>frank at thomas-alfeld.de</email>
+ </author>
+ <copyright>
+ <year>2006</year>
+ <holder>&dhgroupname;</holder>
+ </copyright>
+ &dhdate;
+ </refentryinfo>
+
+ <refmeta>
+ <refentrytitle>&dhbinary;</refentrytitle>
+ <manvolnum>1</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+ <refname>&dhbinary;</refname>
+ <refpurpose>create/remove symbolic links for anonymous BOINC
+ applications</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>&dhbinary;</command>
+ <arg><replaceable>options</replaceable></arg>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>DESCRIPTION</title>
+ <para>&dhbinary; creates (or removes) symbolic links for anonymous BOINC
+ applications and their associated app_info.xml files in a given BOINC
+ data directory.</para>
+ <para>Note: &dhbinary; is an extension for &debian; users and is only
+ available in &debian;'s boinc-client package.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>OPTIONS</title>
+ <para>For a full summary of options, run <command>&dhbinary;
+ --help</command>.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term><option>-h, --help</option></term>
+ <listitem>
+ <para>Show help message and all options.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--create</option></term>
+ <listitem>
+ <para>Create symbolic links and project directories.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><option>--remove</option></term>
+ <listitem>
+ <para>Remove symbolic links and empty project directories.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>--data-dir=<replaceable>DIR</replaceable></option>
+ </term>
+ <listitem>
+ <para>Manage symbolic links in the given directory
+ <replaceable>DIR</replaceable>. If this option is not present,
+ <replaceable>DIR</replaceable> defaults to the current working
+ directory.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>--project=<replaceable>PROJECT</replaceable></option>
+ </term>
+ <listitem>
+ <para>Manage symbolic links only for the given project
+ <replaceable>PROJECT</replaceable>.
+ Run <command>&dhbinary; --list-projects</command> to get a list
+ of projects for which anonymous applications are available and
+ therefore can be replaced with
+ <replaceable>PROJECT</replaceable>. If this option is not present,
+ &dhbinary; will manage symbolic links for all available
+ projects.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <option>--list-projects</option>
+ </term>
+ <listitem>
+ <para>Show a list of projects for which anonymous applications are
+ available. Normally those applications are provided by packages
+ called boinc-app-<replaceable>PROJECT</replaceable>
+ (e.g. boinc-app-seti).</para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
+ </refsect1>
+
+ <refsect1>
+ <title>AUTHOR</title>
+ <para>Written by Frank S. Thomas.</para>
+ </refsect1>
+
+ <refsect1>
+ <title>COPYRIGHT</title>
+ <para>Copyright © 2006 &dhgroupname;.</para>
+ <para>
+ This is free software; you can redistribute it and/or modify it under the
+ terms of the &gnu; General Public License, Version 2 or any later version
+ published by the Free Software Foundation.</para>
+ </refsect1>
+</refentry>
Modified: branches/sarge/boinc/debian/patches/00list
===================================================================
--- branches/sarge/boinc/debian/patches/00list 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/patches/00list 2006-06-13 16:04:34 UTC (rev 455)
@@ -1,2 +1,3 @@
-01_add-assert-header.dpatch
+03_wx2.6-with-unicode.dpatch
+07_use-sensible-browser.dpatch
10_exclude-sea.dpatch
Deleted: branches/sarge/boinc/debian/patches/01_add-assert-header.dpatch
===================================================================
--- branches/sarge/boinc/debian/patches/01_add-assert-header.dpatch 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/patches/01_add-assert-header.dpatch 2006-06-13 16:04:34 UTC (rev 455)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## add-assert-header.dpatch by Frank S. Thomas <frank at thomas-alfeld.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad boinc-5.4.3~/client/cpu_sched.C boinc-5.4.3/client/cpu_sched.C
---- boinc-5.4.3~/client/cpu_sched.C 2006-04-05 07:50:34.000000000 +0200
-+++ boinc-5.4.3/client/cpu_sched.C 2006-04-14 17:07:32.000000000 +0200
-@@ -20,6 +20,8 @@
- #include "client_msgs.h"
- #include "client_state.h"
-
-+#include <assert.h>
-+
- using std::vector;
-
- #define MAX_DEBT (86400)
Added: branches/sarge/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
===================================================================
--- branches/sarge/boinc/debian/patches/03_wx2.6-with-unicode.dpatch 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/patches/03_wx2.6-with-unicode.dpatch 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,65 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_wx2.6-with-unicode.dpatch by Frank S. Thomas <frank at thomas-alfeld.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad boinc-5.4.9~/clientgui/MainFrame.cpp boinc-5.4.9/clientgui/MainFrame.cpp
+--- boinc-5.4.9~/clientgui/MainFrame.cpp 2006-05-02 20:17:44.000000000 +0200
++++ boinc-5.4.9/clientgui/MainFrame.cpp 2006-06-11 12:45:37.000000000 +0200
+@@ -366,11 +366,11 @@
+ } else {
+ strMenuName.Printf(
+ _("&Synchronize with %s"),
+- ami.acct_mgr_name.c_str()
++ wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
+ );
+ strMenuDescription.Printf(
+ _("Get current settings from %s"),
+- ami.acct_mgr_name.c_str()
++ wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
+ );
+ menuTools->Append(
+ ID_TOOLSAMUPDATENOW,
+@@ -448,7 +448,7 @@
+ if (is_acct_mgr_detected) {
+ strMenuName.Printf(
+ _("&Defect from %s"),
+- ami.acct_mgr_name.c_str()
++ wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
+ );
+ menuAdvanced->Append(
+ ID_ADVANCEDAMDEFECT,
+@@ -1220,7 +1220,7 @@
+
+ strTitle.Printf(
+ _("BOINC Manager - Detach from %s"),
+- ami.acct_mgr_name.c_str()
++ wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
+ );
+ strMessage.Printf(
+ _("If you defect from %s,\n"
+@@ -1228,8 +1228,8 @@
+ "but you'll have to manage projects manually.\n"
+ "\n"
+ "Do you want to defect from %s?"),
+- ami.acct_mgr_name.c_str(),
+- ami.acct_mgr_name.c_str()
++ wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str(),
++ wxString(ami.acct_mgr_name.c_str(), wxConvUTF8).c_str()
+ );
+
+ iAnswer = ::wxMessageBox(
+diff -urNad boinc-5.4.9~/clientgui/ViewTransfers.cpp boinc-5.4.9/clientgui/ViewTransfers.cpp
+--- boinc-5.4.9~/clientgui/ViewTransfers.cpp 2006-04-18 02:49:47.000000000 +0200
++++ boinc-5.4.9/clientgui/ViewTransfers.cpp 2006-06-11 12:49:00.000000000 +0200
+@@ -188,7 +188,7 @@
+ _("Are you sure you want to abort this file transfer '%s'?\n"
+ "NOTE: Aborting a transfer will invalidate a task and you\n"
+ "will not receive credit for it."),
+- pDoc->file_transfer(m_pListPane->GetFirstSelected())->name.c_str()
++ wxString(pDoc->file_transfer(m_pListPane->GetFirstSelected())->name.c_str(), wxConvUTF8).c_str()
+ );
+
+ iAnswer = ::wxMessageBox(
Property changes on: branches/sarge/boinc/debian/patches/03_wx2.6-with-unicode.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/sarge/boinc/debian/patches/07_use-sensible-browser.dpatch
===================================================================
--- branches/sarge/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/patches/07_use-sensible-browser.dpatch 2006-06-13 16:04:34 UTC (rev 455)
@@ -0,0 +1,94 @@
+#! /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.9~/clientgui/hyperlink.cpp boinc-5.4.9/clientgui/hyperlink.cpp
+--- boinc-5.4.9~/clientgui/hyperlink.cpp 2006-03-09 11:21:07.000000000 +0100
++++ boinc-5.4.9/clientgui/hyperlink.cpp 2006-05-06 16:10:25.000000000 +0200
+@@ -166,77 +166,9 @@
+ // private functions
+
+ void wxHyperLink::ExecuteLink (const wxString &strLink) {
+- wxString cmd;
+- wxString strMimeType = wxEmptyString;
+- bool mime_type_found = false;
+-
+- if (strLink.StartsWith(wxT("http://")))
+- strMimeType = wxT("text/html");
+- else if (strLink.StartsWith(wxT("ftp://")))
+- strMimeType = wxT("text/html");
+- else if (strLink.StartsWith(wxT("mailto:")))
+- strMimeType = wxT("message/rfc822");
+- else
+- return;
+-
+- wxFileType* ft = wxTheMimeTypesManager->GetFileTypeFromMimeType(strMimeType);
+- if (ft) {
+- if (ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(strLink))) {
+-#ifdef __WXMAC__
+- cmd.Replace(wxT("<"), wxEmptyString);
+- cmd.Prepend(wxT("open "));
+-#else
+- cmd.Replace(wxT("file://"), wxEmptyString);
+-#endif
+- mime_type_found = true;
+- ::wxExecute(cmd);
+- }
+- delete ft;
+- }
+-
+-#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);
+- }
+- }
+-#endif
++ wxString cmd = wxT("sensible-browser");
++ cmd += wxT(" ") + strLink;
++ ::wxExecute(cmd,wxEXEC_ASYNC);
+ }
+
+ const char *BOINC_RCSID_d587835b7e="$Id: hyperlink.cpp,v 1.11 2006/03/09 10:21:07 rwalton Exp $";
Property changes on: branches/sarge/boinc/debian/patches/07_use-sensible-browser.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/sarge/boinc/debian/rules
===================================================================
--- branches/sarge/boinc/debian/rules 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/rules 2006-06-13 16:04:34 UTC (rev 455)
@@ -15,14 +15,23 @@
endif
# Most BOINC projects only provide their applications for i686-pc-linux-gnu.
-# If the core client reports that it was built for i386-pc-linux-gnu it won't
-# download any application or work units, so we use i686-linux as argument
+# 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
+
+# This is the same as above, but only for compatibility with sarge's version
+# of dpkg-architecture.
ifeq ($(DEB_HOST_GNU_TYPE), i386-linux)
- DEB_HOST_GNU_TYPE = i686-linux
+ DEB_HOST_GNU_TYPE = i686-linux-gnu
endif
ifeq ($(DEB_BUILD_GNU_TYPE), i386-linux)
- DEB_BUILD_GNU_TYPE = i686-linux
+ DEB_BUILD_GNU_TYPE = i686-linux-gnu
endif
CFLAGS += -g -Wall
@@ -51,7 +60,6 @@
--enable-client \
--disable-server \
--with-ssl \
- --without-wx-config \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)"
@@ -72,6 +80,8 @@
docbook2x-man debian/manpages/boinc_client.xml
docbook2x-man debian/manpages/boinc_cmd.xml
+ docbook2x-man debian/manpages/boincmgr.xml
+ docbook2x-man debian/manpages/update-boinc-applinks.xml
touch $@
build: pre-build build-stamp
@@ -100,12 +110,15 @@
dh_clean \
client/boinc.unmodified \
+ clientgui/boincmgr.unmodified \
lib/boinccmd \
lib/boinccmd.unmodified
dh_clean \
boinc_client.1 \
- boinc_cmd.1
+ boinc_cmd.1 \
+ boincmgr.1 \
+ update-boinc-applinks.1
dh_clean \
api/Makefile.in \
@@ -160,6 +173,7 @@
dh_installchangelogs -a
dh_installdocs -a
dh_installmenu -a
+ dh_desktop -a
dh_installinit -a
dh_installman -a
dh_buildinfo -a
Deleted: branches/sarge/boinc/debian/watch
===================================================================
--- branches/sarge/boinc/debian/watch 2006-06-13 10:59:14 UTC (rev 454)
+++ branches/sarge/boinc/debian/watch 2006-06-13 16:04:34 UTC (rev 455)
@@ -1,2 +0,0 @@
-version=3
-http://boinc.berkeley.edu/source/nightly/boinc-cvs-([0-9-]+)\.tar\.gz
More information about the pkg-boinc-commits
mailing list