[Debian-ha-commits] [pacemaker] 01/01: Fix debian/check_header_deps.

[Christoph Berg]

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

myon pushed a commit to branch debian/master
in repository pacemaker.

commit 32a2c65fd2ff944905f07d2db8addc8e9037b14e
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Fri Jan 8 16:24:36 2016 +0100

    Fix debian/check_header_deps.
---
 debian/changelog         |  7 +++++++
 debian/check_header_deps | 15 +++++++++------
 debian/rules             |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 91ddb13..2289cd9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pacemaker (1.1.14~rc4-2) unstable; urgency=medium
+
+  [ Ferenc Wágner ]
+  * Fix debian/check_header_deps.
+
+ -- Christoph Berg <myon at debian.org>  Fri, 08 Jan 2016 15:46:07 +0100
+
 pacemaker (1.1.14~rc4-1) unstable; urgency=medium
 
   * [462bed4] Correct systemd build dependency.
diff --git a/debian/check_header_deps b/debian/check_header_deps
index 0dc12b7..299bdb9 100755
--- a/debian/check_header_deps
+++ b/debian/check_header_deps
@@ -3,17 +3,20 @@
 cd debian
 
 pkgs=$(grep-dctrl -sPackage -n -FSection libdevel control)
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 for p in $pkgs; do
-    includes="$includes -I $p/usr/include/$1"
+    includes="$includes -I $p/usr/include/$1 -I $p/usr/include/$DEB_HOST_MULTIARCH"
 done
 
 for pkg in $pkgs; do
   {
-    printf 'header:Depends='
     for header in $(find "$pkg" -name "*.h"); do
-        gcc -MM -MT '' -E $includes $header
-    done | sed "s|^:||;s|^ *||;\|^$pkg/|d;s|/.*| (= \${binary:Version}),|" | sort -u | tr '\n' ' '
-    printf '\n'
-  } >>"$pkg.substvars"
+        gcc -MM -MT "$pkg" -E $includes $header
+    done
+    printf '\t%s\n' '$(info header:Depends= \
+$(foreach pkg,$(sort $(filter-out $@, \
+		$(foreach dep,$^,$(firstword $(subst /, ,$(dep)))))) \
+	,$(pkg) (= $${binary:Version}),))'
+  } | make -Bsf - >>"$pkg.substvars"
 done
diff --git a/debian/rules b/debian/rules
index 6969e73..22716be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,7 @@ override_dh_install:
 	dh_install --fail-missing --exclude=.la --exclude=.md5 \
 		--exclude COPYING --exclude COPYING.LIB
 	install -D -m 644 mcp/pacemaker.sysconfig debian/pacemaker/etc/default/pacemaker
-	debian/check_header_deps pacemaker
+	env -u MAKELEVEL -u MAKEFLAGS -u MFLAGS debian/check_header_deps pacemaker
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git