[SCM] BOINC packaging branch, master, updated. debian/7.1.10+dfsg-1-8-g800603c

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit e5583ad92ffd67abd94a13a3c1bf5a36abad0a62
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jun 19 18:39:23 2013 +0200

    Server parts

diff --git a/debian/boinc-server-maker.examples b/debian/boinc-server-maker.examples
index 8b251f6..a573666 100644
--- a/debian/boinc-server-maker.examples
+++ b/debian/boinc-server-maker.examples
@@ -1,10 +1,6 @@
 debian/fetch_example_applications.sh
 debian/upper_case_wu
 debian/upper_case_result
-samples/atiopencl/Makefile
-samples/atiopencl/atiopencl.cpp
-samples/atiopencl/atiopencl.hpp
-samples/atiopencl/atiopencl_kernels.cl
 samples/client_state_save.xml
 samples/example_app/Mac/app_icon.h
 samples/example_app/Mac/uc2_graphics.icns
@@ -20,10 +16,6 @@ samples/image_libs/bmplib.cpp
 samples/image_libs/bmplib.h
 samples/image_libs/tgalib.cpp
 samples/image_libs/tgalib.h
-#samples/mac_build
-#samples/mac_build/UpperCase2.xcodeproj
-#samples/mac_build/UpperCase2.xcodeproj/project.pbxproj
-samples/multi_thread
 samples/multi_thread/Makefile
 samples/multi_thread/multi_thread.cpp
 samples/nvcuda
@@ -35,14 +27,6 @@ samples/nvcuda/cuda.cpp
 samples/nvcuda/cuda.h
 samples/nvcuda/cuda_config.h
 samples/nvcuda/cuda_kernel.cu
-samples/nvopencl
-samples/nvopencl/Makefile
-samples/nvopencl/Makefile_mac
-samples/nvopencl/common_opencl.mk
-samples/nvopencl/common_opencl_mac.mk
-samples/nvopencl/nvopencl.cpp
-samples/nvopencl/nvopencl.hpp
-samples/nvopencl/nvopencl_kernels.cl
 samples/sleeper
 samples/sleeper/Makefile
 samples/sleeper/sleeper.cpp
diff --git a/debian/rules b/debian/rules
index 9cfe5f1..361eb68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -250,15 +250,20 @@ override_dh_auto_build: update-boinc-applinks.1
 	@echo "**** CXX=$(CXX) *****"
 	@echo
 	# disable optimization in api/, for SETI to work
-	$(MAKE) -C api CFLAGS="$(CFLAGS_noopt)" CXXFLAGS="$(CXXFLAGS_noopt)"
+	$(MAKE) -C api CFLAGS="$(CFLAGS_noopt)" CXXFLAGS="$(CXXFLAGS_noopt)" LDFLAGS=" -pthread"
+ifneq (,$(ENABLE_SERVER_TEST))
+	# FIXME For some reasons unzip build fails if hardening flags are enabled.
+	$(MAKE) -C zip CFLAGS="$(CFLAGS_plain)" CXXFLAGS="$(CXXFLAGS_plain)"
+	$(MAKE) -C zip/unzip CFLAGS="$(CFLAGS_plain)" CXXFLAGS="$(CXXFLAGS_plain)"
+endif
 	$(MAKE)
 
 	# Generate binary message catalogs of the BOINC Manager.
-	if [ -d locale/client ]; then \
-	  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"; \
+	#if [ -d locale ]; then \
+	  for i in `ls locale`; do \
+	    if [ -f "locale/$$i/BOINC-Manager.po" ]; then \
+	     msgfmt -o "locale/$$i/BOINC-Manager.mo" \
+	      "locale/$$i/BOINC-Manager.po"; \
 	    fi; \
 	  done; \
 	fi

-- 
BOINC packaging