[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-280-gc2dcaf9
Steffen Moeller
moeller at debian.org
Mon Jun 20 21:01:33 UTC 2011
The following commit has been merged in the master branch:
commit 2fb8501a9c5c02202af1253f6373cf0d0649eb07
Author: Dhananjay M Balan <mb.dhananjay at gmail.com>
Date: Mon Jun 20 20:42:43 2011 +0200
Added patch for 6.12.33 by Dhananjay
diff --git a/debian/boinc-server-maker.dirs b/debian/boinc-server-maker.dirs
index d7dbd1c..47e869f 100644
--- a/debian/boinc-server-maker.dirs
+++ b/debian/boinc-server-maker.dirs
@@ -3,4 +3,4 @@ usr/lib/boinc-server/tools
usr/share/boinc-server/bin
usr/share/boinc-server/lib
usr/share/boinc-server/tools
-usr/share/boinc-server/samples/example_app
+#usr/share/boinc-server/samples/example_app
diff --git a/debian/boinc-server-maker.examples b/debian/boinc-server-maker.examples
index b6ecdbe..ff556c6 100644
--- a/debian/boinc-server-maker.examples
+++ b/debian/boinc-server-maker.examples
@@ -1,4 +1,6 @@
debian/fetch_example_applications.sh
+debian/upper_case_wu
+debian/upper_case_result
samples/atiopencl/Makefile
samples/atiopencl/atiopencl.cpp
samples/atiopencl/atiopencl.hpp
diff --git a/debian/boinc-server-maker.install b/debian/boinc-server-maker.install
index 64b6bd4..809991b 100644
--- a/debian/boinc-server-maker.install
+++ b/debian/boinc-server-maker.install
@@ -88,6 +88,16 @@ sched/show_shmem usr/lib/boinc-server/bin
sched/trickle_handler usr/lib/boinc-server/bin
sched/update_stats usr/lib/boinc-server/bin
sched/wu_check usr/lib/boinc-server/bin
+sched/file_upload_handler usr/lib/boinc-server/bin
+sched/transitioner usr/lib/boinc-server/bin
+sched/sample_bitwise_validator usr/lib/boinc-server/bin
+sched/sample_trivial_validator usr/lib/boinc-server/bin
+sched/sample_dummy_assimilator usr/lib/boinc-server/bin
+sched/sample_assimilator usr/lib/boinc-server/bin
+sched/sample_work_generator usr/lib/boinc-server/bin
+sched/single_job_assimilator usr/lib/boinc-server/bin
+sched/assimilator.py usr/lib/boinc-server/bin
+sched/pymw_assimilator.py usr/lib/boinc-server/bin
#usr/bin/crypt_prog usr/lib/boinc-server/bin
# In lib/crypt_prog is just a wrapper for the real binary
@@ -95,9 +105,7 @@ sched/wu_check usr/lib/boinc-server/bin
#lib/crypt_prog usr/lib/boinc-server/bin
lib/.libs/crypt_prog usr/lib/boinc-server/bin
#usr/bin/switcher usr/lib/boinc-server/bin # also in client
-
-
#usr/bin/wu_check usr/lib/boinc-server/bin
-sched/wu_check usr/lib/boinc-server/bin
+
#usr/libexec/sched usr/lib/boinc-server
diff --git a/debian/boinc-server-maker.links b/debian/boinc-server-maker.links
index a57a51b..9508bc1 100644
--- a/debian/boinc-server-maker.links
+++ b/debian/boinc-server-maker.links
@@ -1,27 +1,41 @@
# this is where install places the files
-usr/lib/boinc-server/bin/census usr/share/boinc-server/bin/census
-usr/lib/boinc-server/bin/cgi usr/share/boinc-server/bin/cgi
+usr/lib/boinc-server/bin/census usr/share/boinc-server/sched/census
+usr/lib/boinc-server/bin/cgi usr/share/boinc-server/sched/cgi
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/db_dump usr/share/boinc-server/bin/db_dump
-usr/lib/boinc-server/bin/db_purge usr/share/boinc-server/bin/db_purge
-usr/lib/boinc-server/bin/delete_file usr/share/boinc-server/bin/delete_file
+usr/lib/boinc-server/bin/db_dump usr/share/boinc-server/sched/db_dump
+usr/lib/boinc-server/bin/db_purge usr/share/boinc-server/sched/db_purge
+usr/lib/boinc-server/bin/delete_file usr/share/boinc-server/sched/delete_file
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/feeder usr/share/boinc-server/bin/feeder
-usr/lib/boinc-server/bin/file_deleter usr/share/boinc-server/bin/file_deleter
-usr/lib/boinc-server/bin/get_file usr/share/boinc-server/bin/get_file
-usr/lib/boinc-server/bin/make_work usr/share/boinc-server/bin/make_work
-usr/lib/boinc-server/bin/message_handler usr/share/boinc-server/bin/message_handler
-usr/lib/boinc-server/bin/request_file_list usr/share/boinc-server/bin/request_file_list
-usr/lib/boinc-server/bin/sched_driver usr/share/boinc-server/bin/sched_driver
-usr/lib/boinc-server/bin/send_file usr/share/boinc-server/bin/send_file
-usr/lib/boinc-server/bin/show_shmem usr/share/boinc-server/bin/show_shmem
+usr/lib/boinc-server/bin/feeder usr/share/boinc-server/sched/feeder
+usr/lib/boinc-server/bin/file_deleter usr/share/boinc-server/sched/file_deleter
+usr/lib/boinc-server/bin/get_file usr/share/boinc-server/sched/get_file
+usr/lib/boinc-server/bin/make_work usr/share/boinc-server/sched/make_work
+usr/lib/boinc-server/bin/message_handler usr/share/boinc-server/sched/message_handler
+usr/lib/boinc-server/bin/request_file_list usr/share/boinc-server/sched/request_file_list
+usr/lib/boinc-server/bin/sched_driver usr/share/boinc-server/sched/sched_driver
+usr/lib/boinc-server/bin/send_file usr/share/boinc-server/sched/send_file
+usr/lib/boinc-server/bin/show_shmem usr/share/boinc-server/sched/show_shmem
usr/lib/boinc-server/bin/start usr/share/boinc-server/bin/start
usr/lib/boinc-server/bin/status usr/share/boinc-server/bin/status
-usr/lib/boinc-server/bin/trickle_handler usr/share/boinc-server/bin/trickle_handler
-usr/lib/boinc-server/bin/update_stats usr/share/boinc-server/bin/update_stats
-usr/lib/boinc-server/bin/wu_check usr/share/boinc-server/bin/wu_check
+usr/lib/boinc-server/bin/trickle_handler usr/share/boinc-server/sched/trickle_handler
+usr/lib/boinc-server/bin/update_stats usr/share/boinc-server/sched/update_stats
+usr/lib/boinc-server/bin/wu_check usr/share/boinc-server/sched/wu_check
+usr/lib/boinc-server/bin/file_upload_handler usr/share/boinc-server/sched/file_upload_handler
+usr/lib/boinc-server/bin/transitioner usr/share/boinc-server/sched/transitioner
+usr/lib/boinc-server/bin/sample_bitwise_validator usr/share/boinc-server/sched/sample_bitwise_validator
+usr/lib/boinc-server/bin/sample_trivial_validator usr/share/boinc-server/sched/sample_trivial_validator
+usr/lib/boinc-server/bin/sample_dummy_assimilator usr/share/boinc-server/sched/sample_dummy_assimilator
+usr/lib/boinc-server/bin/sample_assimilator usr/share/boinc-server/sched/sample_assimilator
+usr/lib/boinc-server/bin/sample_work_generator usr/share/boinc-server/sched/sample_work_generator
+usr/lib/boinc-server/bin/single_job_assimilator usr/share/boinc-server/sched/single_job_assimilator
+usr/lib/boinc-server/bin/assimilator.py usr/share/boinc-server/sched/assimilator.py
+usr/lib/boinc-server/bin/pymw_assimilator.py usr/share/boinc-server/sched/pymw_assimilator.py
+
+
+
+
# this is where make_project expects them
usr/lib/boinc-server/bin/start usr/share/boinc-server/sched/start
@@ -45,4 +59,5 @@ usr/lib/boinc-server/tools/makelog.sh usr/share/boinc-server/tools/make
usr/share/boinc-server/html/user/server_status.php usr/share/boinc-server/html/ops/sample_server_status.php
# annoying weakness of make_project
-usr/share/boinc-server/apps/uc2 usr/share/boinc-server/samples/example_app/uc2
+# since we are shipping the apps diffrent, no need to use this.
+#usr/share/boinc-server/apps/uc2 usr/share/boinc-server/samples/example_app/uc2
diff --git a/debian/upper_case_result b/debian/upper_case_result
new file mode 100644
index 0000000..f52ef01
--- /dev/null
+++ b/debian/upper_case_result
@@ -0,0 +1,13 @@
+<file_info>
+ <name><OUTFILE_0/></name>
+ <generated_locally/>
+ <upload_when_present/>
+ <max_nbytes>10000</max_nbytes>
+ <url><UPLOAD_URL/></url>
+</file_info>
+<result>
+ <file_ref>
+ <file_name><OUTFILE_0/></file_name>
+ <open_name>out</open_name>
+ </file_ref>
+</result>
diff --git a/debian/upper_case_wu b/debian/upper_case_wu
new file mode 100644
index 0000000..42816aa
--- /dev/null
+++ b/debian/upper_case_wu
@@ -0,0 +1,11 @@
+<file_info>
+ <number>0</number>
+</file_info>
+<workunit>
+ <file_ref>
+ <file_number>0</file_number>
+ <open_name>in</open_name>
+ </file_ref>
+ <min_quorum>1</min_quorum>
+ <target_nresults>1</target_nresults>
+</workunit>
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list