[SCM] Debian packaging for OpenSAML 2.0 branch, master, updated. debian/2.4.3-1-10-ge993b38

[Russ Allbery]

The following commit has been merged in the master branch:
commit 9db91bd40b6f30ad060255bc8b599467e2cdfca4
Author: Russ Allbery <rra at debian.org>
Date:   Fri Jan 27 18:31:47 2012 -0800

    Strip hardening flags out of pkgconfig
    
    Also go ahead and install pkgconfig in the multiarch directory, since
    it apparently supports that fine.

diff --git a/debian/libsaml2-dev.install b/debian/libsaml2-dev.install
index 0dab300..957c1df 100644
--- a/debian/libsaml2-dev.install
+++ b/debian/libsaml2-dev.install
@@ -1,3 +1,3 @@
 usr/include/*
 usr/lib/*/lib*.so
-debian/tmp/usr/lib/*/pkgconfig/opensaml.pc usr/lib/pkgconfig
+usr/lib/*/pkgconfig/opensaml.pc
diff --git a/debian/rules b/debian/rules
index 8bd77a1..bb8e0b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,10 @@
 # Enable compiler hardening flags.
 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
+# For stripping the flags back out of pkgconfig.
+STRIP_CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
+STRIP_LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
+
 DOCS = debian/libsaml2-doc/usr/share/doc/libsaml2-doc
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -14,9 +18,15 @@ endif
 override_dh_auto_configure:
 	dh_auto_configure -- --disable-dependency-tracking $(DEBUG)
 
+# Remove the upstream-installed documentation, and strip the hardening flags
+# out of the Cflags and Libs pkgconfig configuration.
 override_dh_install:
 	rm -r debian/tmp/usr/share/doc/opensaml*
 	dh_install -a -i --fail-missing
+	perl -i -pe 's/^(Libs: .*)\Q$(STRIP_LDFLAGS)\E/$$1/' \
+	    debian/*/usr/lib/*/pkgconfig/opensaml.pc
+	perl -i -pe 's/^(Cflags: .*)\Q$(STRIP_CPPFLAGS)\E/$$1/' \
+	    debian/*/usr/lib/*/pkgconfig/opensaml.pc
 
 override_dh_installdocs:
 	dh_installdocs -A doc/NOTICE.txt

-- 
Debian packaging for OpenSAML 2.0