From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 25 Nov 2011 07:19:55 +0000 (-0500)
Subject: Don’t Build-Depend debhelper 9.
X-Git-Tag: debian/2.0-0debathena2~1
X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/commitdiff_plain/d2f007df0353bb218d233bf4a8033c1b2a40f8f1

Don’t Build-Depend debhelper 9.

Since we only set DH_COMPAT=9 when the presence of multiarch is
detected at build time, this setting should be ignored for the purpose
of computing build dependencies.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---

diff --git a/debian/changelog b/debian/changelog
index 910f881..5114878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libnss-nonlocal (2.0-0debathena2) UNRELEASED; urgency=low
 
   * Pre-Depend adduser.
+  * Don’t Build-Depend debhelper 9.
 
  -- Anders Kaseorg <andersk@mit.edu>  Fri, 25 Nov 2011 02:19:17 -0500
 
diff --git a/debian/rules b/debian/rules
index c94a527..9664c6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
 DEB_CONFIGURE_PREFIX = /
 
 ifneq ($(DEB_HOST_MULTIARCH),)
+    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS)
     export DH_COMPAT = 9
     DEB_CONFIGURE_EXTRA_FLAGS += $(MULTIARCH_CONFIGURE_FLAGS)
     MULTIARCH_CONFIGURE_FLAGS = --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)'