[SCM] BOINC packaging branch, sid, updated. debian/7.0.27+dfsg-4-8-g15303e3

[Guo Yixuan]

The following commit has been merged in the sid branch:
commit 89229bd6dbbf3bc685d035292116ed45a92823b8
Author: Guo Yixuan <culu.gyx at gmail.com>
Date:   Sun Jun 24 18:50:15 2012 +0800

    switch to use buildflags.mk for default flags

diff --git a/debian/changelog b/debian/changelog
index dfcf48a..eb3d36f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 boinc (7.0.27+dfsg-5) UNRELEASED; urgency=low
 
   * debian/rules: use dpkg-buildflags to get default flags.
+  * debian/control: build-depend on dpkg >= 1.16.1.1, because buildflags.mk
+    and DEB_BUILD_MAINT_OPTIONS are needed.
 
  -- Guo Yixuan <culu.gyx at gmail.com>  Sun, 24 Jun 2012 17:18:06 +0800
 
diff --git a/debian/control b/debian/control
index 7adc819..6bc7f97 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,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 (>= 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 6297b2a..3778c97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,9 @@
 #export CXX=/usr/lib/gcc-snapshot/bin/g++
 #export CPP=/usr/lib/gcc-snapshot/bin/cpp
 
-# Get default flags from dpkg-buildflags
-export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-export CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
-export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
+# 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)

-- 
BOINC packaging