[boinc] 01/02: Enabling samples/zip/unzip only with server

[Gianfranco Costamagna]

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

locutusofborg-guest pushed a commit to annotated tag debian/7.2.47+dfsg-2
in repository boinc.

commit e346c5ac1cbb013313ef79ddf2c2541d80472c14
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Sat May 3 15:16:16 2014 +0200

    Enabling samples/zip/unzip only with server
---
 debian/changelog |  8 ++++++++
 debian/rules     | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0bf6c9b..b6b6127 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+boinc (7.2.47+dfsg-2) UNRELEASED; urgency=medium
+
+  * samples/zip/unzip only built with server.
+  * Revert Versioned dependency on libcurl4-openssl-dev (>= 7.36.0)
+    the build failure caused by old libcurl seems fixed.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Sat, 03 May 2014 15:15:32 +0200
+
 boinc (7.2.47+dfsg-1) experimental; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index b980d12..cb85882 100755
--- a/debian/rules
+++ b/debian/rules
@@ -274,11 +274,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.
@@ -291,12 +291,12 @@ override_dh_auto_build: update-boinc-applinks.1
 #	  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 \
@@ -378,11 +378,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%' ; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git