UBUNTU: [debian] Use dh_prep instead of 'dh_clean -k'

dh_prep needs to be run only once at the root of the
binary-indep dependency chain, i.e., install-headers.

Similarly, dh_testdir and dh_testroot only need to be run once at
the root of the binary-indep dependency chain.

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 5cd2b70e576d7a1c8473a6fc9e30e49fb914617e..c58f824bbbc6423a7239aca07d3c465cfc2af603 100644 (file)
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -8,7 +8,6 @@ install-doc: install-headers
 ifeq ($(do_doc_package),true)
        dh_testdir
        dh_testroot
-       dh_clean -k -p$(docpkg)
 
        install -d $(docdir)
 ifeq ($(do_doc_package_content),true)
@@ -31,11 +30,11 @@ indep_hdrpkg = $(hdrs_pkg_name)
 indep_hdrdir = $(CURDIR)/debian/$(indep_hdrpkg)/usr/src/$(indep_hdrpkg)
 install-headers:
        @echo Debug: $@
-ifeq ($(do_flavour_header_package),true)
        dh_testdir
        dh_testroot
-       dh_clean -k -p$(indep_hdrpkg)
+       dh_prep
 
+ifeq ($(do_flavour_header_package),true)
        install -d $(indep_hdrdir)
        find . -path './debian' -prune -o -path './$(DEBIAN)' -prune \
          -o -path './include/*' -prune \
@@ -55,9 +54,6 @@ balldir = $(CURDIR)/debian/$(srcpkg)/usr/src/$(srcpkg)/$(srcpkg)
 install-source: install-doc
        @echo Debug: $@
 ifeq ($(do_source_package),true)
-       dh_testdir
-       dh_testroot
-       dh_clean -k -p$(srcpkg)
 
        install -d $(srcdir)
 ifeq ($(do_source_package_content),true)
@@ -87,9 +83,6 @@ install-tools: toolsman = $(CURDIR)/debian/$(toolspkg)/usr/share/man
 install-tools: install-source $(stampdir)/stamp-build-perarch
        @echo Debug: $@
 ifeq ($(do_tools),true)
-       dh_testdir
-       dh_testroot
-       dh_clean -k -p$(toolspkg)
 
        install -d $(toolsbin)
        install -d $(toolsman)/man1
@@ -130,8 +123,6 @@ install-indep: install-tools
 # binary-indep target during builds.
 binary-headers: install-headers
        @echo Debug: $@
-       dh_testdir
-       dh_testroot
        dh_installchangelogs -p$(indep_hdrpkg)
        dh_installdocs -p$(indep_hdrpkg)
        dh_compress -p$(indep_hdrpkg)
@@ -143,8 +134,6 @@ binary-headers: install-headers
 
 binary-indep: install-indep
        @echo Debug: $@
-       dh_testdir
-       dh_testroot
 
        dh_installchangelogs -i
        dh_installdocs -i