[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 e2a93f2f5f0ed28c4d3cac3e514ae753d44b8364
Author: Russ Allbery <rra at debian.org>
Date:   Fri Jan 27 17:19:06 2012 -0800

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

diff --git a/debian/changelog b/debian/changelog
index 064bfe8..3f3053f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 opensaml2 (2.4.3-2) UNRELEASED; urgency=low
 
+  * Update to debhelper compatibility level V9.
+    - Enable hardening build flags.  (Closes: #656006)
+    - Enable multiarch support.
   * Make removal of the Doxygen-installed jquery.js file conditional on
     its existence, since some versions of Doxygen don't install it.
   * Use the latest directory in debian/watch instead of the versioned
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 bf7c82c..a8959ee 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 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>
-Build-Depends: debhelper (>= 8), autotools-dev (>= 20100122.1~), doxygen,
+Build-Depends: debhelper (>= 9), autotools-dev (>= 20100122.1~), doxygen,
  graphviz, liblog4cpp5-dev, libssl-dev, libxerces-c-dev (>= 3.0.1-2~),
  libxml-security-c-dev (>= 1.6), libxmltooling-dev (>= 1.4), pkg-config
 Standards-Version: 3.9.2
@@ -13,6 +13,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-shibboleth/opensaml2.git
 
 Package: libsaml7
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Security Assertion Markup Language library (runtime)
  OpenSAML is an open source implementation of the OASIS Security Assertion
diff --git a/debian/libsaml2-dev.install b/debian/libsaml2-dev.install
index 32e0d26..0dab300 100644
--- a/debian/libsaml2-dev.install
+++ b/debian/libsaml2-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/opensaml.pc
+usr/include/*
+usr/lib/*/lib*.so
+debian/tmp/usr/lib/*/pkgconfig/opensaml.pc usr/lib/pkgconfig
diff --git a/debian/libsaml7.install b/debian/libsaml7.install
index c45ebcf..3ddde58 100644
--- a/debian/libsaml7.install
+++ b/debian/libsaml7.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/opensaml2-schemas.install b/debian/opensaml2-schemas.install
index de460b2..c5ad360 100644
--- a/debian/opensaml2-schemas.install
+++ b/debian/opensaml2-schemas.install
@@ -1 +1 @@
-debian/tmp/usr/share/xml/opensaml
+usr/share/xml/opensaml
diff --git a/debian/opensaml2-tools.install b/debian/opensaml2-tools.install
index 45c484b..899995a 100644
--- a/debian/opensaml2-tools.install
+++ b/debian/opensaml2-tools.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/bin/*
+usr/bin/*
 debian/samlsign.1 usr/share/man/man1
diff --git a/debian/rules b/debian/rules
index 5c188bb..c997eb3 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/libsaml2-doc/usr/share/doc/libsaml2-doc
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))

-- 
Debian packaging for OpenSAML 2.0