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 910f88187e812b17aa60c525c2124d45daae0b09..5114878854adaf3888cda119dff43983a2ea739f 100644 (file)
--- 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 c94a52754964b7c74ea63ba79ee67f9f96209c8f..9664c6b4ca4775e0d1502db7855e1718b966cc4c 100755 (executable)
--- 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)'