[SCM] BOINC packaging branch, master, updated. upstream/7.0.65+dfsg-701-g91886de
Steffen Moeller
steffen_moeller at gmx.de
Tue Apr 30 20:28:26 UTC 2013
The following commit has been merged in the master branch:
commit 91886deabfd983fad6f81d6c1d703813a217a6d9
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Tue Apr 30 22:16:00 2013 +0200
Integration of advancements for boinc-server-maker
diff --git a/debian/boinc-server-maker.README.Debian b/debian/boinc-server-maker.README.Debian
index 7dcecab..8c05dea 100644
--- a/debian/boinc-server-maker.README.Debian
+++ b/debian/boinc-server-maker.README.Debian
@@ -23,3 +23,10 @@ already be achieved with the wrapper application alone, especially
when one can rely on the client side to also run Debian. But
this all needs more time than we currently have to think through
and experiment further.
+
+Current developments of the packaging aim at keeping the debian
+side as tiny as possibly and improve the install target of the
+Makefiles instead.
+
+ --
+ Steffen
diff --git a/debian/boinc-server-maker.dirs b/debian/boinc-server-maker.dirs
index c0a914c..4396ac0 100644
--- a/debian/boinc-server-maker.dirs
+++ b/debian/boinc-server-maker.dirs
@@ -1,7 +1,4 @@
-usr/lib/boinc-server/bin
-usr/lib/boinc-server/tools
-usr/lib/boinc-server/sched
-usr/share/boinc-server/bin
-usr/share/boinc-server/lib
-usr/share/boinc-server/tools
-#usr/share/boinc-server/samples/example_app
+usr/lib/boinc-server-maker
+usr/share/boinc-server-maker
+usr/share/pyshared/Boinc
+usr/share/boinc-server-maker/py/Boinc
diff --git a/debian/boinc-server-maker.install b/debian/boinc-server-maker.install
index 83af3b9..48a6a3e 100644
--- a/debian/boinc-server-maker.install
+++ b/debian/boinc-server-maker.install
@@ -1,120 +1,5 @@
-db/*.sql usr/share/boinc-server/db
-#usr/lib/python2.6/site-packages/boinc_path_config.py usr/share/python-support/boinc-server/Boinc
-sched/boinc_path_config.py usr/share/python-support/boinc-server/Boinc
-html usr/share/boinc-server
-
-# seems like there is no need for a global presence of the BOINC python code
-#py/Boinc/*.py usr/share/python-support/boinc-server/Boinc
-# Project-specific code will be copied by make_project from here
-py/Boinc/*.py usr/share/boinc-server/py/Boinc/
-
-sched/db_dump_spec.xml usr/share/boinc-server/sched
-sched/transitioner_catchup.php usr/share/boinc-server/sched
-#where is this?
-#sched/request_file_list usr/share/boinc-server/sched
-#sched/put_file usr/lib/boinc-server/sched
-
-#test/uc_result usr/share/boinc-server/test
-#test/uc_wu_nodelete usr/share/boinc-server/test
-
-tools/create_work_example usr/lib/boinc-server/tools
-tools/cleanlogs.sh usr/lib/boinc-server/tools
-tools/makelog.sh usr/lib/boinc-server/tools
-tools/run_in_ops usr/lib/boinc-server/tools
-tools/db_query usr/lib/boinc-server/tools
-tools/watch_tcp usr/lib/boinc-server/tools
-tools/sign_executable usr/lib/boinc-server/tools
-tools/project.xml usr/lib/boinc-server/tools
-tools/appmgr usr/lib/boinc-server/tools
-tools/run_in_ops usr/lib/boinc-server/tools
-
-tools/manage_privileges usr/share/boinc-server/tools
-tools/cancel_jobs usr/lib/boinc-server/tools
-tools/boinc_submit usr/share/boinc-server/tools
-tools/demo_submit usr/share/boinc-server/tools
-tools/demo_query usr/share/boinc-server/tools
-
-#unclear
-#html/user/server_status.php usr/share/boinc-server/html/user
-
-
-#usr/bin/dbcheck_files_exist usr/share/boinc-server/tools
-tools/dbcheck_files_exist usr/share/boinc-server/tools
-#usr/bin/grep_logs usr/share/boinc-server/tools
-tools/grep_logs usr/share/boinc-server/tools
-#usr/bin/make_project usr/share/boinc-server/tools
-tools/make_project usr/share/boinc-server/tools
-#usr/bin/parse_config usr/share/boinc-server/tools
-tools/parse_config usr/share/boinc-server/tools
-#usr/bin/update_versions usr/share/boinc-server/tools
-tools/update_versions usr/share/boinc-server/tools
-#usr/bin/upgrade usr/share/boinc-server/tools
-tools/upgrade usr/share/boinc-server/tools
-#usr/bin/vote_monitor usr/share/boinc-server/bin
-tools/vote_monitor usr/share/boinc-server/bin
-#usr/bin/xadd usr/share/boinc-server/tools
-tools/xadd usr/share/boinc-server/tools
-
-#usr/bin/sign_executable usr/lib/boinc-server/tools
-tools/sign_executable usr/lib/boinc-server/tools
-#usr/bin/dir_hier_move usr/lib/boinc-server/bin
-tools/dir_hier_move usr/lib/boinc-server/bin
-#usr/bin/dir_hier_path usr/lib/boinc-server/bin
-tools/dir_hier_path usr/lib/boinc-server/bin
-
-#usr/bin/create_work usr/lib/boinc-server/bin
-tools/create_work usr/lib/boinc-server/bin
-
-
-sched/census usr/lib/boinc-server/bin
-sched/cgi usr/lib/boinc-server/bin
-sched/db_dump usr/lib/boinc-server/bin
-sched/db_purge usr/lib/boinc-server/bin
-#usr/bin/delete_file usr/lib/boinc-server/bin
-sched/delete_file usr/lib/boinc-server/bin
-sched/feeder usr/lib/boinc-server/bin
-sched/file_deleter usr/lib/boinc-server/bin
-#usr/bin/get_file usr/lib/boinc-server/bin
-sched/get_file usr/lib/boinc-server/bin
-#usr/bin/make_work usr/lib/boinc-server/bin
-sched/make_work usr/lib/boinc-server/bin
-sched/message_handler usr/lib/boinc-server/bin
-#usr/bin/sched_driver usr/lib/boinc-server/bin
-sched/sched_driver usr/lib/boinc-server/bin
-#usr/bin/start usr/share/boinc-server/bin
-sched/start usr/lib/boinc-server/bin
-#usr/bin/status usr/share/boinc-server/bin
-sched/status usr/lib/boinc-server/bin
-#usr/bin/stop usr/share/boinc-server/bin
-sched/stop usr/share/boinc-server/bin
-#usr/bin/show_shmem usr/lib/boinc-server/bin
-sched/show_shmem 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
-
-# works again
-usr/bin/crypt_prog usr/lib/boinc-server/bin
-# In lib/crypt_prog is just a wrapper for the real binary
-# (presumed to be executing just as fine) in lib/.libs/crypt_prog
-#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
-
-
-#usr/libexec/sched usr/lib/boinc-server
-
-# Only built together with server
-usr/lib/libboinc_zip.so.* usr/lib
-
+usr/share/boinc-server-maker
+usr/lib/boinc-server-maker
+usr/lib/python2.7
+sched/boinc_path_config.py usr/share/boinc-server-maker/py/Boinc
+py/Boinc/*.py usr/share/boinc-server-maker/py/Boinc
diff --git a/debian/boinc-server-maker.links b/debian/boinc-server-maker.links
index c00cd67..32b3f51 100644
--- a/debian/boinc-server-maker.links
+++ b/debian/boinc-server-maker.links
@@ -1,61 +1,5 @@
-# this is where install places the files
-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/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/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/sched_driver usr/share/boinc-server/sched/sched_driver
-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/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
-usr/lib/boinc-server/sched/put_file usr/share/boinc-server/sched/put_file
-
-
-
-
-
-# this is where make_project expects them
-usr/lib/boinc-server/bin/start usr/share/boinc-server/sched/start
-# a python script which should not have gone to usr/lib
-usr/lib/boinc-server/tools/appmgr usr/share/boinc-server/tools/appmgr
-usr/lib/boinc-server/bin/create_work usr/share/boinc-server/tools/create_work
-usr/lib/boinc-server/bin/crypt_prog usr/share/boinc-server/lib/crypt_prog
-usr/lib/boinc-server/tools/db_query usr/share/boinc-server/tools/db_query
-usr/lib/boinc-server/bin/dir_hier_move usr/share/boinc-server/tools/dir_hier_move
-usr/lib/boinc-server/bin/dir_hier_path usr/share/boinc-server/tools/dir_hier_path
-usr/lib/boinc-server/tools/project.xml usr/share/boinc-server/tools/project.xml
-usr/lib/boinc-server/tools/run_in_ops usr/share/boinc-server/tools/run_in_ops
-usr/lib/boinc-server/tools/sign_executable usr/share/boinc-server/tools/sign_executable
-usr/lib/boinc-server/tools/watch_tcp usr/share/boinc-server/tools/watch_tcp
-# and those are not expected by make_project but most likely better be linked before they are missed
-usr/lib/boinc-server/tools/create_work_example usr/share/boinc-server/tools/create_work_example
-usr/lib/boinc-server/tools/cleanlogs.sh usr/share/boinc-server/tools/cleanlogs.sh
-usr/lib/boinc-server/tools/makelog.sh usr/share/boinc-server/tools/makelog.sh
-
-# hunch - needs to be verified
-usr/share/boinc-server/html/user/server_status.php usr/share/boinc-server/html/ops/sample_server_status.php
-
-# annoying weakness of make_project
-# we are shipping the apps separately, no need to use this.
-#usr/share/boinc-server/apps/uc2 usr/share/boinc-server/samples/example_app/uc2
+/usr/lib/boinc-server-maker/bin /usr/share/boinc-server-maker/bin
+/usr/lib/boinc-server-maker/tools /usr/share/boinc-server-maker/tools
+/usr/lib/boinc-server-maker/lib /usr/share/boinc-server-maker/lib
+/usr/lib/boinc-server-maker/sched /usr/share/boinc-server-maker/sched
+/usr/lib/boinc-server-maker/vda /usr/share/boinc-server-maker/vda
diff --git a/debian/changelog b/debian/changelog
index 920d9a4..e196a40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
boinc (7.0.65+dfsg-1) unstable; urgency=low
+ [ Gianfranco Costamagna ]
* New upstream release.
* debian/control.in dropped version check
- pkg-config (>= 0.15) (version 0.25 in stable)
@@ -13,7 +14,11 @@ boinc (7.0.65+dfsg-1) unstable; urgency=low
debian/compat
- Bumped to version 8
- -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Wed, 17 Apr 2013 09:06:54 +0200
+ [ Steffen Moeller ]
+ * Merged work on packaging of BOINC server code
+ * boinc-cgi-stripchart package now built together with server parts
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Tue, 30 Apr 2013 21:45:44 +0200
boinc (7.0.60+dfsg-1) UNRELEASED; urgency=low
diff --git a/debian/control.in b/debian/control.in
index 3660b4b..9dbfcfc 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -23,108 +23,108 @@ Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git
Vcs-Browser: http://git.debian.org/?p=pkg-boinc/boinc.git
Package: boinc
-Architecture: all
-Depends: ${misc:Depends},
- boinc-client (>= ${binary:Version}), boinc-manager (>= ${binary:Version})
-Description: metapackage for the BOINC client and the manager
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing: several initiatives of
- various scientific disciplines all compete for the idle time of
- desktop computers. The developers' web site at the University of
- Berkeley serves as a common portal to the otherwise independently run
- projects.
- .
- This package depends both on the BOINC core client program that is
- required to participate in any project that uses BOINC, and the
- BOINC Manager, a graphical monitor and control utility for the
- BOINC core client.
-
-Package: libboinc7
-Provides: libboinc
-Breaks: libboinc (<= 7.0.34+dfsg-1)
-Replaces: libboinc (<= 7.0.34+dfsg-1)
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: libraries of BOINC the client depends on
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing using volunteered computer
- resources.
- .
- The environment offers a series of libraries that both the user-run
- client and the client-invoked scientific applications depend on. With
- the number of cores per machine growing, and with scientific apps
- commonly started for every core, it is essential to have memory
- shared as much as possible between binaries of all projects.
-
-# Not compatible with Wheezy with direct notion of libcuda1:i386 [amd64]
-Package: boinc-nvidia-cuda
-Architecture: amd64 i386
-Section: contrib/net
-Priority: extra
-Depends: ${misc:Depends}, boinc, libcuda1|nvidia-current,
-Recommends: libcuda1-ia32 [amd64]|nvidia-current [amd64], ia32-libs [amd64]|nvidia-current [amd64]
-Description: metapackage for CUDA-savvy BOINC client and manager
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing: several initiatives of
- various scientific disciplines all compete for the idle time of
- desktop computers. The developers' web site at the University of
- Berkeley serves as a common portal to the otherwise independently run
- projects.
- .
- Regular users (rightously) often find it an unbearable nuissance to
- care for the exact configuration of BOINC for CUDA-savvy graphics
- cards. This package adds a series of dependencies from the non-free
- section to the regular boinc package. This also meant this binary
- package to be redistributed in the contrib section of Debian.
-
-Package: boinc-amd-opencl
-Architecture: amd64 i386
-Section: contrib/net
-Priority: extra
-Depends: ${misc:Depends}, boinc, fglrx-driver, amd-libopencl1
-Description: metapackage for AMD/ATI OpenCL-savvy BOINC client and manager
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing: several initiatives of
- various scientific disciplines all compete for the idle time of
- desktop computers. The developers' web site at the University of
- Berkeley serves as a common portal to the otherwise independently run
- projects.
- .
- Regular users (rightously) often find it an unbearable nuissance to
- care for the configuration of BOINC for the OpenCL-savvy AMD/ATI
- graphics cards. This package adds a series of dependencies from the
- non-free section to the regular boinc package. This also meant this
- binary package to be redistributed in the contrib section of Debian.
- .
- This package is not perfect, yet. A major problem for the moment
- is the availability of the OpenCL driver for 32bit binaries for
- amd64. If this is planned, install the amd-app package provided
- through the AMD developer forum.
-
-Package: boinc-client
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libboinc7 (= ${binary:Version}),
- python,
- adduser,
- ca-certificates
-Recommends: ia32-libs [amd64]
-Suggests: boinc-manager, x11-xserver-utils, libcuda1, libcuda1-ia32 [amd64]
-Description: core client for the BOINC distributed computing infrastructure
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing: several initiatives of
- various scientific disciplines all compete for the idle time of
- desktop computers. The developers' web site at the University of
- Berkeley serves as a common portal to the otherwise independently run
- projects.
- .
- 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 scientific data and executables to be then
- wrapped by the BOINC core client.
+ at Architecture: all
+ at Depends: ${misc:Depends},
+@ boinc-client (>= ${binary:Version}), boinc-manager (>= ${binary:Version})
+ at Description: metapackage for the BOINC client and the manager
+@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+@ software platform for distributed computing: several initiatives of
+@ various scientific disciplines all compete for the idle time of
+@ desktop computers. The developers' web site at the University of
+@ Berkeley serves as a common portal to the otherwise independently run
+@ projects.
+@ .
+@ This package depends both on the BOINC core client program that is
+@ required to participate in any project that uses BOINC, and the
+@ BOINC Manager, a graphical monitor and control utility for the
+@ BOINC core client.
+@
+ at Package: libboinc7
+ at Provides: libboinc
+ at Breaks: libboinc (<= 7.0.34+dfsg-1)
+ at Replaces: libboinc (<= 7.0.34+dfsg-1)
+ at Architecture: any
+ at Section: libs
+ at Depends: ${shlibs:Depends}, ${misc:Depends}
+ at Description: libraries of BOINC the client depends on
+@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+@ software platform for distributed computing using volunteered computer
+@ resources.
+@ .
+@ The environment offers a series of libraries that both the user-run
+@ client and the client-invoked scientific applications depend on. With
+@ the number of cores per machine growing, and with scientific apps
+@ commonly started for every core, it is essential to have memory
+@ shared as much as possible between binaries of all projects.
+@
+@# Not compatible with Wheezy with direct notion of libcuda1:i386 [amd64]
+ at Package: boinc-nvidia-cuda
+ at Architecture: amd64 i386
+ at Section: contrib/net
+ at Priority: extra
+ at Depends: ${misc:Depends}, boinc, libcuda1|nvidia-current,
+ at Recommends: libcuda1-ia32 [amd64]|nvidia-current [amd64], ia32-libs [amd64]|nvidia-current [amd64]
+ at Description: metapackage for CUDA-savvy BOINC client and manager
+@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+@ software platform for distributed computing: several initiatives of
+@ various scientific disciplines all compete for the idle time of
+@ desktop computers. The developers' web site at the University of
+@ Berkeley serves as a common portal to the otherwise independently run
+@ projects.
+@ .
+@ Regular users (rightously) often find it an unbearable nuissance to
+@ care for the exact configuration of BOINC for CUDA-savvy graphics
+@ cards. This package adds a series of dependencies from the non-free
+@ section to the regular boinc package. This also meant this binary
+@ package to be redistributed in the contrib section of Debian.
+@
+ at Package: boinc-amd-opencl
+ at Architecture: amd64 i386
+ at Section: contrib/net
+ at Priority: extra
+ at Depends: ${misc:Depends}, boinc, fglrx-driver, amd-libopencl1
+ at Description: metapackage for AMD/ATI OpenCL-savvy BOINC client and manager
+@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+@ software platform for distributed computing: several initiatives of
+@ various scientific disciplines all compete for the idle time of
+@ desktop computers. The developers' web site at the University of
+@ Berkeley serves as a common portal to the otherwise independently run
+@ projects.
+@ .
+@ Regular users (rightously) often find it an unbearable nuissance to
+@ care for the configuration of BOINC for the OpenCL-savvy AMD/ATI
+@ graphics cards. This package adds a series of dependencies from the
+@ non-free section to the regular boinc package. This also meant this
+@ binary package to be redistributed in the contrib section of Debian.
+@ .
+@ This package is not perfect, yet. A major problem for the moment
+@ is the availability of the OpenCL driver for 32bit binaries for
+@ amd64. If this is planned, install the amd-app package provided
+@ through the AMD developer forum.
+@
+ at Package: boinc-client
+ at Architecture: any
+ at Depends: ${shlibs:Depends}, ${misc:Depends},
+@ libboinc7 (= ${binary:Version}),
+@ python,
+@ adduser,
+@ ca-certificates
+ at Recommends: ia32-libs [amd64]
+ at Suggests: boinc-manager, x11-xserver-utils, libcuda1, libcuda1-ia32 [amd64]
+ at Description: core client for the BOINC distributed computing infrastructure
+@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+@ software platform for distributed computing: several initiatives of
+@ various scientific disciplines all compete for the idle time of
+@ desktop computers. The developers' web site at the University of
+@ Berkeley serves as a common portal to the otherwise independently run
+@ projects.
+@ .
+@ 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 scientific data and executables to be then
+@ wrapped by the BOINC core client.
#
#Package: boinc-screensaver
#Section: x11
@@ -155,80 +155,80 @@ Description: core client for the BOINC distributed computing infrastructure
# Just, when using it together with the regular BOINC client setup,
# it is suggested not to have all CPUs used to avoid multiple
# processes running on the same core.
-
-Package: boinc-manager
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: boinc-client, ia32-libs-gtk [amd64]
-Suggests: libgl1-mesa-glx, libxt6
-Description: GUI to control and monitor the BOINC core client
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing using volunteered computer
- resources.
- .
- This package contains the BOINC Manager, a graphical monitor and
- control utility for the BOINC core client. It gives a detailed
- overview of the state of the client it is monitoring, as there are
- * attached projects
- * running tasks
- * file transfers between the client and project servers
- * statistics about granted credits and disk usage for every project
- * constraints on CPU usage
- The BOINC Manager has two modes of operation, the "Simple View" in which
- it only displays the most important information and the "Advanced View"
- in which all information and all control elements are available.
- .
- For active participation in any BOINC project the recommended
- boinc-client package, not the boinc-manager, is required for every
- machine contributing.
-
-Package: boinc-dev
-Section: oldlibs
-Architecture: all
-Priority: extra
-Depends: ${misc:Depends}, libboinc-app-dev (= ${source:Version})
-Description: development files to build applications for BOINC projects
- Dummy transitional package helping the transition of a split of
- architecture-independent development files and the architecture-dependent
- dynamic libraries. Static libraries are no longer redistributed.
-
-Package: libboinc-app-dev
-Section: libdevel
-Architecture: all
-Depends: ${misc:Depends},
- libboinc7 (>= ${source:Version}),
- libboinc7 (<< ${source:Version}+1~),
- libboinc-app7 (>= ${source:Version}),
- libboinc-app7 (<< ${source:Version}+1~),
- libc6-dev | libc-dev,
- libstdc++6-4.3-dev | libstdc++-dev, libssl-dev, libmysqlclient-dev
-Breaks: boinc-dev (<= 7.0.28+dfsg-2)
-Replaces: boinc-dev (<= 7.0.28+dfsg-2)
-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 header files that are needed to develop and
- compile applications which utilizes the BOINC infrastructure.
-
-Package: libboinc-app7
-Provides: libboinc-app
-Breaks: libboinc-app (<= 7.0.34+dfsg-1),
- boinc-dev (<= 7.0.28+dfsg-2)
-Replaces: libboinc-app (<= 7.0.34+dfsg-1),
- boinc-dev (<= 7.0.28+dfsg-2)
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: libraries for BOINC's scientific applications
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing using volunteered computer
- resources.
- .
- This package contains dynamic libraries that are needed for applications
- which utilizes the BOINC infrastructure and the boinc-client itself.
+@
+ at Package: boinc-manager
+ at Section: x11
+ at Architecture: any
+ at Depends: ${shlibs:Depends}, ${misc:Depends}
+ at Recommends: boinc-client, ia32-libs-gtk [amd64]
+ at Suggests: libgl1-mesa-glx, libxt6
+ at Description: GUI to control and monitor the BOINC core client
+@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+@ software platform for distributed computing using volunteered computer
+@ resources.
+@ .
+@ This package contains the BOINC Manager, a graphical monitor and
+@ control utility for the BOINC core client. It gives a detailed
+@ overview of the state of the client it is monitoring, as there are
+@ * attached projects
+@ * running tasks
+@ * file transfers between the client and project servers
+@ * statistics about granted credits and disk usage for every project
+@ * constraints on CPU usage
+@ The BOINC Manager has two modes of operation, the "Simple View" in which
+@ it only displays the most important information and the "Advanced View"
+@ in which all information and all control elements are available.
+@ .
+@ For active participation in any BOINC project the recommended
+@ boinc-client package, not the boinc-manager, is required for every
+@ machine contributing.
+@
+ at Package: boinc-dev
+ at Section: oldlibs
+ at Architecture: all
+ at Priority: extra
+ at Depends: ${misc:Depends}, libboinc-app-dev (= ${source:Version})
+ at Description: development files to build applications for BOINC projects
+@ Dummy transitional package helping the transition of a split of
+@ architecture-independent development files and the architecture-dependent
+@ dynamic libraries. Static libraries are no longer redistributed.
+@
+ at Package: libboinc-app-dev
+ at Section: libdevel
+ at Architecture: all
+ at Depends: ${misc:Depends},
+@ libboinc7 (>= ${source:Version}),
+@ libboinc7 (<< ${source:Version}+1~),
+@ libboinc-app7 (>= ${source:Version}),
+@ libboinc-app7 (<< ${source:Version}+1~),
+@ libc6-dev | libc-dev,
+@ libstdc++6-4.3-dev | libstdc++-dev, libssl-dev, libmysqlclient-dev
+ at Breaks: boinc-dev (<= 7.0.28+dfsg-2)
+ at Replaces: boinc-dev (<= 7.0.28+dfsg-2)
+ at 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 header files that are needed to develop and
+@ compile applications which utilizes the BOINC infrastructure.
+@
+ at Package: libboinc-app7
+ at Provides: libboinc-app
+ at Breaks: libboinc-app (<= 7.0.34+dfsg-1),
+@ boinc-dev (<= 7.0.28+dfsg-2)
+ at Replaces: libboinc-app (<= 7.0.34+dfsg-1),
+@ boinc-dev (<= 7.0.28+dfsg-2)
+ at Section: libs
+ at Architecture: any
+ at Depends: ${shlibs:Depends}, ${misc:Depends}
+ at Description: libraries for BOINC's scientific applications
+@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+@ software platform for distributed computing using volunteered computer
+@ resources.
+@ .
+@ This package contains dynamic libraries that are needed for applications
+@ which utilizes the BOINC infrastructure and the boinc-client itself.
%
%Package: boinc-server-maker
%Architecture: any
@@ -272,35 +272,52 @@ Description: libraries for BOINC's scientific applications
% .
% The package also features the wrapper application, which is likely
% to find its audience also in real projects.
-
-Package: boinc-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: boinc-client (= ${binary:Version}) | boinc-manager (= ${binary:Version}) | libboinc7 (= ${binary:Version}) | libboinc-app7 (= ${binary:Version}),
- ${misc:Depends}
-Suggests: libcurl3-dbg, libssl1.0.0-dbg, libwxgtk2.8-dbg
-Description: debugging symbols for BOINC binaries
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing using volunteered computer
- resources.
- .
- This package contains unstripped versions of all binaries included in
- the BOINC packages. It is provided primarily to provide a backtrace
- with names in a debugger, this makes it somewhat easier to interpret
- core dumps.
-
-Package: boinc-cgi-stripchart
-Section: libs
-Priority: extra
-Architecture: all
-Depends: ${misc:Depends}, gnuplot-nox, perl
-Recommends: apache2|httpd-cgi
-Description: CGI script for plotting basic statistical graphs
- The Berkeley Open Infrastructure for Network Computing (BOINC) is a
- software platform for distributed computing using volunteered computer
- resources.
- .
- The BOINC developers have found their charting library to be of
- interest for a larger audience. It is isolated in the BOINC source
- tree and thus presented as a separate package.
+@
+ at Package: boinc-dbg
+ at Section: debug
+ at Priority: extra
+ at Architecture: any
+ at Depends: boinc-client (= ${binary:Version}) | boinc-manager (= ${binary:Version}) | libboinc7 (= ${binary:Version}) | libboinc-app7 (= ${binary:Version}),
+@ ${misc:Depends}
+ at Suggests: libcurl3-dbg, libssl1.0.0-dbg, libwxgtk2.8-dbg
+ at Description: debugging symbols for BOINC binaries
+@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+@ software platform for distributed computing using volunteered computer
+@ resources.
+@ .
+@ This package contains unstripped versions of all binaries included in
+@ the BOINC packages. It is provided primarily to provide a backtrace
+@ with names in a debugger, this makes it somewhat easier to interpret
+@ core dumps.
+@
+%Package: boinc-server-dbg
+%Section: debug
+%Priority: extra
+%Architecture: any
+%Depends: boinc-client (= ${binary:Version}) | boinc-manager (= ${binary:Version}) | libboinc7 (= ${binary:Version}) | libboinc-app7 (= ${binary:Version}),
+% ${misc:Depends}
+%Suggests: libcurl3-dbg, libssl0.9.8-dbg, libwxgtk2.8-dbg
+%Description: debugging symbols for BOINC server binaries
+% The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+% software platform for distributed computing using volunteered computer
+% resources.
+% .
+% This package contains unstripped versions of all binaries included in
+% the BOINC packages. It is provided primarily to provide a backtrace
+% with names in a debugger, this makes it somewhat easier to interpret
+% core dumps.
+%
+%Package: boinc-cgi-stripchart
+%Section: libs
+%Priority: extra
+%Architecture: all
+%Depends: ${misc:Depends}, gnuplot-nox, perl
+%Recommends: apache2|httpd-cgi
+%Description: CGI script for plotting basic statistical graphs
+% The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+% software platform for distributed computing using volunteered computer
+% resources.
+% .
+% The BOINC developers have found their charting library to be of
+% interest for a larger audience. It is isolated in the BOINC source
+% tree and thus presented as a separate package.
diff --git a/debian/patches/series b/debian/patches/series
index d00c9b2..1ab1666 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -64,3 +64,4 @@ zip_only_built_with_server.patch
hurd-ftbfs.patch
disable_new_version_check.patch
add_hardening_flags_FTBFS.patch
+server_installs_itself.patch
diff --git a/debian/patches/server_installs_itself.patch b/debian/patches/server_installs_itself.patch
new file mode 100644
index 0000000..91446aa
--- /dev/null
+++ b/debian/patches/server_installs_itself.patch
@@ -0,0 +1,205 @@
+Author: Steffen Moeller <moeller at debian.org>
+Forwarded: yes (PM to David)
+
+Index: boinc_upstream/Makefile.am
+===================================================================
+--- boinc_upstream.orig/Makefile.am
++++ boinc_upstream/Makefile.am
+@@ -13,7 +13,7 @@
+ endif
+
+ if ENABLE_SERVER
+- SERVER_SUBDIRS = db test py sched apps tools vda
++ SERVER_SUBDIRS = db test py sched apps tools vda html
+ ## once contained samples/example_app which breaks out-of-source-tree builds
+ endif
+
+Index: boinc_upstream/html/Makefile.am
+===================================================================
+--- /dev/null
++++ boinc_upstream/html/Makefile.am
+@@ -0,0 +1,5 @@
++
++htmldir=$(DESTDIR)/$(prefix)/share/boinc-server-maker/html
++install-data-local:
++ mkdir -p $(htmldir)
++ cp -r bt drupal inc languages ops project.sample queue user $(htmldir)
+Index: boinc_upstream/sched/Makefile.am
+===================================================================
+--- boinc_upstream.orig/sched/Makefile.am
++++ boinc_upstream/sched/Makefile.am
+@@ -87,11 +87,12 @@
+
+ if ENABLE_SERVER
+
+-cgidir = $(libexecdir)/cgi-bin
+-scheddir = $(libexecdir)/sched
++schedcgidir = $(prefix)/lib/boinc-server-maker/sched
++schedsharedir = $(prefix)/lib/boinc-server-maker/sched
++schedbindir = $(prefix)/lib/boinc-server-maker/sched
+
+-bin_PROGRAMS = \
+- adjust_user_priority \
++schedbin_PROGRAMS = \
++ adjust_user_priority \
+ delete_file \
+ get_file \
+ make_work \
+@@ -100,9 +101,9 @@
+ show_shmem \
+ wu_check
+
+-sched_PROGRAMS = \
++schedshare_PROGRAMS = \
+ census \
+- credit_test \
++ credit_test \
+ db_dump \
+ db_purge \
+ feeder \
+@@ -120,12 +121,18 @@
+ trickle_echo \
+ update_stats
+
+-cgi_PROGRAMS= \
++schedcgi_PROGRAMS= \
+ cgi \
+ file_upload_handler
+
++schedshare_DATA = \
++ db_dump_spec.xml \
++ assimilator.py \
++ pymw_assimilator.py \
++ transitioner_catchup.php
++
+ # scripts that 'make install' should put in bindir
+-bin_SCRIPTS = start stop status
++schedshare_SCRIPTS = start stop status
+
+ noinst_HEADERS = \
+ assimilate_handler.h \
+@@ -276,8 +283,7 @@
+
+ if ENABLE_FCGI
+
+-cgi_PROGRAMS += fcgi \
+- fcgi_file_upload_handler
++schedcgi_PROGRAMS += fcgi fcgi_file_upload_handler
+
+ fcgi_SOURCES = $(cgi_sources)
+ fcgi_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
+Index: boinc_upstream/configure.ac
+===================================================================
+--- boinc_upstream.orig/configure.ac
++++ boinc_upstream/configure.ac
+@@ -975,6 +975,7 @@
+ db/Makefile
+ doc/Makefile
+ doc/manpages/Makefile
++ html/Makefile
+ lib/Makefile
+ locale/Makefile
+ Makefile
+Index: boinc_upstream/db/Makefile.am
+===================================================================
+--- boinc_upstream.orig/db/Makefile.am
++++ boinc_upstream/db/Makefile.am
+@@ -9,4 +9,5 @@
+ endif
+
+ ## other stuff to go into the distribution
+-EXTRA_DIST = constraints.sql schema.sql init_db
++extradir = $(prefix)/share/boinc-server-maker/db
++dist_extra_DATA = constraints.sql schema.sql init_db
+Index: boinc_upstream/tools/Makefile.am
+===================================================================
+--- boinc_upstream.orig/tools/Makefile.am
++++ boinc_upstream/tools/Makefile.am
+@@ -1,11 +1,13 @@
+ ## -*- mode: makefile; tab-width: 4 -*-
+ include $(top_srcdir)/Makefile.incl
+
+-scheddir = $(libexecdir)/sched
++scheddir = $(prefix)/lib/boinc-server-maker/sched
++toolsdir = $(prefix)/lib/boinc-server-maker/tools
++toolbindir = $(prefix)/lib/boinc-server-maker/tools
+
+-bin_PROGRAMS = create_work sign_executable dir_hier_path dir_hier_move cancel_jobs
++toolbin_PROGRAMS = create_work sign_executable dir_hier_path dir_hier_move cancel_jobs
+
+-dist_bin_SCRIPTS = \
++dist_toolbin_SCRIPTS = \
+ boinc_submit \
+ dbcheck_files_exist \
+ demo_submit \
+@@ -23,6 +25,15 @@
+ makelog.sh \
+ run_in_ops
+
++dist_tools_SCRIPTS = \
++ appmgr \
++ db_query \
++ manage_privileges \
++ run_in_ops \
++ stage_file \
++ watch_tcp \
++ project.xml
++
+ AM_CXXFLAGS += $(MYSQL_CFLAGS)
+ AM_LDFLAGS += -static -L../sched -L../lib/.libs
+
+Index: boinc_upstream/vda/Makefile.am
+===================================================================
+--- boinc_upstream.orig/vda/Makefile.am
++++ boinc_upstream/vda/Makefile.am
+@@ -1,6 +1,7 @@
+ include $(top_srcdir)/Makefile.incl
+
+-bin_PROGRAMS = vda vdad ssim
++vdadir=$(prefix)/lib/boinc-server-maker/vda
++vda_PROGRAMS = vda vdad ssim
+
+ AM_CXXFLAGS += $(MYSQL_CFLAGS)
+ AM_LDFLAGS += -static -L../lib/.libs -L../sched
+Index: boinc_upstream/apps/Makefile.am
+===================================================================
+--- boinc_upstream.orig/apps/Makefile.am
++++ boinc_upstream/apps/Makefile.am
+@@ -3,7 +3,7 @@
+
+ include $(top_srcdir)/Makefile.incl
+
+-exampledir = $(libexecdir)/examples
++exampledir = $(prefix)/lib/boinc-apps-examples
+ example_PROGRAMS = upper_case concat 1sec
+
+ upper_case_SOURCES = upper_case.cpp
+Index: boinc_upstream/lib/Makefile.am
+===================================================================
+--- boinc_upstream.orig/lib/Makefile.am
++++ boinc_upstream/lib/Makefile.am
+@@ -8,7 +8,8 @@
+ # Stuff needed for server builds goes here.
+ if ENABLE_SERVER
+
+-bin_PROGRAMS += crypt_prog parse_test
++serverbindir = $(prefix)/lib/boinc-server-maker/lib
++serverbin_PROGRAMS = crypt_prog parse_test
+
+ endif
+ # end of "if ENABLE_SERVER"
+Index: boinc_upstream/py/Makefile.am
+===================================================================
+--- boinc_upstream.orig/py/Makefile.am
++++ boinc_upstream/py/Makefile.am
+@@ -19,6 +19,10 @@
+ Boinc/tools.py \
+ Boinc/util.py
+
++pydir=$(prefix)/usr/share/boinc-server-maker/py/Boinc
++py_SCRIPTS=$(EXTRA_DIST)
++
++
+ $(srcdir)/Boinc/boinc_db.py: $(top_srcdir)/db/boinc_db.h $(top_srcdir)/lib/common_defs.h
+ cat $^ | $(top_srcdir)/py/db_def_to_py > $@
+
diff --git a/debian/rules b/debian/rules
index 6abc9a4..17370b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,12 +132,21 @@ CFLAGS_boinc-client := $(CFLAGS)
CXXFLAGS_boinc-client := $(CXXFLAGS)
ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control.in)
-ifeq (,$(ENABLE_SERVER_TEST))
ENABLE_SERVER := --disable-server
-TMP=$(shell egrep -v '^%' debian/control.in > debian/control)
-else
+ifneq (,$(ENABLE_SERVER_TEST))
ENABLE_SERVER := --enable-server
TMP=$(shell sed -e 's/^%//' debian/control.in > debian/control)
+else
+TMP=$(shell egrep -v '^%' debian/control.in > debian/control)
+endif
+
+ENABLE_CLIENT_TEST := $(shell egrep '^Package:.*boinc$$' debian/control.in)
+ENABLE_CLIENT := --disable-client --disable-manager
+ifneq (,$(ENABLE_CLIENT_TEST))
+ENABLE_CLIENT := --enable-client --enable-manager --enable-dynamic-client-linkage
+TMP=$(shell sed -i 's/^@//' debian/control)
+else
+TMP=$(shell sed -i '/^@/d' debian/control)
endif
# --disable-static
@@ -147,16 +156,14 @@ endif
CFGFLAGS_boinc-client = \
$(TYPE_FLAGS) \
--prefix=/usr \
- --enable-client \
+ $(ENABLE_CLIENT) \
$(ENABLE_SERVER) \
--disable-fcgi \
- --enable-manager \
--enable-libraries \
--enable-unicode \
--enable-shared \
--with-ssl \
--with-x \
- --enable-dynamic-client-linkage \
CFLAGS="$(CFLAGS_boinc-client)" \
CXXFLAGS="$(CXXFLAGS_boinc-client)" \
CPPFLAGS="$(CPPFLAGS)" \
@@ -168,11 +175,19 @@ CFGFLAGS_boinc-client = \
%:
if [ ! -f debian/control -o debian/control.in -nt debian/control ]; then \
echo "Generating debian/control file from debian/control.in" ; \
+ ( \
if egrep -q '^Package:.*boinc-server-maker' debian/control.in; then \
- sed -e 's/^%//' debian/control.in > debian/control ; \
+ sed -e 's/^%//' debian/control.in ; \
else \
- egrep -v '^%' debian/control.in > debian/control ; \
- fi ; \
+ egrep -v '^%' debian/control.in ; \
+ fi \
+ ) | ( \
+ if egrep -q '^Package:.*boinc$$' debian/control.in; then \
+ sed -e 's/^@//' ; \
+ else \
+ sed -e '/^@/d' ; \
+ fi \
+ ) > debian/control; \
fi
dh $@ --parallel --with python2
@@ -260,12 +275,12 @@ BINARIES += samples/worker/worker samples/wrapper/wrapper samples/sleeper/sleepe
override_dh_auto_clean:
dh_auto_clean
- $(MAKE) -C samples/sleeper distclean
+ [ -r samples/sleeper/Makefile ] && $(MAKE) -C samples/sleeper distclean
# fail on unpatched source
# $(MAKE) -C samples/worker distclean
rm -rf samples/worker/worker samples/worker/worker.o
- $(MAKE) -C samples/example_app distclean
- $(MAKE) -C samples/wrapper distclean
+ [ -r samples/example_app/Makefile ] && $(MAKE) -C samples/example_app distclean || $(MAKE) -C samples/example_app clean
+ [ -r samples/wrapper/Makefile ] && $(MAKE) -C samples/wrapper distclean || $(MAKE) -C samples/wrapper clean
find . -name Makefile.in -o -name "*.a" -o -name "*.o" | xargs -r rm
find . -name "Makefile" | grep -v samples | xargs -r rm
rm -f configure clientscr/boincscr
@@ -347,15 +362,20 @@ override_dh_install:
find $(CURDIR)/debian -name "*.la" | xargs -r rm -f
override_dh_strip:
- dh_strip -a --dbg-package=boinc-dbg
+ [ -d debian/boinc-dbg ] && dh_strip -a --no-package=-boinc-server-dbg --no-package=boinc-server-maker --no-package=boinc-app-examples --dbg-package=boinc-dbg || true
+ [ -d debian/boinc-server-dbg ] && dh_strip -a -Nboinc -Nlibboinc7 -Nboinc-nvidia-cuda -Nboinc-amd-opencl -Nboinc-client -Nboinc-manager -Nboinc-dev -Nlibboinc-app-dev -Nlib || true
+
+override_dh_installchangelogs:
+ dh_installchangelogs -k checkin_notes
override_dh_fixperms:
dh_fixperms
# some files are not right with 755
find debian -name "*.php" -o -name "*.php.example" -o -name "*.cpp" | grep -v "update_translations.php" | grep -v "transitioner_catchup.php" | xargs -L 1 -r chmod 644 --
# some other files are indeed to be executed via the command line
- if [ -d debian/boinc-server-maker/usr/share/boinc-server/html/ops ]; then \
- cd debian/boinc-server-maker/usr/share/boinc-server/html/ops ; \
+ opsdir=debian/boinc-server-maker/usr/share/boinc-server-maker/html/ops ; \
+ if [ -d "$$opsdir" ]; then \
+ cd "$$opsdir" ; \
for i in *.php; do \
if head -n 1 "$$i" | grep -q "^#!"; then \
chmod 755 "$$i" ; \
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list