[SCM] tango branch, master, updated. debian/7.2.6+dfsg-11-3-g195a8b7

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Fri Oct 21 21:04:58 UTC 2011


The following commit has been merged in the master branch:
commit d7e6f14adde50fcea2abb5b25f43a541e2a10d8c
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Oct 21 21:56:21 2011 +0200

    activate the hardening flags (release goal)

diff --git a/debian/changelog b/debian/changelog
index 0f8013a..e618242 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tango (7.2.6+dfsg-12) unstable; urgency=low
+
+  * remove symbols files (Closes: #635867)
+  * hardening flags activated as we are providing daemons.
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Fri, 21 Oct 2011 20:44:03 +0200
+
 tango (7.2.6+dfsg-11) unstable; urgency=low
 
   * debian/*.symbols
diff --git a/debian/rules b/debian/rules
index ac29c1a..1955785 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 BUILDROOT=build
 PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+.*/\1/p')
-LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')
+
+dpkg_buildflags = DEB_LDFLAGS_MAINT_STRIP="-Wl,-Bsymbolic-functions" dpkg-buildflags
 
 get-orig-source:
 	uscan --verbose --force-download --download-current-version
@@ -14,7 +15,7 @@ get-orig-source:
 	ln -fs $(PACKAGE)-$(VERSION)+dfsg.tar.gz ../$(PACKAGE)_$(VERSION)+dfsg.orig.tar.gz
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
+	dh_auto_configure -- $(shell $(dpkg_buildflags) --export=configure) --with-omni=/usr --disable-dbcreate --disable-java --with-doxygen --disable-jpegmmx
 
 override_dh_auto_install:
 	dh_auto_install --destdir="$(CURDIR)/debian/tmp/"

-- 
TANGO distributed control system.



More information about the debian-science-commits mailing list