[boinc] 01/01: Fixing typo in rules file

[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 adc18fded393e5c482561a34f1329ff92376e346
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 27 13:07:28 2014 +0200

    Fixing typo in rules file
---
 debian/changelog |  4 ++++
 debian/rules     | 14 ++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6f66200..dd2924c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 boinc (7.3.19+dfsg-2) UNRELEASED; urgency=medium
 
+  [ Guo Yixuan (郭溢譞) ]
   * Use more debhelper features.
   * Dropped parse_issues.patch, since the relevant part has been applied by
     the upstream already.
 
+  [ Gianfranco Costamagna ]
+  * Fix typo in debian/rules, we were unnecessarily building server stuff.
+
  -- Guo Yixuan (郭溢譞) <culu.gyx at gmail.com>  Mon, 26 May 2014 18:02:53 -0400
 
 boinc (7.3.19+dfsg-1) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index 48feb0b..6a57e2c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,16 +147,16 @@ $(shell cp debian/control.in debian/control)
 $(shell sed '/^#/d' -i debian/control)
 
 # check if we need to enable server packages, based on "exp" string in changelog
-ENABLE_EXPERIMENTAL_TEST := $(shell dpkg-parsechangelog | egrep '^Distribution:' |egrep -v 'experimental|UNRELEASED')
+ENABLE_SERVER_TEST := $(shell dpkg-parsechangelog | egrep '^Distribution:' |egrep -v 'experimental|UNRELEASED')
 
-ifeq (,$(ENABLE_EXPERIMENTAL_TEST))
+ifeq (,$(ENABLE_SERVER_TEST))
 $(shell sed 's/^%//' -i debian/control)
 else
 $(shell sed '/^%/d' -i debian/control)
 endif
 
-ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control debian/control.in | grep -v boinc-server-maker)
-ifeq (,$(ENABLE_EXPERIMENTAL_TEST))
+#ENABLE_SERVER_TEST := $(shell egrep '^Package:.*boinc-server-maker' debian/control debian/control.in | grep -v boinc-server-maker)
+ifeq (,$(ENABLE_SERVER_TEST))
 ENABLE_SERVER := --enable-server
 endif
 
@@ -279,11 +279,13 @@ 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))
+
+# we need to build zip because of the libboinc7 reference, until we split the dev packages or we move it in a new package
+#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
 	dh_auto_build
 
 	# Generate binary message catalogs of the BOINC Manager.

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