[SCM] BOINC packaging branch, debian/topic/boinc-server, updated. debian/6.2.18-2-12-gf4fe1ba
Steffen Moeller
moeller at inb.uni-luebeck.de
Mon Feb 2 16:36:46 UTC 2009
The following commit has been merged in the debian/topic/boinc-server branch:
commit 965fa5f41862eaae10e5139cba570766f4bbbe68
Merge: 84f640d215372d02d9413ed5067c786ea4ddceaa cc5f5e9b75412c4d7a2b96a4077e01e2ff81cf96
Author: Steffen Moeller <moeller at inb.uni-luebeck.de>
Date: Sat Jan 31 02:54:57 2009 +0100
Merge branch 'repackaging' into debian/topic/boinc-server
Conflicts:
debian/patches/series
diff --combined debian/boinc-server.links
index 8845014,0000000..1782d66
mode 100644,000000..100644
--- a/debian/boinc-server.links
+++ b/debian/boinc-server.links
@@@ -1,18 -1,0 +1,18 @@@
- usr/lib/boinc-server/bin/1sec usr/share/boinc-server/bin/1sec
- usr/lib/boinc-server/bin/concat usr/share/boinc-server/bin/concat
++usr/lib/boinc-server/bin/1sec usr/share/boinc-server/apps/1sec
++usr/lib/boinc-server/bin/concat usr/share/boinc-server/apps/concat
+usr/lib/boinc-server/bin/create_work usr/share/boinc-server/bin/create_work
+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/bin/crypt_prog
+usr/lib/boinc-server/bin/crypt_prog usr/share/boinc-server/lib/crypt_prog
+usr/lib/boinc-server/bin/dir_hier_move usr/share/boinc-server/bin/dir_hier_move
+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/bin/dir_hier_path
+usr/lib/boinc-server/bin/dir_hier_path usr/share/boinc-server/tools/dir_hier_path
+usr/lib/boinc-server/bin/sign_executable usr/share/boinc-server/bin/sign_executable
+usr/lib/boinc-server/bin/sign_executable usr/share/boinc-server/tools/sign_executable
+usr/lib/boinc-server/bin/updater usr/share/boinc-server/tools/updater
- usr/lib/boinc-server/bin/upper_case usr/share/boinc-server/bin/upper_case
++usr/lib/boinc-server/bin/upper_case usr/share/boinc-server/apps/upper_case
+usr/share/python-support/boinc-server/Boinc usr/share/boinc-server/py/Boinc
+usr/share/boinc-server/bin/start usr/share/boinc-server/sched/start
+usr/share/boinc-server/bin/start usr/share/boinc-server/bin/status
+usr/share/boinc-server/bin/start usr/share/boinc-server/bin/stop
diff --combined debian/control
index 36ac135,3092afc..45e15cc
--- a/debian/control
+++ b/debian/control
@@@ -2,24 -2,24 +2,25 @@@ Source: boin
Section: net
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>
+ Uploaders: Steffen Moeller <steffen_moeller at gmx.de>,
+ Christoph Martin <christoph.martin at uni-mainz.de>,
+ Rene Mayorga <rmayorga at debian.org>
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
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.3), adduser,
lsb-base (>= 3.0-6), ca-certificates
- Suggests: boinc-app-seti, boinc-manager | kboincspy, schedtool
+ 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
software platform for distributed computing: several initiatives of
@@@ -77,7 -77,7 +78,7 @@@ Package: boinc-db
Section: devel
Priority: extra
Architecture: any
- Depends: boinc-client (= ${binary:Version}) | boinc-manager (= ${binary:Version})
+ Depends: boinc-client (= ${binary:Version}) | boinc-manager (= ${binary:Version}), ${misc:Depends}
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
@@@ -88,20 -88,3 +89,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
+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/patches/series
index f1a2768,39f0d7a..96fa4a9
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -2,4 -2,5 +2,6 @@@
002_remove_hardcoded_optimization.patch
003_use_sensible-browser.patch
004_exclude_sea.patch
+005_sched_makefile.am.patch
+ 005_using_hyphen_as_minus.patch
+ 101_check_RSA_returned_values.patch
diff --combined debian/rules
index 6922f0b,5e8c542..ac7ccc3
--- 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)" \
@@@ -122,8 -122,7 +122,8 @@@ test-stamp
debian/conffiles/global_prefs_override.xml
touch $@
-autoreconf-stamp: patch
+# the target 'patch' is phony and will always be executed
+autoreconf-stamp: $(QUILT_STAMPFN)
dh_testdir
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.sub config.sub
@@@ -161,11 -160,15 +161,17 @@@ clean-patched
`find -name Makefile.in` \
aclocal.m4 \
config.h.in \
- configure
+ configure \
+ locale/client/ar/BOINC\ Manager.mo \
+ config.guess \
+ config.sub \
+ client/scripts/Makefile \
+ client/scripts/boinc-client \
+ sea/Makefile
debconf-updatepo
+BOINC_SERVER_DIR=debian/boinc-server/usr/share/boinc-server
+
install: build install-stamp
install-stamp:
dh install --after dh_auto_test --until dh_install
@@@ -193,26 -196,6 +199,26 @@@
# "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
+
dh install --before dh_installchangelogs
dh_installchangelogs -k checkin_notes
dh install --until dh_fixperms
@@@ -231,6 -214,11 +237,11 @@@ binary-arch: instal
binary: binary-arch
+ # To recreate the packaging without
+ repackage:
+ dh_clean
+ $(MAKE) debian/rules binary
+
origDir ?= .
get-orig-source:
@@@ -242,4 -230,4 +253,4 @@@
$$EXB -r $$LATEST_VERSION -t $(origDir); \
rm -f $$EXB
- .PHONY: build clean clean-patched install binary-arch binary get-orig-source
+ .PHONY: build clean clean-patched install binary-arch binary get-orig-source repackage
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list