[SCM] BOINC packaging branch, debian/fb/boinc-server, updated. debian/6.2.18-1-2-g419abb9
Frank S. Thomas
fst at debian.org
Mon Aug 25 05:18:13 UTC 2008
The following commit has been merged in the debian/fb/boinc-server branch:
commit 419abb9d512d1670083a95d2716c61c7757f760b
Merge: 8daa0aa0fc742895c19892d739126ab77c5fd074 4a16b7685cf8b41d2ca22073ab4d678881b9b8b3
Author: Frank S. Thomas <fst at debian.org>
Date: Mon Aug 25 07:10:20 2008 +0200
Merge branch 'debian/experimental' into debian/fb/boinc-server
diff --combined debian/control
index 5f191ac,db36b98..36ac135
--- a/debian/control
+++ b/debian/control
@@@ -3,16 -3,21 +3,22 @@@ Section: ne
Priority: optional
Maintainer: Debian BOINC Maintainers <pkg-boinc-devel at lists.alioth.debian.org>
Uploaders: Steffen Moeller <steffen_moeller at gmx.de>, Frank S. Thomas <fst at debian.org>, Christoph Martin <christoph.martin at uni-mainz.de>
- Standards-Version: 3.7.3
- Build-Depends: debhelper (>= 6), quilt (>= 0.40), python-support (>= 0.4.2), po-debconf, dh-buildinfo, docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3), autoconf (>= 2.59), libxml2-utils, libmysqlclient15-dev, zlib1g-dev, libssl-dev, libcurl4-openssl-dev (>= 7.17.1), freeglut3-dev, libsm-dev, libice-dev, libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.6-dev
- Homepage: http://boinc.berkeley.edu
- Vcs-Svn: svn://svn.debian.org/pkg-boinc/trunk/boinc/
- Vcs-Browser: http://svn.debian.org/wsvn/pkg-boinc/trunk/boinc/
+ Standards-Version: 3.8.0
+ Build-Depends: debhelper (>= 7), quilt (>= 0.40), po-debconf, dh-buildinfo,
+ docbook2x, docbook-xml, autotools-dev, automake1.9 (>= 1.9.3),
+ autoconf (>= 2.59), libxml2-utils, gettext, zlib1g-dev, libssl-dev,
+ libcurl4-openssl-dev (>= 7.17.1), freeglut3-dev, libsm-dev, libice-dev,
- libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.8-dev
++ libxmu-dev, libxi-dev, libx11-dev, libjpeg62-dev, libwxgtk2.8-dev,
++ python-support (>= 0.4.2), libmysqlclient15-dev
+ Homepage: http://boinc.berkeley.edu/
+ Vcs-Git: git://git.debian.org/git/pkg-boinc/boinc.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-boinc/boinc.git
Package: boinc-client
Section: net
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser, lsb-base (>= 3.0-6), ca-certificates
+ Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser,
+ lsb-base (>= 3.0-6), ca-certificates
Suggests: boinc-app-seti, boinc-manager | kboincspy, schedtool
Description: core client for the BOINC distributed computing infrastructure
The Berkeley Open Infrastructure for Network Computing (BOINC) is a
@@@ -56,7 -61,8 +62,8 @@@ Description: GUI to control and monito
Package: boinc-dev
Section: devel
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev | libc-dev, libstdc++6-4.3-dev | libstdc++-dev, libssl-dev, libmysqlclient15-dev
+ Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-dev | libc-dev,
+ libstdc++6-4.3-dev | libstdc++-dev, libssl-dev, libmysqlclient15-dev
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
@@@ -71,7 -77,7 +78,7 @@@ Section: deve
Priority: extra
Architecture: any
Depends: boinc-client (= ${binary:Version}) | boinc-manager (= ${binary:Version})
- Suggests: libcurl3-dbg, libssl0.9.8-dbg, libwxgtk2.6-dbg
+ Suggests: libcurl3-dbg, libssl0.9.8-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
@@@ -81,18 -87,3 +88,20 @@@
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
+Section: net
+Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mysqldb, mysql-server-5.0 | virtual-mysql-server, apache2 | httpd-cgi, php5, php5-cli, php5-mysql, tcsh | c-shell
++Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mysqldb,
++ mysql-server-5.0 | virtual-mysql-server, apache2 | httpd-cgi, php5, php5-cli,
++ php5-mysql, tcsh | c-shell
+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.
diff --combined debian/rules
index 5cac75d,ca30c2e..2218b36
--- a/debian/rules
+++ b/debian/rules
@@@ -98,7 -98,7 +98,7 @@@ CFGFLAGS =
$(TYPE_FLAGS) \
--prefix=/usr \
--enable-client \
- --disable-server \
+ --enable-server \
--enable-unicode \
--with-ssl \
CFLAGS="$(CFLAGS)" \
@@@ -115,155 -115,98 +115,120 @@@ CFGFLAGS_boinc-client =
CXXFLAGS="$(CXXFLAGS_boinc-client)" \
LDFLAGS="$(LDFLAGS)"
- unit-test:
+ unit-test-stamp:
+ dh_testdir
xmllint --nonet --noout \
debian/conffiles/cc_config.xml \
debian/conffiles/global_prefs_override.xml
+ touch $@
- pre-build: unit-test patch pre-build-stamp
+ pre-build: unit-test-stamp patch pre-build-stamp
pre-build-stamp:
+ dh_testdir
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.sub config.sub
aclocal-1.9 -I m4 && autoheader && automake-1.9 && autoconf
-
- docbook2x-man debian/manpages/update-boinc-applinks.xml
touch $@
- build: pre-build build-stamp
- build-stamp: build-stamp-boinc-client
+ build: pre-build build-boinc-client-stamp build-stamp
+ build-stamp:
dh_testdir
./configure $(CFGFLAGS)
$(MAKE)
+ docbook2x-man debian/manpages/update-boinc-applinks.xml
+ # Generate binary message catalogs of the BOINC Manager.
+ for i in `ls locale/client`; do \
+ if [ -f "locale/client/$$i/BOINC Manager.po" ]; then \
+ msgfmt -o "locale/client/$$i/BOINC Manager.mo" \
+ "locale/client/$$i/BOINC Manager.po"; \
+ fi; \
+ done;
touch $@
- build-stamp-boinc-client:
+ build-boinc-client-stamp:
dh_testdir
./configure $(CFGFLAGS_boinc-client)
$(MAKE)
- cp client/boinc.unmodified client/boinc_client.optimized
+ cp client/boinc.unmodified client/boinc.optimized
touch $@
clean: clean-patched unpatch
clean-patched:
- dh_testdir
- dh_testroot
- rm -f pre-build-stamp
- rm -f build-stamp
- rm -f build-stamp-boinc-client
-
- dh_clean client/boinc_client.optimized
-
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_clean update-boinc-applinks.1
-
+ dh clean
dh_clean \
- api/Makefile.in \
- apps/Makefile.in \
- client/Makefile.in \
- clientgui/Makefile.in \
- db/Makefile.in \
- doc/Makefile.in \
- doc/manpages/Makefile.in \
- lib/Makefile.in \
- m4/Makefile.in \
- py/Makefile.in \
- py/Boinc/Makefile.in \
- sched/Makefile.in \
- sea/Makefile.in \
- test/Makefile.in \
- tools/Makefile.in \
- zip/Makefile.in \
- zip/unzip/Makefile.in \
- zip/zip/Makefile.in \
- Makefile.in \
+ client/boinc.optimized \
+ update-boinc-applinks.1 \
+ `find -name Makefile.in` \
aclocal.m4 \
config.h.in \
configure
-
debconf-updatepo
+BOINC_SERVER_DIR=debian/boinc-server/usr/share/boinc-server
+
- install: install-arch
- install-arch: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
+ install: build install-stamp
+ install-stamp:
+ dh install --after dh_auto_test --before dh_auto_install
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- dh_install -a
-
# Install files for the boinc-client package.
- install -D client/boinc_client.optimized \
- debian/boinc-client/usr/bin/boinc_client
+ install -D client/boinc.optimized \
+ debian/boinc-client/usr/bin/boinc
install -D lib/boinccmd.unmodified \
- debian/boinc-client/usr/bin/boinc_cmd
+ debian/boinc-client/usr/bin/boinccmd
# Install files for the boinc-manager package.
install -D clientgui/boincmgr.unmodified \
debian/boinc-manager/usr/bin/boincmgr
+ # Install binary message catalogs of the BOINC Manager.
for i in `ls locale/client`; do \
if [ -f "locale/client/$$i/BOINC Manager.mo" ]; then \
install -D -m644 "locale/client/$$i/BOINC Manager.mo" \
"debian/boinc-manager/usr/share/locale/$$i/LC_MESSAGES/BOINC Manager.mo"; \
fi; \
done;
+
# The en_US po file is actually a po template, thus the corresponding
# "BOINC Manager.mo" is empty and useless.
rm -rf debian/boinc-manager/usr/share/locale/en_US/
+ # Install files for the boinc-server package.
+ for i in debian/boinc-server/usr/lib/boinc-server/sched/*; do \
+ dh_link -pboinc-server \
+ usr/lib/boinc-server/sched/`basename $$i` \
+ usr/share/boinc-server/sched/`basename $$i`; \
+ done;
+
+ # Remove Python shebang from Boinc module files that are not scripts.
+ sed -i -e '1 d' \
+ $(BOINC_SERVER_DIR)/py/Boinc/add_util.py \
+ $(BOINC_SERVER_DIR)/py/Boinc/boincxml.py \
+ $(BOINC_SERVER_DIR)/py/Boinc/configxml.py \
+ $(BOINC_SERVER_DIR)/py/Boinc/projectxml.py
+
+ sed -i -e 's/boinc_path_config/Boinc.boinc_path_config/' \
+ $(BOINC_SERVER_DIR)/py/Boinc/database.py \
+ $(BOINC_SERVER_DIR)/py/Boinc/setup_project.py \
+ $(BOINC_SERVER_DIR)/tools/make_project \
+ $(BOINC_SERVER_DIR)/tools/upgrade
-
- binary-arch: build install-arch
- dh_testdir -a
- dh_testroot
- dh_installchangelogs -a -k checkin_notes
- dh_installdocs -a
- dh_installdebconf -a
- dh_installexamples -a
- dh_installmenu -a
- dh_desktop -a
- dh_installinit -a
- dh_installman -a
- dh_installudev -a
- dh_buildinfo -a
- dh_link -a
- dh_strip -a --dbg-package=boinc-dbg
- dh_compress -a
- dh_fixperms -a
++
+ dh install --after dh_auto_install --before dh_installchangelogs
+ dh_installchangelogs -k checkin_notes
+ dh install --after dh_installchangelogs --until dh_fixperms
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
- dh_pysupport -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+ dh install
+ dh_buildinfo
+ touch $@
+
+ binary-arch: install
+ dh binary-arch --before dh_strip
+ dh_strip -a --dbg-package=boinc-dbg
+ dh binary-arch
binary: binary-arch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list