[boinc] 07/07: Server -> experimental, libboinc-app revived
Steffen Möller
moeller at moszumanska.debian.org
Sun Feb 16 11:55:23 UTC 2014
This is an automated email from the git hooks/post-receive script.
moeller pushed a commit to branch master
in repository boinc.
commit 6baf0086ff3e2f898e3200cd91e3ba93f82e8a85
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Sun Feb 16 12:52:36 2014 +0100
Server -> experimental, libboinc-app revived
---
debian/changelog | 7 +-
debian/control.in | 149 ++++++++++++++++++++++---------------------
debian/libboinc-app7.install | 1 +
debian/libboinc7.install | 5 +-
debian/rules | 36 +++++------
5 files changed, 104 insertions(+), 94 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b8c7b44..21c69db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-boinc (7.2.33+dfsg-2) unstable; urgency=low
+boinc (7.2.33+dfsg-2) UNRELEASED; urgency=low
[Gianfranco Costamagna]
* debian/rules
@@ -16,6 +16,11 @@ boinc (7.2.33+dfsg-2) unstable; urgency=low
[Steffen Moeller]
* Removed Daniel Hahler and Rene Mayorga from uploaders list
+ * Moved boinc-server-maker and boinc-server-dbg into experimental
+ (again) to prevent them from appearing in testing.
+ * Moved libboinc_api and libboinc_graphics back from libboinc7
+ package to libboinc-api7.
+ * More rigorous clean: target (.libs, config.status, libtool)
-- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 15 Feb 2014 14:33:45 +0100
diff --git a/debian/control.in b/debian/control.in
index ae17a31..ce337ec 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -38,24 +38,6 @@ Package: boinc
@ 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]
@Package: boinc-nvidia-cuda
@Architecture: amd64 i386
@@ -228,82 +210,101 @@ Package: boinc
@ This package contains dynamic libraries that are needed for applications
@ which utilizes the BOINC infrastructure and the boinc-client itself.
@
- at Package: boinc-server-maker
- at Architecture: any
- at Provides: boinc-server
- at Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${perl:Depends},
-@ python, python-mysqldb,
-@ mysql-server-5.5 | virtual-mysql-server, apache2 | httpd-cgi,
-@ php5, php5-cli, php5-mysql,
-@ tcsh, openssl, adduser, libfcgi0ldbl
- at Recommends: libapache2-mod-php5, php5-gd, uuid-runtime, apache2-utils
- at Suggests: boinc-app-examples, boinc-cgi-stripchart
- at Description: BOINC server applications and data files
-@ The Berkeley Open Infrastructure for Network Computing (BOINC) is a
-@ software platform for distributed computing using volunteered computer
-@ resources. For every scientific problem its own distinct project-server
-@ must be provided. The users only run a common client with project-specific
-@ additions (if not self-compiled or available as a Linux distribution's
-@ package itself) being downloaded from the server.
-@ .
-@ This package contains the daemons and tools to create and run BOINC
-@ projects.
-@
- at Package: boinc-app-examples
+ at Package: libboinc7
+ at Provides: libboinc
+ at Breaks: libboinc (<= 7.0.34+dfsg-1)
+ at Replaces: libboinc (<= 7.0.34+dfsg-1)
@Architecture: any
+ at Section: libs
@Depends: ${shlibs:Depends}, ${misc:Depends}
- at Recommends: boinc-server-maker
- at Description: example binaries for BOINC servers
+ 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. For every scientific problem its own distinct project-server
-@ must be provided. The users only run a common client with project-specific
-@ additions (if not self-compiled or available as a Linux distribution's
-@ package itself) being downloaded from the server.
-@ .
-@ This package extends the boinc-server-maker package. It features a
-@ series of small applications that a newly installed environment may
-@ decide to use for testing purposes. Having them separated has the neat
-@ side effect that those binaries may be retrieved more easily for foreign
-@ platforms to feed the local servers with.
+@ resources.
@ .
-@ The package also features the wrapper application, which is likely
-% to find its audience also in real projects.
+@ 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.
@
+%Package: boinc-server-maker
+%Architecture: any
+%Provides: boinc-server
+%Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${perl:Depends},
+% python, python-mysqldb,
+% mysql-server-5.5 | virtual-mysql-server, apache2 | httpd-cgi,
+% php5, php5-cli, php5-mysql,
+% tcsh, openssl, adduser, libfcgi0ldbl
+%Recommends: libapache2-mod-php5, php5-gd, uuid-runtime, apache2-utils
+%Suggests: boinc-app-examples, boinc-cgi-stripchart
+%Description: BOINC server applications and data files
+% The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+% software platform for distributed computing using volunteered computer
+% resources. For every scientific problem its own distinct project-server
+% must be provided. The users only run a common client with project-specific
+% additions (if not self-compiled or available as a Linux distribution's
+% package itself) being downloaded from the server.
+% .
+% This package contains the daemons and tools to create and run BOINC
+% projects.
+%
+%Package: boinc-app-examples
+%Architecture: any
+%Depends: ${shlibs:Depends}, ${misc:Depends}
+%Recommends: boinc-server-maker
+%Description: example binaries for BOINC servers
+% The Berkeley Open Infrastructure for Network Computing (BOINC) is a
+% software platform for distributed computing using volunteered computer
+% resources. For every scientific problem its own distinct project-server
+% must be provided. The users only run a common client with project-specific
+% additions (if not self-compiled or available as a Linux distribution's
+% package itself) being downloaded from the server.
+% .
+% This package extends the boinc-server-maker package. It features a
+% series of small applications that a newly installed environment may
+% decide to use for testing purposes. Having them separated has the neat
+% side effect that those binaries may be retrieved more easily for foreign
+% platforms to feed the local servers with.
+% .
+% 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}
- at Suggests: libcurl3-dbg, libssl1.0.0-dbg, libwxgtk2.8-dbg
+ at Suggests: libcurl3-dbg, libssl1.0.0-dbg, libwxgtk2.8-dbg, boinc-server-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
+@ the BOINC client packages. It is provided primarily to provide a backtrace
@ with names in a debugger, this makes it somewhat easier to interpret
-@ core dumps.
-@
- at Package: boinc-server-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 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.
+@ core dumps. For installations running a BOINC server locally, it may
+@ be of interest to also install the boinc-server-dbg package.
@
+%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, libssl1.0.0-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
diff --git a/debian/libboinc-app7.install b/debian/libboinc-app7.install
index 29c4f81..8de5be8 100644
--- a/debian/libboinc-app7.install
+++ b/debian/libboinc-app7.install
@@ -1,2 +1,3 @@
usr/lib/libboinc_graphics*.so.* usr/lib
usr/lib/libboinc_api*.so.* usr/lib
+usr/lib/libboinc_opencl*.so.* usr/lib
diff --git a/debian/libboinc7.install b/debian/libboinc7.install
index 6da5db0..6f1fd21 100644
--- a/debian/libboinc7.install
+++ b/debian/libboinc7.install
@@ -1 +1,4 @@
-usr/lib/*.so.* usr/lib
+usr/lib/libboinc.so.* usr/lib
+usr/lib/libsched.so.* usr/lib
+usr/lib/libboinc_zip.so.* usr/lib
+usr/lib/libboinc_crypt.so.* usr/lib
diff --git a/debian/rules b/debian/rules
index 1ff14d4..b980d12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,19 +144,23 @@ CXXFLAGS_boinc-client := $(CXXFLAGS)
#copy the original control.in file
$(shell cp debian/control.in debian/control)
+$(shell sed '/^#/d' -i debian/control)
# check if we need to enable server packages, based on "exp" string in changelog
-#ENABLE_EXPERIMENTAL_TEST := $(shell dpkg-parsechangelog | egrep '^Distribution:' |egrep -v 'experimental|UNRELEASED')
-#ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control.in)
+ENABLE_EXPERIMENTAL_TEST := $(shell dpkg-parsechangelog | egrep '^Distribution:' |egrep -v 'experimental|UNRELEASED')
-ENABLE_SERVER := --enable-server
-#ifeq (,$(ENABLE_EXPERIMENTAL_TEST))
+ifeq (,$(ENABLE_EXPERIMENTAL_TEST))
$(shell sed 's/^%//' -i debian/control)
-#else
-#$(shell sed '/^%/d' -i debian/control)
-#endif
+else
+$(shell sed '/^%/d' -i debian/control)
+endif
-#ENABLE_CLIENT_TEST := $(shell egrep '^Package:.*boinc$$' debian/control.in)
+ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control debian/control.in | grep -v boinc-server-maker)
+ifeq (,$(ENABLE_EXPERIMENTAL_TEST))
+ENABLE_SERVER := --enable-server
+endif
+
+#ENABLE_CLIENT_TEST := $(shell egrep '^Package:.*boinc$$' debian/control debian/control.in)
#ifneq (,$(ENABLE_CLIENT_TEST))
ENABLE_CLIENT := --enable-client --enable-manager --enable-dynamic-client-linkage
$(shell sed 's/^@//' -i debian/control)
@@ -224,6 +228,8 @@ override_dh_clean:
rm -f api/libboinc_graphics2.la
rm -f test-driver
rm -f sched/adjust_user_priority sched/size_regulator
+ rm -f config.status libtool version.h stamp-h1
+ find . -name ".libs" | xargs -r rm -r
# Commands not to execute - empty overrides
override_dh_auto_test:
@@ -393,11 +399,7 @@ override_dh_install:
override_dh_strip:
[ -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
-#ifeq (,$(ENABLE_SERVER_TEST))
[ -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 --dbg-package=boinc-server-dbg || true
-#else
-# [ -d debian/boinc-server-dbg ] && dh_strip -a -Nboinc -Nlibboinc7 -Nboinc-nvidia-cuda -Nboinc-client -Nboinc-manager -Nboinc-dev -Nlibboinc-app-dev -Nlib --dbg-package=boinc-server-dbg || true
-#endif
override_dh_fixperms:
dh_fixperms
@@ -415,14 +417,12 @@ override_dh_fixperms:
fi
# Correct catalog file perms
find debian -name "*.mo" -exec chmod 644 {} \;
- chmod 755 \
+ [ -d debian/boinc-client ] && chmod 755 \
debian/boinc-client/usr/share/boinc-client/udev-cpu_share \
debian/boinc-client/usr/share/bug/boinc-client/script \
- debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr
-#ifeq (,$(ENABLE_SERVER_TEST))
- chmod +x \
- debian/boinc-server-maker/usr/share/boinc-server-maker/html/ops/delete_job_files
-#endif
+ debian/boinc-manager/usr/share/doc/boinc-manager/examples/run-boincmgr || true
+ [ -d debian/boinc-server-maker ] && chmod +x \
+ debian/boinc-server-maker/usr/share/boinc-server-maker/html/ops/delete_job_files || true
override_dh_compress:
dh_compress -Xsamples -X.cpp -X.py -XMakefile
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list