[med-svn] [SCM] emboss branch, master, updated. debian/6.3.1-6-28-g52c6977

[Andreas Tille]

The following commit has been merged in the master branch:
commit 52c6977676144314f582aca247ebd27b12d19554
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jun 19 11:47:52 2012 +0200

    Really enable hardening

diff --git a/debian/changelog b/debian/changelog
index 7d7f636..eb735a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,9 @@ emboss (6.4.0-1) UNRELEASED; urgency=low
 
   [ Andreas Tille ]
   * debian/upstream: separate reference section
-  * debian/rules: Make sure every binary package has a changelog file
+  * debian/rules:
+     - Make sure every binary package has a changelog file
+     - enable hardening
 
  -- Charles Plessy <plessy at debian.org>  Wed, 20 Jul 2011 13:22:15 +0900
 
diff --git a/debian/rules b/debian/rules
index 6b774ae..0913369 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,9 +20,13 @@ CONFFLAGS   += --enable-systemlibs
 CONFFLAGS   += --with-java=/usr/lib/jvm/default-java/include
 CONFFLAGS   += --with-javaos=/usr/lib/jvm/default-java/include/linux
 
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+
 DEB_LDFLAGS += -lexpat
 DEB_LDFLAGS += $(shell mysql_config --libs)
 DEB_LDFLAGS += -lpq
+DEB_LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
 #DEB_LDFLAGS += $(shell pg_config  | grep LIBS | cut -f2 -d=)
 
 override_dh_auto_configure:
@@ -30,7 +34,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(CONFFLAGS)
 	
 override_dh_auto_build:
-	dh_auto_build -- AJAX_FIXED_ROOT=\\\"/usr/share/EMBOSS\\\" LDFLAGS="$(DEB_LDFLAGS)"
+	dh_auto_build -- AJAX_FIXED_ROOT=\\\"/usr/share/EMBOSS\\\" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(DEB_LDFLAGS)"
 
 override_dh_clean:
 	dh_autotools-dev_restoreconfig

-- 
The European Molecular Biology Open Software Suite.