[rkward/releases/0.6.5] debian-official: Try to pass all CPPFlags, again.

[Thomas Friedrichsmeier]

Git commit 4519ac5099885647d7b5b00ed5e59758386ffdda by Thomas Friedrichsmeier.
Committed on 09/05/2016 at 16:53.
Pushed by tfry into branch 'releases/0.6.5'.

Try to pass all CPPFlags, again.

Side-effect of this commit should be that the dailies are re-built against R 3.3.0 in the launchpad PPA.

M  +7    -1    debian-official/changelog
M  +5    -0    debian-official/rules

http://commits.kde.org/rkward/4519ac5099885647d7b5b00ed5e59758386ffdda

diff --git a/debian-official/changelog b/debian-official/changelog
index 6d4c12c..54c1874 100644
--- a/debian-official/changelog
+++ b/debian-official/changelog
@@ -1,4 +1,10 @@
-rkward (0.6.5-1) unstable; urgency=low
+rkward (0.6.5-2) unstable; urgency=low
+  * CPPFLags (TODO test)
+  * Force rebuild against R 3.3.x
+
+ -- Thomas Friedrichsmeier <tfry at users.sourceforge.net>  Mon, 09 May 2017 11:00:00 +0100
+
+ rkward (0.6.5-1) unstable; urgency=low
   * new upstream release
     (unchanged with respect to ~rc1)
   * fix debian/watch file
diff --git a/debian-official/rules b/debian-official/rules
index fbfee84..18c3f2e 100755
--- a/debian-official/rules
+++ b/debian-official/rules
@@ -8,6 +8,11 @@ RMINOR = $(shell echo $(RVERS) | awk -F. '{print $$2}')
 # set built-time of GNUR packages to time of created binary package based on stamp in changelog
 builttime = $(shell dpkg-parsechangelog -l$(CURDIR)/debian/changelog | awk -F': ' '/Date/ {print $$2}')
 
+# Workaround for cmake not handling CPPFLAGS (https://wiki.debian.org/HardeningWalkthrough):
+# As we cannot easily use dh for configuring, we have to merge flags, manually.
+CFLAGS += $(CPPFLAGS)
+CXXFLAGS += $(CPPFLAGS)
+
 # easier typing
 DESTDIR = $(CURDIR)/debian/tmp
 BUILDDIR = $(CURDIR)/debian/build