[xml/sgml-commit] [xmlsec1] 17/32: Imported Debian patch 1.2.14-1.3

[Rene Engelhard]

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

rene pushed a commit to branch experimental
in repository xmlsec1.

commit 100c57c6bfc47e588b0ab079af1ad629606149a7
Author: Moritz Muehlenhoff <jmm at debian.org>
Date:   Fri Apr 6 21:31:59 2012 +0200

    Imported Debian patch 1.2.14-1.3
---
 debian/changelog | 7 +++++++
 debian/rules     | 6 +-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index baf911f..d493c79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xmlsec1 (1.2.14-1.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Enable hardened build flags (Bug #656655)
+
+ -- Moritz Muehlenhoff <jmm at debian.org>  Fri, 06 Apr 2012 21:31:59 +0200
+
 xmlsec1 (1.2.14-1.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/rules b/debian/rules
index d4ab603..6ec0a8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,11 +10,6 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-
 # shared library versions, option 1
 #version=2.0.5
 #major=2
@@ -34,6 +29,7 @@ config.status: configure
 	./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
+		$(shell dpkg-buildflags --export=configure) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-xml-sgml/xmlsec1.git