[boinc] 03/07: Separated server packages in experimental again^debian/changelog
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 bcb6b4a95ac996ef9384d448ffad9fec1dc8b7cd
Author: Steffen Moeller <steffen_moeller at gmx.de>
Date: Sun Feb 16 03:30:17 2014 +0100
Separated server packages in experimental again^debian/changelog
---
debian/control.in | 116 +++++++++++++++++++++++++++---------------------------
debian/rules | 34 ++++++++--------
2 files changed, 74 insertions(+), 76 deletions(-)
diff --git a/debian/control.in b/debian/control.in
index ae17a31..ba0de98 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -228,48 +228,48 @@ 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 Architecture: any
- at Depends: ${shlibs:Depends}, ${misc:Depends}
- at Recommends: boinc-server-maker
- at 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
+%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
@@ -287,23 +287,23 @@ Package: boinc
@ 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.
-@
+%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/rules b/debian/rules
index 1ff14d4..6d40718 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)
@@ -393,11 +397,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 +415,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