[libdap] 37/48: Typo in hardening flags; Change --as-needed

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.

commit 2e1d7795c74559d19ede9d747b08c942d79f5d1b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Oct 17 22:19:42 2013 +0100

    Typo in hardening flags; Change --as-needed
---
 debian/changelog | 2 ++
 debian/rules     | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f98bc8..8482fde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 libdap (3.12.0-1) unstable; urgency=low
 
   * Add debian/watch file.
+  * Fix typo in hardening flags; Change  to =all,-pie ; 
+    Use DEB_LDFLAGS_MAINT_APPEND. Closes: #697387.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 17 Oct 2013 22:12:11 +0100
 
diff --git a/debian/rules b/debian/rules
index 3c672cd..1818b7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,12 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 # To enable all, uncomment following line
-DEB_BUILD_MAINT_OPTIONS:= hardening=+allx
+DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-pie
 DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic
+DEB_LDFLAGS_MAINT_APPEND:= -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS
 export DEB_CFLAGS_MAINT_APPEND
+export DEB_LDFLAGS_MAINT_APPEND
 # Always do verbose.
 export DH_VERBOSE=1
 
@@ -25,7 +27,7 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 override_dh_auto_configure:
-	LDFLAGS="$(LDFLAGS)  -Wl,--as-needed" dh_auto_configure -- --with-gnu-ld
+	dh_auto_configure -- --with-gnu-ld
 
 override_dh_auto_build:
 	dh_auto_build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git