Removes dependency on hardening-wrapper

This commit bumps compat level to 9, allowing for
DEB_BUILD_MAINT_OPTIONS to be used to specify that
hardening is desired, allowing for dpkg-buildflags
to intelligently set the hardening options passed
to gcc etc. (closes: Debian#836762).

Signed-off-by: Peter Palfrader <peter@palfrader.org>

debian/changelog

 tor (0.2.8.8-1) unstable; urgency=medium
 
+  [ Peter Palfrader ]
   * New upstream version.
 
- -- Peter Palfrader <weasel@debian.org>  Fri, 23 Sep 2016 23:35:10 +0200
+  [ Iain R. Learmonth ]
+  * Removes dependency on hardening-wrapper, and
+    build-depend on version >= 9 of debhelper instead
+    so we can enable harding via DEB_BUILD_MAINT_OPTIONS
+    (closes: #836762).
+
+ -- Peter Palfrader <weasel@debian.org>  Fri, 23 Sep 2016 23:39:27 +0200
 
 tor (0.2.8.7-1) unstable; urgency=medium
 

debian/compat

-8
+9

debian/control

@@ -2,7 +2,7 @@ Source: tor
 Section: net
 Priority: optional
 Maintainer: Peter Palfrader <weasel@debian.org>
-Build-Depends: debhelper (>= 8.1.0~), quilt, libssl-dev, zlib1g-dev, libevent-dev (>= 1.1), binutils (>= 2.14.90.0.7), hardening-includes, asciidoc (>= 8.2), docbook-xml, docbook-xsl, xmlto, dh-apparmor, libseccomp-dev [amd64 i386], dh-systemd [linux-any], libsystemd-dev [linux-any], pkg-config [linux-any], dh-autoreconf
+Build-Depends: debhelper (>= 9), quilt, libssl-dev, zlib1g-dev, libevent-dev (>= 1.1), binutils (>= 2.14.90.0.7), asciidoc (>= 8.2), docbook-xml, docbook-xsl, xmlto, dh-apparmor, libseccomp-dev [amd64 i386], dh-systemd [linux-any], libsystemd-dev [linux-any], pkg-config [linux-any], dh-autoreconf
 Build-Conflicts: libnacl-dev, libseccomp-dev [!amd64 !i386]
 Standards-Version: 3.9.4
 Homepage: https://www.torproject.org/

debian/rules

@@ -5,6 +5,8 @@ DH_VERBOSE ?= 1
 
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 # allow building against libdmalloc4 - it better be installed
 ifneq (,$(findstring with-dmalloc,$(DEB_BUILD_OPTIONS)))
 	confflags += --with-dmalloc