[med-svn] r10794 - trunk/packages/edfbrowser/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-05-09 12:22:08 +0000 (Wed, 09 May 2012)
New Revision: 10794

Modified:
   trunk/packages/edfbrowser/trunk/debian/changelog
   trunk/packages/edfbrowser/trunk/debian/rules
Log:
New upstream version; really use hardening flags


Modified: trunk/packages/edfbrowser/trunk/debian/changelog
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/changelog	2012-05-09 11:58:53 UTC (rev 10793)
+++ trunk/packages/edfbrowser/trunk/debian/changelog	2012-05-09 12:22:08 UTC (rev 10794)
@@ -1,3 +1,10 @@
+edfbrowser (1.47-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/rules: Propagate hardening flags into Makefile
+
+ -- Andreas Tille <tille at debian.org>  Wed, 09 May 2012 12:58:33 +0200
+
 edfbrowser (1.46-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/edfbrowser/trunk/debian/rules
===================================================================
--- trunk/packages/edfbrowser/trunk/debian/rules	2012-05-09 11:58:53 UTC (rev 10793)
+++ trunk/packages/edfbrowser/trunk/debian/rules	2012-05-09 12:22:08 UTC (rev 10794)
@@ -8,7 +8,7 @@
 ARCH                := $(shell dpkg-architecture -qDEB_BUILD_ARCH     )
 
 # of course, qmake wants to do it its own way
-QMAKE_CXXFLAGS += -Wall -Wshadow -Wextra -ggdb3
+QMAKE_CXXFLAGS += $(CPPFLAGS) -Wall -Wshadow -Wextra -ggdb3 $(LDFLAGS)
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   QMAKE_CXXFLAGS_RELEASE = -O0
 else