[SCM] Debian packaging for XMLTooling-C branch, master, updated. debian/1.4.2-1-10-g9b4021e

[Russ Allbery]

The following commit has been merged in the master branch:
commit 4bf9a23f8bac6c2da7d6386554502a1c5aa75c60
Author: Russ Allbery <rra at debian.org>
Date:   Thu Jan 26 02:20:39 2012 -0800

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

diff --git a/debian/changelog b/debian/changelog
index f1ee2ca..b7db7dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 xmltooling (1.4.2-2) UNRELEASED; urgency=low
 
+  * Update to debhelper compatibility level V9.
+    - Enable hardening build flags.  (Closes: #656656)
+    - Enable multiarch support.
   * Use the latest directory in debian/watch instead of the versioned
     directories.
   * Update the upstream homepage. 
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 3018485..eec14c2 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, libcurl4-openssl-dev, liblog4cpp5-dev, libssl-dev (>= 1.0),
  libxerces-c-dev, libxml-security-c-dev (>= 1.6), pkg-config
 Standards-Version: 3.9.2
@@ -13,6 +13,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-shibboleth/xmltooling.git
 
 Package: libxmltooling5
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: C++ XML parsing library with encryption support (runtime)
  The XMLTooling library contains generic XML parsing and processing
diff --git a/debian/libxmltooling-dev.install b/debian/libxmltooling-dev.install
index 90a4881..f3800aa 100644
--- a/debian/libxmltooling-dev.install
+++ b/debian/libxmltooling-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/libxmltooling5.install b/debian/libxmltooling5.install
index c45ebcf..3ddde58 100644
--- a/debian/libxmltooling5.install
+++ b/debian/libxmltooling5.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 90d6d91..77718d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# Enable compiler hardening flags.
+export DEB_BUILD_MAINT_OPTIONS = all
+
 DOCS = debian/libxmltooling-doc/usr/share/doc/libxmltooling-doc
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))

-- 
Debian packaging for XMLTooling-C