[SCM] QCA2 library packaging branch, master, updated. debian/2.0.3-2-4-g9811b06

[Felix Geyer]

The following commit has been merged in the master branch:
commit 55d697dc0560506a500c0e84f7279dd4524706a6
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Oct 23 16:21:25 2011 +0200

    Pass $CPPFLAGS to the build system.
---
 debian/changelog |    1 +
 debian/rules     |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11e74fa..24cb166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qca2 (2.0.3-3) UNRELEASED; urgency=low
   [ Felix Geyer ]
   * Modify CFLAGS and CXXFLAGS after including debian-qt-kde.mk so the
     changes are not overwritten.
+  * Pass $CPPFLAGS to the build system.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 23 Oct 2011 16:03:44 +0200
 
diff --git a/debian/rules b/debian/rules
index cafbaa6..3fe35fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,8 @@ dh += --buildsystem=qmake
 
 override_dh_auto_configure:
 	./configure --verbose --prefix=/usr --qtdir=/usr/share/qt4 --debug --no-separate-debug-info
-	echo QMAKE_CFLAGS_DEBUG="$(CFLAGS)" >> conf.pri
-	echo QMAKE_CXXFLAGS_DEBUG="$(CXXFLAGS)" >> conf.pri
+	echo QMAKE_CFLAGS_DEBUG="$(CFLAGS) $(CPPFLAGS)" >> conf.pri
+	echo QMAKE_CXXFLAGS_DEBUG="$(CXXFLAGS) $(CPPFLAGS)" >> conf.pri
 	echo QMAKE_LDFLAGS_DEBUG="$(LDFLAGS)" >> conf.pri
 
 override_dh_strip:

-- 
QCA2 library packaging