[SCM] cookietool: a suite of programs to help maintain a fortune database branch, master, updated. debian/2.5-4-17-gaf270dc

[Peter Pentchev]

The following commit has been merged in the master branch:
commit 873ebbdd519a557d7a2511e5b4fa0bff5426458b
Author: Peter Pentchev <roam at ringlet.net>
Date:   Fri Feb 11 16:40:20 2011 +0200

    Enable build hardening by default.

diff --git a/debian/changelog b/debian/changelog
index 8447876..a202291 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ cookietool (2.5-5) UNRELEASED; urgency=low
   * Use hardening-includes instead of hardening-wrapper so that
     the hardened flags (if requested) are visible in CFLAGS and LDFLAGS.
   * Move the packaging to Git and update the Vcs-* control fields.
+  * Enable build hardening by default unless the "nohardening" build
+    option is specified.
 
  -- Peter Pentchev <roam at ringlet.net>  Sun, 28 Nov 2010 16:58:20 +0200
 
diff --git a/debian/rules b/debian/rules
index 253919d..bcf1698 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ endif
 
 include /usr/share/hardening-includes/hardening.make
 
-ifneq (,$(filter hardening,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter nohardening,$(DEB_BUILD_OPTIONS)))
 CFLAGS+=	$(HARDENING_CFLAGS)
 LDFLAGS+=	$(HARDENING_LDFLAGS)
 endif

-- 
cookietool: a suite of programs to help maintain a fortune database