UBUNTU: [debian] Document binary-indep dependency chain

Move some code around to directly reflect the dependency chain ordering.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index c58f824bbbc6423a7239aca07d3c465cfc2af603..5cfdfe6d14cdf55fa25a5db0b1d6ab082a13bce8 100644 (file)
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -1,6 +1,33 @@
 build-indep:
        @echo Debug: $@
 
+# The binary-indep dependency chain is:
+#
+# install-headers <- install-doc <- install-source <- install-tools <- install-indep <- binary-indep
+# install-headers <- binary-headers
+#
+indep_hdrpkg = $(hdrs_pkg_name)
+indep_hdrdir = $(CURDIR)/debian/$(indep_hdrpkg)/usr/src/$(indep_hdrpkg)
+install-headers:
+       @echo Debug: $@
+       dh_testdir
+       dh_testroot
+       dh_prep
+
+ifeq ($(do_flavour_header_package),true)
+       install -d $(indep_hdrdir)
+       find . -path './debian' -prune -o -path './$(DEBIAN)' -prune \
+         -o -path './include/*' -prune \
+         -o -path './scripts/*' -prune -o -type f \
+         \( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
+            -name '*.sh' -o -name '*.pl' -o -name '*.lds' \) \
+         -print | cpio -pd --preserve-modification-time $(indep_hdrdir)
+       cp -a scripts include $(indep_hdrdir)
+       (find arch -name include -type d -print | \
+               xargs -n1 -i: find : -type f) | \
+               cpio -pd --preserve-modification-time $(indep_hdrdir)
+endif
+
 docpkg = $(doc_pkg_name)
 docdir = $(CURDIR)/debian/$(docpkg)/usr/share/doc/$(docpkg)
 install-doc: install-headers
@@ -26,28 +53,6 @@ endif
        find $(docdir) -name .gitignore | xargs rm -f
 endif
 
-indep_hdrpkg = $(hdrs_pkg_name)
-indep_hdrdir = $(CURDIR)/debian/$(indep_hdrpkg)/usr/src/$(indep_hdrpkg)
-install-headers:
-       @echo Debug: $@
-       dh_testdir
-       dh_testroot
-       dh_prep
-
-ifeq ($(do_flavour_header_package),true)
-       install -d $(indep_hdrdir)
-       find . -path './debian' -prune -o -path './$(DEBIAN)' -prune \
-         -o -path './include/*' -prune \
-         -o -path './scripts/*' -prune -o -type f \
-         \( -name 'Makefile*' -o -name 'Kconfig*' -o -name 'Kbuild*' -o \
-            -name '*.sh' -o -name '*.pl' -o -name '*.lds' \) \
-         -print | cpio -pd --preserve-modification-time $(indep_hdrdir)
-       cp -a scripts include $(indep_hdrdir)
-       (find arch -name include -type d -print | \
-               xargs -n1 -i: find : -type f) | \
-               cpio -pd --preserve-modification-time $(indep_hdrdir)
-endif
-
 srcpkg = $(src_pkg_name)-source-$(release)
 srcdir = $(CURDIR)/debian/$(srcpkg)/usr/src/$(srcpkg)
 balldir = $(CURDIR)/debian/$(srcpkg)/usr/src/$(srcpkg)/$(srcpkg)