[boinc] 03/03: New upstream release, automating server packages generation based on "target" series
Gianfranco Costamagna
locutusofborg-guest at alioth.debian.org
Sat Aug 31 11:38:06 UTC 2013
This is an automated email from the git hooks/post-receive script.
locutusofborg-guest pushed a commit to annotated tag debian/7.2.14+dfsg-1
in repository boinc.
commit b867d7ad46bb1274a759c4200d86e92fe81cfbf6
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Fri Aug 30 15:00:46 2013 +0200
New upstream release, automating server packages generation based on "target" series
---
debian/changelog | 11 ++++++
debian/control.in | 2 +-
debian/patches/add-ldflags.patch | 6 +--
debian/patches/client_app_maxpathlen.patch | 2 +-
debian/patches/disable_new_version_check.patch | 2 +-
debian/patches/fixed-tools-permissions.patch | 6 +--
debian/patches/libnotify-0.7.patch | 2 +-
debian/patches/slot_dir_source_trace.patch | 10 ++---
debian/rules | 47 ++++++++++++++----------
9 files changed, 53 insertions(+), 35 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7ccaad4..f3c4603 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+boinc (7.2.14+dfsg-1) unstable; urgency=low
+
+ * New upstream release
+ * Now the server package is built or not depending on
+ the debian target series:
+ - target=unstable, server NOT built
+ - target=experimental, server built
+ * Fixed clean in debian/rules file
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it> Sat, 31 Aug 2013 00:57:40 +0200
+
boinc (7.2.11+dfsg-1exp4) UNRELEASED; urgency=low
[ Gianfranco Costamagna ]
diff --git a/debian/control.in b/debian/control.in
index d5d2c34..7e9ecb7 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -230,7 +230,7 @@ Package: boinc
@ This package contains dynamic libraries that are needed for applications
@ which utilizes the BOINC infrastructure and the boinc-client itself.
%
-Package: boinc-server-maker
+%Package: boinc-server-maker
%Architecture: any
%Provides: boinc-server
%Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ${perl:Depends},
diff --git a/debian/patches/add-ldflags.patch b/debian/patches/add-ldflags.patch
index cbb4061..01316f1 100644
--- a/debian/patches/add-ldflags.patch
+++ b/debian/patches/add-ldflags.patch
@@ -1,6 +1,6 @@
---- boinc-7.2.10+dfsg.orig/samples/wrapper/Makefile
-+++ boinc-7.2.10+dfsg/samples/wrapper/Makefile
-@@ -37,4 +37,4 @@ REGEXP_OBJS = \
+--- a/samples/wrapper/Makefile
++++ b/samples/wrapper/Makefile
+@@ -37,4 +37,4 @@
regexp_report.o
wrapper: wrapper.o libstdc++.a $(BOINC_LIB_DIR)/libboinc.a $(BOINC_API_DIR)/libboinc_api.a $(REGEXP_OBJS)
diff --git a/debian/patches/client_app_maxpathlen.patch b/debian/patches/client_app_maxpathlen.patch
index 3b8a1dd..93607b0 100644
--- a/debian/patches/client_app_maxpathlen.patch
+++ b/debian/patches/client_app_maxpathlen.patch
@@ -1,6 +1,6 @@
--- a/client/app.h
+++ b/client/app.h
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
typedef int PROCESS_ID;
#define MAX_STDERR_LEN 65536
diff --git a/debian/patches/disable_new_version_check.patch b/debian/patches/disable_new_version_check.patch
index 2f72450..db438e3 100644
--- a/debian/patches/disable_new_version_check.patch
+++ b/debian/patches/disable_new_version_check.patch
@@ -12,7 +12,7 @@ Last-Update: <2013-03-07>
--- a/client/client_state.cpp
+++ b/client/client_state.cpp
-@@ -456,7 +456,7 @@
+@@ -463,7 +463,7 @@
// inform the user if there's a newer version of client
//
diff --git a/debian/patches/fixed-tools-permissions.patch b/debian/patches/fixed-tools-permissions.patch
index 35efd0b..5f29257 100644
--- a/debian/patches/fixed-tools-permissions.patch
+++ b/debian/patches/fixed-tools-permissions.patch
@@ -1,6 +1,6 @@
---- boinc-7.2.11+dfsg.orig/tools/Makefile.am
-+++ boinc-7.2.11+dfsg/tools/Makefile.am
-@@ -31,7 +31,9 @@ dist_tools_SCRIPTS = \
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -31,7 +31,9 @@
manage_privileges \
run_in_ops \
stage_file \
diff --git a/debian/patches/libnotify-0.7.patch b/debian/patches/libnotify-0.7.patch
index edf4400..64b1a5c 100644
--- a/debian/patches/libnotify-0.7.patch
+++ b/debian/patches/libnotify-0.7.patch
@@ -43,7 +43,7 @@ Disclaimer: For backports, this patch needs to be disabled.
fi
dnl ---------- Sqlite3 ----------------------------------------------------
-@@ -900,7 +898,7 @@
+@@ -901,7 +899,7 @@
],
[enable_wx_debug="no"])
diff --git a/debian/patches/slot_dir_source_trace.patch b/debian/patches/slot_dir_source_trace.patch
index 566ca5d..d677b9a 100644
--- a/debian/patches/slot_dir_source_trace.patch
+++ b/debian/patches/slot_dir_source_trace.patch
@@ -49,7 +49,7 @@
PROJECT* project=0;
--- a/client/app.h
+++ b/client/app.h
-@@ -47,6 +47,7 @@
+@@ -48,6 +48,7 @@
typedef int PROCESS_ID;
#define MAX_STDERR_LEN 65536
@@ -57,7 +57,7 @@
// The stderr output of an application is truncated to this length
// before sending to server,
// to protect against apps that write unbounded amounts.
-@@ -111,7 +112,7 @@
+@@ -112,7 +113,7 @@
double bytes_sent;
// reported by the app if it does network I/O
double bytes_received;
@@ -66,7 +66,7 @@
// directory where process runs (relative)
char slot_path[MAXPATHLEN];
// same, absolute
-@@ -152,8 +153,8 @@
+@@ -153,8 +154,8 @@
// but not descendants of the main process
// (e.g. VMs created by vboxwrapper)
// These are communicated via the app_status message channel
@@ -77,7 +77,7 @@
ASYNC_COPY* async_copy;
double finish_file_time;
// time when we saw finish file in slot dir.
-@@ -289,8 +290,8 @@
+@@ -290,8 +291,8 @@
bool check_app_exited();
bool check_rsc_limits_exceeded();
bool check_quit_timeout_exceeded();
@@ -88,7 +88,7 @@
void send_heartbeats();
void send_trickle_downs();
void report_overdue();
-@@ -299,7 +300,7 @@
+@@ -300,7 +301,7 @@
bool want_network(); // does any task want network?
void network_available(); // notify tasks that network is available
void free_mem();
diff --git a/debian/rules b/debian/rules
index 9777e5e..db0ab12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,22 +138,28 @@ CXXFLAGS += $(DEB_OPT_FLAGS)
CFLAGS_boinc-client := $(CFLAGS)
CXXFLAGS_boinc-client := $(CXXFLAGS)
-ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control.in)
-ENABLE_SERVER := --disable-server
-ifneq (,$(ENABLE_SERVER_TEST))
+#copy the original control.in file
+$(shell cp debian/control.in debian/control)
+
+# check if we need to enable server packages, based on "exp" string in changelog
+ENABLE_SERVER_TEST := $(shell dpkg-parsechangelog | egrep '^Distribution:' |egrep -v 'experimental')
+#ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control.in)
+
+ifeq (,$(ENABLE_SERVER_TEST))
ENABLE_SERVER := --enable-server
-TMP=$(shell sed -e 's/^%//' debian/control.in > debian/control)
+$(shell sed 's/^%//' -i debian/control)
else
-TMP=$(shell egrep -v '^%' debian/control.in > debian/control)
+ENABLE_SERVER := --disable-server
+$(shell sed '/^%/d' -i 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)
+$(shell sed 's/^@//' -i debian/control)
else
-TMP=$(shell sed -i '/^@/d' debian/control)
+ENABLE_CLIENT := --disable-client --disable-manager
+$(shell sed '/^@/d' -i debian/control)
endif
# --disable-static
@@ -180,7 +186,8 @@ CFGFLAGS_boinc-client = \
# Default rule
%:
- if [ ! -f debian/control -o debian/control.in -nt debian/control ]; then \
+ dh $@ --parallel --with python2
+# 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 \
@@ -196,16 +203,16 @@ CFGFLAGS_boinc-client = \
fi \
) > debian/control; \
fi
- dh $@ --parallel --with python2
override_dh_clean:
dh_clean
rm -rf config.log
rm -rf clientscr/.libs override_dh_auto_install
- rm -rf debian/boinc-app-examples debian/boinc-app-examples.substvars
- rm -rf debian/boinc-server-maker debian/boinc-server-maker.substvars
- rm -rf debian/boinc-server-dbg debian/boinc-server-dbg.substvars
- rm -rf *.debhelper
+ rm -rf debian/boinc-app-examples debian/boinc-app-examples.substvars
+ rm -rf debian/boinc-server-maker debian/boinc-server-maker.substvars
+ rm -rf debian/boinc-server-dbg debian/boinc-server-dbg.substvars
+ rm -rf debian/boinc-cgi-stripchart debian/boinc-cgi-stripchart.substvars
+ rm -rf debian/*.debhelper
rm -rf debian/tmp autoreconf-stamp build-*-stamp install-*-stamp
rm -fr debian/boinc-amd-opencl debian/boinc-screensaver # for cases when this is not in debian/control
rm -f debian/boinc-screensaver.substvars debian/boinc-amd-opencl.substvars # dito
@@ -253,12 +260,12 @@ override_dh_auto_build: update-boinc-applinks.1
@echo "**** *****"
@echo "**** Making *****"
@echo "**** *****"
- @echo "**** CC=$(CC) *****"
- @echo "**** CXX=$(CXX) *****"
+ @echo "**** CC=$(CC) *****"
+ @echo "**** CXX=$(CXX) *****"
@echo
# disable optimization in api/, for SETI to work
#$(MAKE) -C api CFLAGS="$(CFLAGS_noopt)" CXXFLAGS="$(CXXFLAGS_noopt)"
-ifneq (,$(ENABLE_SERVER_TEST))
+ifeq (,$(ENABLE_SERVER_TEST))
# FIXME For some reasons unzip build fails if hardening flags are enabled.
$(MAKE) -C zip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain) -fPIC"
$(MAKE) -C zip/unzip CFLAGS="$(CFLAGS_plain) -fPIC" CXXFLAGS="$(CXXFLAGS_plain) -fPIC"
@@ -275,7 +282,7 @@ endif
# done; \
# fi
-ifneq (,$(ENABLE_SERVER_TEST))
+ifeq (,$(ENABLE_SERVER_TEST))
$(MAKE) -C samples/sleeper
$(MAKE) -C samples/worker
$(MAKE) -C samples/example_app
@@ -362,7 +369,7 @@ SAMPLES=samples/sleeper/sleeper samples/worker/worker samples/example_app/uc2 sa
override_dh_auto_install: update-boinc-applinks.1
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-ifneq (,$(ENABLE_SERVER_TEST))
+ifeq (,$(ENABLE_SERVER_TEST))
echo "I: Installing example scientific applications"
mkdir -p $(CURDIR)/debian/tmp/samples
cp $(SAMPLES) $(CURDIR)/debian/tmp/samples || echo "W: Could not install samples ($(SAMPLES))"
@@ -405,7 +412,7 @@ override_dh_fixperms:
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
-ifneq (,$(ENABLE_SERVER_TEST))
+ifeq (,$(ENABLE_SERVER_TEST))
chmod +x \
debian/boinc-server-maker/usr/share/boinc-server-maker/html/ops/delete_job_files
endif
--
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