[SCM] QCA2 OpenSSL plugin packaging branch, master, updated. debian/2.0.0-beta3-1-3-ge3610f7

Felix Geyer debfx-guest at alioth.debian.org
Sun Oct 23 14:39:14 UTC 2011


The following commit has been merged in the master branch:
commit e3610f7613d19e6516899d2111fed9b52316ab70
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun Oct 23 16:38:10 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 ba1767b..f1538d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qca2-plugin-ossl (2.0.0~beta3-2) UNRELEASED; urgency=low
 
   * Don't export build flags since pkg-kde-tools (and dpkg-buildpackage in
     the past) takes care of that.
+  * Pass $CPPFLAGS to the build system.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 23 Oct 2011 16:23:35 +0200
 
diff --git a/debian/rules b/debian/rules
index 7129160..b047750 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,8 @@ dh += --buildsystem=qmake
 
 override_dh_auto_configure:
 	./configure --verbose --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
 	qmake-qt4
 

-- 
QCA2 OpenSSL plugin packaging



More information about the pkg-kde-commits mailing list