[SCM] BOINC packaging branch, master, updated. upstream/7.0.46+dfsg-640-gcf0c534

[Gianfranco Costamagna]

The following commit has been merged in the master branch:
commit cf0c5349d45df3a3f49bb3792ccfdbe651296816
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Thu Jan 31 10:10:29 2013 +0100

    Fix problem in client build, refactored a little bit the server code

diff --git a/debian/rules b/debian/rules
index f3bb33c..d3383de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -134,12 +134,12 @@ CFLAGS_boinc-client := $(CFLAGS)
 CXXFLAGS_boinc-client := $(CXXFLAGS)
 
 ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control.in)
+ifeq (,$(ENABLE_SERVER_TEST))
 ENABLE_SERVER := --disable-server
-ifneq (,$(ENABLE_SERVER_TEST))
+TMP=$(shell egrep -v '^%' debian/control.in > debian/control)
+else
 ENABLE_SERVER := --enable-server
 TMP=$(shell sed -e 's/^%//' debian/control.in > debian/control)
-else
-TMP=$(shell egrep -v '^%' debian/control.in > debian/control)
 endif
 
 # --disable-static
@@ -242,7 +242,7 @@ override_dh_auto_build: update-boinc-applinks.1
 	    fi; \
 	  done; \
 	fi
-ifeq (,$(ENABLE_SERVER_TEST))
+ifneq (,$(ENABLE_SERVER_TEST))
 	$(MAKE) -C samples/sleeper
 	$(MAKE) -C samples/worker
 	$(MAKE) -C samples/example_app

-- 
BOINC packaging