[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 1b35e752d3d5e4e9d33f63a61383ec1ad6a98731
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Oct 23 16:11:38 2011 +0200

    Modify CFLAGS and CXXFLAGS after including debian-qt-kde.mk so the changes are not overwritten.
---
 debian/changelog |    3 +++
 debian/rules     |    7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e012669..11e74fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 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.
 
  -- 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 afd74b1..cafbaa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,10 @@
 #!/usr/bin/make -f
 
-CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -fvisibility=hidden -fvisibility-inlines-hidden
-CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) -fvisibility=hidden -fvisibility-inlines-hidden
-LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+
 dh += --buildsystem=qmake
 
 override_dh_auto_configure:

-- 
QCA2 library packaging