[SCM] spatialite-tools branch, master, updated. debian/3.1.0b-1-9-gc1684ec

[David Paleino]

The following commit has been merged in the master branch:
commit de45e28a8c37a2d28b5c94c05b907fda621a3c92
Author: David Paleino <dapal at debian.org>
Date:   Sat Dec 1 21:15:57 2012 +0100

    Added hardening instructions to debian/rules

diff --git a/debian/changelog b/debian/changelog
index 7a6262b..057b871 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ spatialite-tools (4.0.0-1) UNRELEASED; urgency=low
 
   * New upstream version
   * Bump requirement of libspatialite to >= 4.0.0
+  * Added hardening instructions to debian/rules
 
- -- David Paleino <dapal at debian.org>  Sat, 01 Dec 2012 20:50:18 +0100
+ -- David Paleino <dapal at debian.org>  Sat, 01 Dec 2012 21:15:46 +0100
 
 spatialite-tools (3.1.0b-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c450b0d..98095e5 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Uploaders:
 Build-Depends:
  debhelper (>= 8)
  , autotools-dev
+ , hardening-includes
  , libspatialite-dev (>= 4.0.0~)
  , libsqlite3-dev (>= 3.6.11)
  , libreadline-dev
diff --git a/debian/rules b/debian/rules
index 35cc7f0..d49d617 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,13 @@
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
-export DH_OPTIONS
+#export DH_OPTIONS
+
+include /usr/share/hardening-includes/hardening.make
+CFLAGS   = $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS  = $(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS  += $(HARDENING_CFLAGS)
+LDFLAGS += $(HARDENING_LDFLAGS)
 
 FULL_VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2 | cut -d- -f1)
 VERSION := $(shell echo $(FULL_VERSION) | sed -e "s/~beta[[:digit:]]\+/-BETA/")

-- 
Spatialite Tools