[med-svn] r14292 - trunk/packages/phyml/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-07-31 10:20:32 +0000 (Wed, 31 Jul 2013)
New Revision: 14292

Modified:
   trunk/packages/phyml/trunk/debian/changelog
   trunk/packages/phyml/trunk/debian/rules
Log:
Propagate hardening options


Modified: trunk/packages/phyml/trunk/debian/changelog
===================================================================
--- trunk/packages/phyml/trunk/debian/changelog	2013-07-31 10:01:23 UTC (rev 14291)
+++ trunk/packages/phyml/trunk/debian/changelog	2013-07-31 10:20:32 UTC (rev 14292)
@@ -10,8 +10,9 @@
      - cme fix dpkg-control
      - debhelper 9
      - use anonscm in Vcs fields
-  * debian/rules: Use dh more consequently to work around two different
-    configure steps
+  * debian/rules:
+     - Use dh more consequently to work around two different configure steps
+     - Propagate hardening options
 
  -- Charles Plessy <plessy at debian.org>  Mon, 15 Jul 2013 09:55:11 +0900
 

Modified: trunk/packages/phyml/trunk/debian/rules
===================================================================
--- trunk/packages/phyml/trunk/debian/rules	2013-07-31 10:01:23 UTC (rev 14291)
+++ trunk/packages/phyml/trunk/debian/rules	2013-07-31 10:20:32 UTC (rev 14292)
@@ -12,12 +12,12 @@
 	# According to README you need different configure options to get different executables
 	# Here we hack in a full build process for phyml executable
 	dh_auto_configure
-	dh_auto_build
+	dh_auto_build -- LDFLAGS="$(LDFLAGS)"
 	# move phyml binary to temporary dir inside debian/
 	$(MAKE) prefix=$(CURDIR)/debian install
 	$(MAKE) distclean
 	dh_auto_configure -- --enable-phytime
-	dh_auto_build
+	dh_auto_build -- LDFLAGS="$(LDFLAGS)"
 
 override_dh_auto_install:
 	dh_auto_install