[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.14.4-11-g97610b2

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=b84b423

The following commit has been merged in the master branch:
commit b84b423736ad6c7ebfa412bd190fbb663cd3e2d8
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed May 30 16:10:39 2012 +0200

    Add a workaround for "cmake ignores CPPFLAGS" bug.
---
 debian/changelog      |    5 +++++
 qt-kde-team/2/dhmk.mk |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8305725..3e157f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,16 @@
 pkg-kde-tools (0.15.0~pre1) UNRELEASED; urgency=low
 
+  [ Modestas Vainius ]
   * Bump Standards-Version to 3.9.3: no changes needed.
   * Install pkgkde-git as an alias for pkgkde-vcs with VCS type forced to git.
   * Implement pkgkde-git clone and update-config subcommands.
   * Make variables.mk respect LDFLAGS from environment. Thanks to Simon
     Ruderich for the patch. (Closes: #669183)
 
+  [ José Manuel Santamaría Lema ]
+  * Add a workaround for cmake bug #653916 (cmake ignores CPPFLAGS) in
+    qt-kde-team/2/dhmk.mk.
+
  -- Modestas Vainius <modax at debian.org>  Mon, 21 May 2012 19:42:46 +0300
 
 pkg-kde-tools (0.14.4) unstable; urgency=low
diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index f3e21f4..84452a0 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -73,6 +73,11 @@ $(dhmk_env_mk): $(MAKEFILE_LIST)
 include $(call dhmk_include_cmd,$(dhmk_env_mk))
 include $(call dhmk_include_cmd,$(dhmk_rules_mk))
 
+# Add CPPFLAGS to CXXFLAGS, this is a workaround for a cmake bug,
+# which ignores CPPFLAGS, see:
+#  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653916
+export CXXFLAGS += $(CPPFLAGS)
+
 # Routine used to run an override target if there is one ($1 should be
 # override_{command})
 define dhmk_override_cmd

-- 
Debian Qt/KDE packaging tools