From: Anders Kaseorg Date: Wed, 30 Mar 2011 07:06:04 +0000 (-0400) Subject: Disable dh_buildinfo, which currently fails at multiarch X-Git-Tag: debian/2.0-0debathena1~1 X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/commitdiff_plain/407b359ffd190f9f7c27fc445d6c2662d8b77f18?ds=sidebyside Disable dh_buildinfo, which currently fails at multiarch Signed-off-by: Anders Kaseorg --- diff --git a/debian/changelog b/debian/changelog index 8a0eb25..1f0c69a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ libnss-nonlocal (2.0-0debathena1) UNRELEASED; urgency=low * Remove obsolete exclusion of glibc-private dependency. * Use automake 1.10 and autoconf 2.61. * Add multiarch support for distros from the future. + * Disable dh_buildinfo, which currently fails at multiarch. -- Anders Kaseorg Tue, 29 Mar 2011 00:45:31 -0400 diff --git a/debian/rules b/debian/rules index 310099c..c94a527 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,9 @@ DEB_AUTO_UPDATE_AUTOMAKE = 1.10 DEB_AUTO_UPDATE_ACLOCAL = 1.10 DEB_AUTO_UPDATE_LIBTOOL = pre +# dh_buildinfo fails at multiarch: http://bugs.debian.org/620104 +CDBS_BUILD_DEPENDS_rules_debhelper_buildinfo = + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk