[shibboleth-sp2] 01/01: Move shibsp/paths.h to an architecture-specific directory

[Russ Allbery]

This is an automated email from the git hooks/post-receive script.

rra pushed a commit to branch master
in repository shibboleth-sp2.

commit 585c8cbdcc5003b74f532a484df1131500ba91f9
Author: Russ Allbery <rra at debian.org>
Date:   Sat Aug 17 14:36:25 2013 -0700

    Move shibsp/paths.h to an architecture-specific directory
    
    * Move /usr/include/shibsp/paths.h to the architecture-specific include
      directory, since it varies by architecture.  Thanks, Andreas
      Beckmann.  (Closes: #720036)
---
 debian/changelog |    8 ++++++++
 debian/rules     |    7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 53a30fa..abe2f8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shibboleth-sp2 (2.5.2+dfsg-3) UNRELEASED; urgency=low
+
+  * Move /usr/include/shibsp/paths.h to the architecture-specific include
+    directory, since it varies by architecture.  Thanks, Andreas
+    Beckmann.  (Closes: #720036)
+
+ -- Russ Allbery <rra at debian.org>  Sat, 17 Aug 2013 14:36:09 -0700
+
 shibboleth-sp2 (2.5.2+dfsg-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/rules b/debian/rules
index b707728..e9695f0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,10 @@ override_dh_auto_configure:
 	    --with-apxs24=/usr/bin/apxs2 --disable-dependency-tracking	\
 	    --with-memcached --with-fastcgi --with-gssapi $(SYSTEM)
 
+# Move supporting scripts from the configuration directory into /usr/sbin
+# and remove various configuration files that aren't of interest on Debian.
+# Also move the one architecture-dependent header file into an
+# architecture-specific directory.
 override_dh_auto_install:
 	NOKEYGEN=1 dh_auto_install
 	rm -r debian/tmp/usr/share/doc/shibboleth*
@@ -62,6 +66,9 @@ override_dh_auto_install:
 	mv debian/tmp/etc/shibboleth/metagen.sh debian/tmp/usr/bin/shib-metagen
 	mv debian/tmp/etc/shibboleth/shibd-debian \
 	    debian/libapache2-mod-shib2.shibd.init
+	mkdir debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp
+	mv debian/tmp/usr/include/shibsp/paths.h \
+	    debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp/
 
 override_dh_install:
 	mkdir -p debian/tmp/usr/lib/apache2/modules

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git