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

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=8fe3484

The following commit has been merged in the master branch:
commit 8fe3484147fada9ad9210e26ded450266c0b9553
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun May 20 11:41:30 2012 +0200

    Pass build flags to qcatool2.
---
 debian/changelog |    1 +
 debian/rules     |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 347749f..ff909dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ qca2 (2.0.3-3) UNRELEASED; urgency=low
     - Move qcatool2 into an own package.
     - Mark libqca2 and libqca2-dbg as Multi-Arch: same.
   * Fix passing $LDFLAGS to the build system.
+  * Pass build flags to qcatool2.
 
  -- 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 17bc6f7..8f0132f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,9 @@ override_dh_auto_configure:
 	echo QMAKE_CFLAGS_DEBUG="$(CFLAGS) $(CPPFLAGS)" >> conf.pri
 	echo QMAKE_CXXFLAGS_DEBUG="$(CXXFLAGS) $(CPPFLAGS)" >> conf.pri
 	echo QMAKE_LFLAGS_DEBUG="$(LDFLAGS)" >> conf.pri
+	echo QMAKE_CFLAGS_DEBUG="$(CFLAGS) $(CPPFLAGS)" >> confapp.pri
+	echo QMAKE_CXXFLAGS_DEBUG="$(CXXFLAGS) $(CPPFLAGS)" >> confapp.pri
+	echo QMAKE_LFLAGS_DEBUG="$(LDFLAGS)" >> confapp.pri
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=libqca2-dbg

-- 
QCA2 library packaging