Simpler logic for inclusion of -Indep build-deps

Set BINARY_ARCH in pbuilder-satisfydepends-checkparams just as in
pbuilder-checkparams instead of setting BC_REGEXP and BD_REGEXP and
change get_build_deps and get_build_conflicts to query for Build-Deps /
Build-Conflicts only, with an optional separate get_control_re call for
the -Indep deps if needed.  Update testsuite to also test for
build-deps-indep.

1 files changed, 8 insertions, 4 deletions

diff --git a/pbuilder-satisfydepends-funcs b/pbuilder-satisfydepends-funcs
index 98cb806..58e598c 100755
--- a/pbuilder-satisfydepends-funcs
+++ b/pbuilder-satisfydepends-funcs
@@ -78,14 +78,18 @@ get_control_re() {
         sed 's/^[^: ]*://'
 }
 
-# NB: BD_REGEXP only includes Build-Depends-Indep when building binary-indep
-# packages; see pbuilder-satisfydepends-checkparams
 get_build_deps() {
-    get_control_re "$BD_REGEXP"
+    get_control_re "build-depends"
+    if [ "$BINARY_ARCH" = no ]; then
+        get_control_re "build-depends-indep"
+    fi
 }
 
 get_build_conflicts() {
-    get_control_re "$BC_REGEXP"
+    get_control_re "build-conflicts"
+    if [ "$BINARY_ARCH" = no ]; then
+        get_control_re "build-conflicts-indep"
+    fi
 }
 
 checkbuilddep_archdeps() {