[med-svn] r12191 - trunk/packages/velvet/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-09-07 13:11:32 +0000 (Fri, 07 Sep 2012)
New Revision: 12191

Modified:
   trunk/packages/velvet/trunk/debian/changelog
   trunk/packages/velvet/trunk/debian/compat
   trunk/packages/velvet/trunk/debian/control
   trunk/packages/velvet/trunk/debian/rules
Log:
Hardening options


Modified: trunk/packages/velvet/trunk/debian/changelog
===================================================================
--- trunk/packages/velvet/trunk/debian/changelog	2012-09-07 13:09:36 UTC (rev 12190)
+++ trunk/packages/velvet/trunk/debian/changelog	2012-09-07 13:11:32 UTC (rev 12191)
@@ -12,6 +12,8 @@
   * rename debian/{docs,install} to debian/velvet.{docs,install} which
     is more safe in the case of multibinary package
   * debian/velvet.install: shuffle* files are in contrib directory now
+  * debhelper 9 (control+compat) to enable hardening options
+  * debian/rules: propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Fri, 07 Sep 2012 14:00:49 +0200
 

Modified: trunk/packages/velvet/trunk/debian/compat
===================================================================
--- trunk/packages/velvet/trunk/debian/compat	2012-09-07 13:09:36 UTC (rev 12190)
+++ trunk/packages/velvet/trunk/debian/compat	2012-09-07 13:11:32 UTC (rev 12191)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/velvet/trunk/debian/control
===================================================================
--- trunk/packages/velvet/trunk/debian/control	2012-09-07 13:09:36 UTC (rev 12190)
+++ trunk/packages/velvet/trunk/debian/control	2012-09-07 13:11:32 UTC (rev 12191)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Charles Plessy <plessy at debian.org>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), zlib1g-dev, help2man, texlive-latex-base
+Build-Depends: debhelper (>= 9), zlib1g-dev, help2man, texlive-latex-base
 Standards-Version: 3.9.3
 Homepage: http://www.ebi.ac.uk/~zerbino/velvet/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/velvet/trunk/

Modified: trunk/packages/velvet/trunk/debian/rules
===================================================================
--- trunk/packages/velvet/trunk/debian/rules	2012-09-07 13:09:36 UTC (rev 12190)
+++ trunk/packages/velvet/trunk/debian/rules	2012-09-07 13:11:32 UTC (rev 12191)
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh  $@
+	dh $@
 
 pkg=velvet
 
@@ -14,8 +14,8 @@
 
 override_dh_auto_build :
 	touch zlib # prevents the zlib in the ‘third-party’ folder to be built.
-	dh_auto_build -- OPENMP=1
-	dh_auto_build -- color OPENMP=1
+	dh_auto_build -- OPENMP=1 CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	dh_auto_build -- color OPENMP=1 CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 override_dh_install :
 	mkdir -p $(CURDIR)/debian/$(pkg)/usr/share/man/man1/