[pkg-boinc-commits] r336 - in trunk/boinc/debian: . extra
Frank S. Thomas
fst-guest at costa.debian.org
Sun Jan 15 11:58:33 UTC 2006
Author: fst-guest
Date: 2006-01-15 11:58:29 +0000 (Sun, 15 Jan 2006)
New Revision: 336
Modified:
trunk/boinc/debian/boinc-client.default
trunk/boinc/debian/boinc-client.install
trunk/boinc/debian/boinc-manager.README.Debian
trunk/boinc/debian/changelog
trunk/boinc/debian/extra/boinc_applinks
Log:
* Don't install boinc_applinks for now.
* Other things, not worth mentioning here. :-)
Modified: trunk/boinc/debian/boinc-client.default
===================================================================
--- trunk/boinc/debian/boinc-client.default 2006-01-15 01:37:56 UTC (rev 335)
+++ trunk/boinc/debian/boinc-client.default 2006-01-15 11:58:29 UTC (rev 336)
@@ -11,7 +11,7 @@
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: trunk/boinc/debian/boinc-client.install
===================================================================
--- trunk/boinc/debian/boinc-client.install 2006-01-15 01:37:56 UTC (rev 335)
+++ trunk/boinc/debian/boinc-client.install 2006-01-15 11:58:29 UTC (rev 336)
@@ -1,3 +1,2 @@
debian/extra/gui_rpc_auth.cfg etc/boinc-client
-debian/extra/boinc_applinks usr/bin
debian/tmp/usr/bin/boinc_cmd usr/bin
Modified: trunk/boinc/debian/boinc-manager.README.Debian
===================================================================
--- trunk/boinc/debian/boinc-manager.README.Debian 2006-01-15 01:37:56 UTC (rev 335)
+++ trunk/boinc/debian/boinc-manager.README.Debian 2006-01-15 11:58:29 UTC (rev 336)
@@ -8,8 +8,8 @@
http://wiki.debian.org/BOINC
-Selecting the default web browser
----------------------------------
+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
Modified: trunk/boinc/debian/changelog
===================================================================
--- trunk/boinc/debian/changelog 2006-01-15 01:37:56 UTC (rev 335)
+++ trunk/boinc/debian/changelog 2006-01-15 11:58:29 UTC (rev 336)
@@ -1,11 +1,13 @@
-boinc (5.2.15-2) UNRELEASED; urgency=low
+boinc (5.2.15-2) unstable; urgency=low
* NOT RELEASED YET
+ * Uploaded to Debian (closes #281890).
[ Frank S. Thomas ]
- * added first draft of boinc_mk_app_links.py
+ * Added boinc-manager.README.Debian to explain how to set the web browser
+ that the BOINC Manager uses.
- -- Frank S. Thomas <frank at thomas-alfeld.de> Mon, 9 Jan 2006 19:32:28 +0100
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Sun, 15 Jan 2006 12:54:19 +0100
boinc (5.2.15-1) experimental; urgency=low
Modified: trunk/boinc/debian/extra/boinc_applinks
===================================================================
--- trunk/boinc/debian/extra/boinc_applinks 2006-01-15 01:37:56 UTC (rev 335)
+++ trunk/boinc/debian/extra/boinc_applinks 2006-01-15 11:58:29 UTC (rev 336)
@@ -14,46 +14,51 @@
import os
import sys
-app_info_dir = '/usr/share/boinc-client/app_info/'
+APPS_INFO_DIR = '/usr/share/boinc-apps/info/'
def main():
- if not os.path.isdir(app_info_dir):
+ if not os.path.isdir(APPS_INFO_DIR):
sys.exit(0)
opts = parse_options()
projects = {}
- for file in os.listdir(app_info_dir):
+ for file in os.listdir(APPS_INFO_DIR):
if file.endswith('.py'):
- if opts.project == '' or file == opts.project+'.py':
- execfile(app_info_dir + file)
+ if opts.project == '' or file[:-3] == opts.project:
+ execfile(APPS_INFO_DIR + file)
for project in projects:
for url in projects[project]['urls']:
project_dir = opts.data_dir + '/projects/' + url + '/'
+ my_makedirs(project_dir, opts.create)
+ my_symlink(projects[project]['app_info'],
+ project_dir + 'app_info.xml', opts.create)
- if opts.create_symlink == True:
- try:
- os.makedirs(project_dir)
- except OSError:
- pass
+ for app_src in projects[project]['apps']:
+ app_dst = project_dir + os.path.basename(app_src)
+ my_symlink(app_src, app_dst, opts.create)
+ return
- renew_or_remove_symlink(projects[project]['app_info'],
- project_dir + 'app_info.xml', opts.create_symlink)
+def my_makedirs(path, bool):
+ if bool == False:
+ return
- for app in projects[project]['apps']:
- renew_or_remove_symlink(app,
- project_dir + os.path.basename(app), opts.create_symlink)
+ try:
+ os.makedirs(path)
+ except OSError:
+ pass
+
return
-def renew_or_remove_symlink(src, dst, create_symlink):
+def my_symlink(src, dst, bool):
if os.path.isfile(dst) and not os.path.islink(dst):
return
elif os.path.islink(dst):
os.remove(dst)
- if create_symlink == True:
+ if bool == True:
os.symlink(src, dst)
return
@@ -61,27 +66,19 @@
def parse_options():
parser = optparse.OptionParser()
- parser.add_option('--create', action='store_true',
- dest='create_symlink',
- help='create symlinks and project directories')
+ parser.add_option('--create', action='store_true', dest='create',
+ default=True, help='create symlinks and project directories')
- parser.add_option('--remove', action='store_false',
- dest='create_symlink', help='remove symlinks')
+ parser.add_option('--remove', action='store_false', dest='create',
+ help='remove symlinks')
- parser.add_option('--data-dir', dest='data_dir',
- default='', metavar='DIR',
+ 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('--project', dest='project', default='',
+ metavar='PROJECT', help='create only symlinks for project PROJECT')
- parser.set_defaults(create_symlink=True)
(opts, args) = parser.parse_args()
-
- if opts.data_dir == '':
- parser.error("option '--data-dir' is mandatory")
-
return opts
if __name__ == '__main__':
More information about the pkg-boinc-commits
mailing list