[med-svn] r18138 - trunk/packages/soap/soapdenovo2/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-09-25 15:21:11 +0000 (Thu, 25 Sep 2014)
New Revision: 18138

Modified:
   trunk/packages/soap/soapdenovo2/trunk/debian/changelog
   trunk/packages/soap/soapdenovo2/trunk/debian/control
   trunk/packages/soap/soapdenovo2/trunk/debian/rules
Log:
hardening-includes is obsolete


Modified: trunk/packages/soap/soapdenovo2/trunk/debian/changelog
===================================================================
--- trunk/packages/soap/soapdenovo2/trunk/debian/changelog	2014-09-25 15:15:47 UTC (rev 18137)
+++ trunk/packages/soap/soapdenovo2/trunk/debian/changelog	2014-09-25 15:21:11 UTC (rev 18138)
@@ -3,6 +3,7 @@
   * Fix watch file to not report "-mac"
   * cme fix dpkg-control
   * re-order d/copyright to fit DEP5
+  * d/control+d/rules: hardening-includes is obsolete
 
  -- Andreas Tille <tille at debian.org>  Thu, 25 Sep 2014 17:11:27 +0200
 

Modified: trunk/packages/soap/soapdenovo2/trunk/debian/control
===================================================================
--- trunk/packages/soap/soapdenovo2/trunk/debian/control	2014-09-25 15:15:47 UTC (rev 18137)
+++ trunk/packages/soap/soapdenovo2/trunk/debian/control	2014-09-25 15:21:11 UTC (rev 18138)
@@ -5,7 +5,6 @@
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
-               hardening-includes,
                zlib1g-dev,
                libbam-dev,
                libaio-dev

Modified: trunk/packages/soap/soapdenovo2/trunk/debian/rules
===================================================================
--- trunk/packages/soap/soapdenovo2/trunk/debian/rules	2014-09-25 15:15:47 UTC (rev 18137)
+++ trunk/packages/soap/soapdenovo2/trunk/debian/rules	2014-09-25 15:21:11 UTC (rev 18138)
@@ -1,17 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-export DEB_BUILD_HARDENING=1
-export DEB_BUILD_HARDENING_FORTIFY=1
 
-include /usr/share/hardening-includes/hardening.make
-
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-CXXFLAGS+=$(HARDENING_CXXFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)
-
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1