[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.3+dfsg-3-9-g2a05bab

[Russ Allbery]

The following commit has been merged in the master branch:
commit 26389b652b80960d0b64178dccff37b769e0e20b
Author: Russ Allbery <rra at debian.org>
Date:   Wed Feb 1 22:30:36 2012 -0800

    Debhelper level V9, enable hardening and multi-arch
    
    * Update to debhelper compatibility level V9.
      - Enable hardening build flags.  (Closes: #656006)
      - Enable multiarch support.

diff --git a/debian/changelog b/debian/changelog
index e979ade..a38027b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shibboleth-sp2 (2.4.3+dfsg-4) UNRELEASED; urgency=low
+
+  * Update to debhelper compatibility level V9.
+    - Enable hardening build flags.  (Closes: #656006)
+    - Enable multiarch support.
+
+ -- Russ Allbery <rra at debian.org>  Wed, 01 Feb 2012 22:27:55 -0800
+
 shibboleth-sp2 (2.4.3+dfsg-3) unstable; urgency=low
 
   * Remove the armel build dependency on g++-4.4 and the code in
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 9c30f70..d42ee96 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
 Uploaders: Russ Allbery <rra at debian.org>, Ferenc Wagner <wferi at niif.hu>,
  Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 8), apache2-threaded-dev, autoconf, automake,
+Build-Depends: debhelper (>= 9), apache2-threaded-dev, autoconf, automake,
  autotools-dev, doxygen, graphviz, liblog4cpp5-dev, libmemcached-dev,
  libsaml2-dev (>= 2.4), libssl-dev, libtool, libxerces-c-dev,
  libxml-security-c-dev (>= 1.6), libxmltooling-dev (>= 1.4),
@@ -35,6 +35,7 @@ Description: Federated web single sign-on system (Apache module)
 Package: libshibsp5
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, opensaml2-schemas (>= 2.4),
  shibboleth-sp2-schemas (>= 2.4), xmltooling-schemas (>= 1.4)
 Description: Federated web single sign-on system (runtime)
diff --git a/debian/libshibsp-dev.install b/debian/libshibsp-dev.install
index 90a4881..f3800aa 100644
--- a/debian/libshibsp-dev.install
+++ b/debian/libshibsp-dev.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
+usr/include/*
+usr/lib/*/lib*.so
diff --git a/debian/libshibsp5.install b/debian/libshibsp5.install
index c45ebcf..3ddde58 100644
--- a/debian/libshibsp5.install
+++ b/debian/libshibsp5.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 45aab72..55aa6fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# Enable compiler hardening flags.
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+
 DOCS = debian/libshibsp-doc/usr/share/doc/libshibsp-doc
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))

-- 
Debian packaging for the 2.0 Apache Shibboleth SP