[SCM] BOINC packaging branch, master, updated. debian/7.0.27+dfsg-3-43-g99554f5

[Guo Yixuan]

The following commit has been merged in the master branch:
commit bb045efe262fa2681188435b694d235d7d58ad20
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sun Jun 24 17:39:57 2012 +0800

    use buildflags.mk to provide default flags

diff --git a/debian/changelog b/debian/changelog
index 604ba68..33e5abb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 boinc (7.0.30+dfsg-1) UNRELEASED; urgency=low
 
+  [ Steffen Moeller ]
   * New upstream version.
 
+  [ Guo Yixuan ]
+  * debian/rules: use dpkg-buildflags to get default flags.
+  * debian/control: build-depend on dpkg-dev >= 1.16.1.1, because buildflags.mk
+    and DEB_BUILD_MAINT_OPTIONS are needed.
+
  -- Steffen Moeller <moeller at debian.org>  Sat, 30 Jun 2012 21:59:59 +0200
 
 boinc (7.0.28+dfsg-3) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index 5aca950..4c5969f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders: Steffen Moeller <moeller at debian.org>,
 DM-Upload-Allowed: yes
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 7.0.50~), po-debconf, dh-buildinfo, pkg-config (>= 0.15),
+ dpkg-dev (>= 1.16.1.1),
  libtool, autoconf (>= 2.59), autotools-dev, automake1.9 (>= 1.9.3), gettext,
  docbook2x, docbook-xml, libxml2-utils,
  zlib1g-dev, libssl-dev, libcurl4-openssl-dev (>= 7.17.1),
diff --git a/debian/rules b/debian/rules
index f885d6e..656556a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,10 @@
 #export CXX=/usr/lib/gcc-snapshot/bin/g++
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
+# Set default flags with dpkg-buildflags
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -99,12 +103,9 @@ ifeq ($(DEB_HOST_GNU_TYPE), i486-gnu)
 endif
 
 
-CFLAGS += -g -Wall
-CXXFLAGS += -g -Wall
-CFLAGS += -D_FORTIFY_SOURCE=1 -fstack-protector
-CXXFLAGS += -D_FORTIFY_SOURCE=1 -fstack-protector
+CFLAGS += -Wall
+CXXFLAGS += -Wall
 LDFLAGS += -Wl,--as-needed
-LDFLAGS += -Wl,-z,relro
 LDFLAGS += -Wl,-z,now
 # hurd needs the following
 LDFLAGS += -Wl,--no-add-needed

-- 
BOINC packaging