[SCM] BOINC packaging branch, master, updated. debian/7.1.21+dfsg-2_exp1-15-g4d17572

[Guo Yixuan]

The following commit has been merged in the master branch:
commit 4d17572bacf676d3d78eab5d8813e2dc949f1fa9
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Fri Jul 19 11:28:26 2013 +0800

    commented noopt flags

diff --git a/debian/changelog b/debian/changelog
index 3c2ba20..cc5b210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 boinc (7.2.4+dfsg-1exp1) experimental; urgency=low
 
+  [ Steffen Moeller ]
   * New upstream version.
     - reduced clang warnings patches
 
- -- Steffen Moeller <moeller at debian.org>  Tue, 16 Jul 2013 00:40:29 +0200
+  [ Guo Yixuan ]
+  * Removed a workaround (for seti segfault).
+
+ -- Guo Yixuan <culu.gyx at gmail.com>  Wed, 24 Jul 2013 14:21:51 +0800
 
 boinc (7.1.21+dfsg-1exp2) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 562def1..804a026 100755
--- a/debian/rules
+++ b/debian/rules
@@ -238,9 +238,9 @@ override_dh_auto_configure:
 update-boinc-applinks.1: debian/manpages/update-boinc-applinks.xml
 	docbook2x-man debian/manpages/update-boinc-applinks.xml
 
-# noopt
-CFLAGS_noopt = $(subst -O2,-O0,$(CFLAGS))
-CXXFLAGS_noopt = $(subst -O2,-O0,$(CXXFLAGS))
+# noopt, not necessary
+# CFLAGS_noopt = $(subst -O2,-O0,$(CFLAGS))
+# CXXFLAGS_noopt = $(subst -O2,-O0,$(CXXFLAGS))
 # noopt and no hardening
 CFLAGS_plain = -g -O0 -Wall
 CXXFLAGS_plain = $(CFLAGS_plain)
@@ -254,7 +254,7 @@ 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)"
 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)"

-- 
BOINC packaging