[nauty] 01/01: FTBFS fix #819430

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository nauty.

commit 1b0c3a3945dd4d87d0f1942dce78366730b083ee
Author: Jerome BENOIT <calculus at rezozer.net>
Date:   Mon Mar 28 16:56:11 2016 +0200

    FTBFS fix #819430
---
 debian/changelog | 10 ++++++++++
 debian/rules     | 11 ++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4b928ba..33ee894 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+nauty (2.6r3+ds-2) unstable; urgency=medium
+
+  * FTBFS bug fix release (Closes: #819430):
+    - build without TLS support on armhf architecture.
+  * Debianization:
+    - debian/rules:
+      - dpkg-buildflags, add hardening=+all.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Mon, 28 Mar 2016 13:32:54 +0000
+
 nauty (2.6r3+ds-1) unstable; urgency=medium
 
   * New upstream minor version:
diff --git a/debian/rules b/debian/rules
index 9d40db7..a32eeed 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,16 @@
 #!/usr/bin/make -f
 
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
 export DEB_PKG_VERSION = "\"$(shell dpkg-parsechangelog -S Version)\""
 export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+ifeq ($(DEB_HOST_ARCH),armhf)
+	DEB_DH_AUTO_CONFIGURE_OPTS__ENABLE_TLS := --disable-tls
+else
+	DEB_DH_AUTO_CONFIGURE_OPTS__ENABLE_TLS := --enable-tls
+endif
 
 default:
 	@uscan --no-conf --dehs --report || true
@@ -10,7 +19,7 @@ default:
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-clz --enable-tls --disable-ansicontrols
+	dh_auto_configure -- --enable-clz $(DEB_DH_AUTO_CONFIGURE_OPTS__ENABLE_TLS) --disable-ansicontrols
 
 override_dh_installchangelogs:
 	dh_installchangelogs --keep changes24-26.txt

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