Merge ~vorlon/germinate:feature-no-follow-build-depends-all into germinate:master

[Steve Langasek]

This lets us drop an additional 106 packages (including nodejs) from the i386 set, and 7 from the set of packages needing to be autopkgtested.

[Steve Langasek (vorlon)]

Fixed the merge conflict.

[Steve Langasek (vorlon)]

Noticed a problem with libprelude being left out of the seed despite being a build-dependency of audit (causing some binaries to be uninstallable, but more importantly making audit unbuildable). Fixed as in the latest commit.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/germinate/germinator.py b/germinate/germinator.py
index 9b4e340..946e1a7 100644
--- a/germinate/germinator.py
+++ b/germinate/germinator.py
@@ -1653,20 +1653,29 @@ class Germinator(object):
                 if pkg_src in output._blacklist:
                     seed._blacklisted.add(pkg_src)
             else:
+                # Special-case not following build dependencies of arch: all
+                # packages
+                if not self._follow_build_depends_all(seed.structure, seed) \
+                   and self._packages[pkg]["Architecture"] == "all":
+                    continue
                 seed._not_build_srcs.add(pkg_src)
                 seed._sourcepkgs.add(pkg_src)
 
-            output._all_srcs.add(pkg_src)
-            seed._build_srcs.add(pkg_src)
-
             # Special-case not following build dependencies of arch: all
             # packages
             if not self._follow_build_depends_all(seed.structure, seed) and \
                self._packages[pkg]["Architecture"] == "all":
                 continue
 
+            output._all_srcs.add(pkg_src)
+            seed._build_srcs.add(pkg_src)
+
             if self._follow_build_depends(seed.structure, seed):
                 for build_depends in BUILD_DEPENDS:
+                    if not self._follow_build_depends_all(seed.structure,
+                                                          seed) and \
+                       build_depends == 'Build-Depends-Indep':
+                        continue
                     self._add_dependency_tree(
                         seed, pkg, self._sources[pkg_src][build_depends],
                         build_depend=True)