[boinc] 01/01: Server always built, thanks Steffen!

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository boinc.

commit 71f3caeddb747ee42ea8673e95f02abaa06de003
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Dec 5 14:00:54 2013 +0100

    Server always built, thanks Steffen!
---
 debian/changelog |  4 +++-
 debian/rules     | 38 +++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fac5ad3..3588079 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-boinc (7.2.33+dfsg-2) UNRELEASED; urgency=low
+boinc (7.2.33+dfsg-2) unstable; urgency=low
 
+  * debian/rules
+    - server always built
   * debian/control 
     - moved BOINC server work from experimental into unstable.
     - Moved from libcuda1-ia32 to libcuda1-i386 (Closes: #730841)
diff --git a/debian/rules b/debian/rules
index 21b7b8a..95faab8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -146,16 +146,16 @@ CXXFLAGS_boinc-client := $(CXXFLAGS)
 $(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 'unstable|experimental|UNRELEASED')
+#ENABLE_SERVER_TEST := $(shell dpkg-parsechangelog | egrep '^Distribution:' |egrep -v 'unstable|experimental|UNRELEASED')
 #ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control.in)
 
-ifeq (,$(ENABLE_SERVER_TEST))
+#ifeq (,$(ENABLE_SERVER_TEST))
 ENABLE_SERVER := --enable-server
-$(shell sed 's/^%//' -i debian/control)
-else
-ENABLE_SERVER := --disable-server
-$(shell sed '/^%/d' -i debian/control)
-endif
+#$(shell sed 's/^%//' -i debian/control)
+#else
+#ENABLE_SERVER := --disable-server
+#$(shell sed '/^%/d' -i debian/control)
+#endif
 
 ENABLE_CLIENT_TEST := $(shell egrep '^Package:.*boinc$$' debian/control.in)
 ifneq (,$(ENABLE_CLIENT_TEST))
@@ -269,11 +269,11 @@ override_dh_auto_build: update-boinc-applinks.1
 	@echo
 	# disable optimization in api/, for SETI to work
 	#$(MAKE) -C api CFLAGS="$(CFLAGS_noopt)" CXXFLAGS="$(CXXFLAGS_noopt)"
-ifeq (,$(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"
-endif
+#endif
 	$(MAKE)
 
 	# Generate binary message catalogs of the BOINC Manager.
@@ -286,12 +286,12 @@ endif
 #	  done; \
 #	fi
 
-ifeq (,$(ENABLE_SERVER_TEST))
+#ifeq (,$(ENABLE_SERVER_TEST))
 	$(MAKE) -C samples/sleeper
 	$(MAKE) -C samples/worker
 	$(MAKE) -C samples/example_app
 	$(MAKE) -C samples/wrapper
-endif
+#endif
 
 BINARIES= sched/census sched/cgi sched/db_dump sched/db_purge \
 	sched/delete_file sched/feeder sched/file_deleter \
@@ -373,11 +373,11 @@ 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
-ifeq (,$(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))"
-endif
+#endif
 	for i in $(CURDIR)/debian/*/usr/bin ; \
 	do \
 		egrep -l "^#!.*env..*python" $$i/* | xargs -r sed -i '1s%#!.*%#!/usr/bin/python%' ; \
@@ -394,11 +394,11 @@ 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))
+#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
+#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
@@ -420,10 +420,10 @@ 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
-ifeq (,$(ENABLE_SERVER_TEST))
+#ifeq (,$(ENABLE_SERVER_TEST))
 	chmod +x \
 	  debian/boinc-server-maker/usr/share/boinc-server-maker/html/ops/delete_job_files
-endif
+#endif
 
 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