[SCM] Qt 4 packaging branch, master, updated. debian/4.7.4-2-4-g8d94a4d

[Pino Toscano]

The following commit has been merged in the master branch:
commit 8d94a4de32b2588dee610ffb8a368859b776e9a7
Author: Pino Toscano <pino at debian.org>
Date:   Mon Mar 5 22:11:17 2012 +0100

    use dpkg-buildflags to set CFLAGS, CXXFLAGS and LDFLAGS (#657637)
    
    Qt's build system does not support CPPFLAGS, so they are just appended to CFLAGS and CXXFLAGS.
---
 debian/changelog |    3 +++
 debian/rules     |    4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21f46eb..01695b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ qt4-x11 (4:4.7.4-3) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Switch the libpng12-dev build dependency to libpng-dev. (Closes: #662484)
   * Fix build failure with -Werror=format-security (patch fix-format.diff).
+  * Use dpkg-buildflags to set CFLAGS, CXXFLAGS and LDFLAGS and export them;
+    Qt's build system does not support CPPFLAGS, so they are just appended
+    to CFLAGS and CXXFLAGS. (Closes: #657637)
 
  -- Fathi Boudra <fabo at debian.org>  Fri, 06 Jan 2012 21:54:25 +0200
 
diff --git a/debian/rules b/debian/rules
index 832b7e7..63de657 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,9 @@
 
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
-export LDFLAGS := -Wl,--as-needed
+export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 # workaround to use lrelease.
 export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 # workaround to use qhelpgenerator.

-- 
Qt 4 packaging