UBUNTU: [debian] Use SRCPKGNAME as prefix for indep linux headers package

[apw@canonical.com: forward ported to new cleaned up indep stack.]
Signed-off-by: Ben Collins <ben.c@servergy.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian/rules.d/0-common-vars.mk b/debian/rules.d/0-common-vars.mk
index 7bc8b13336a0540e0479f24a5878f1564fae44af..d60c5deec7224110313457f4434a3a282383409c 100644 (file)
--- a/debian/rules.d/0-common-vars.mk
+++ b/debian/rules.d/0-common-vars.mk
@@ -132,6 +132,8 @@ stampdir    := $(CURDIR)/debian/stamps
 bin_pkg_name=linux-image-$(abi_release)
 extra_pkg_name=linux-image-extra-$(abi_release)
 hdrs_pkg_name=linux-headers-$(abi_release)
+indep_hdrs_pkg_name=$(src_pkg_name)-headers-$(abi_release)
+
 #
 # The generation of content in the doc package depends on both 'AUTOBUILD=' and
 # 'do_doc_package_content=true'. There are usually build errors during the development

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 5cfdfe6d14cdf55fa25a5db0b1d6ab082a13bce8..f2e17514f30f59768678e33824fda83313a39a13 100644 (file)
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -6,7 +6,7 @@ build-indep:
 # install-headers <- install-doc <- install-source <- install-tools <- install-indep <- binary-indep
 # install-headers <- binary-headers
 #
-indep_hdrpkg = $(hdrs_pkg_name)
+indep_hdrpkg = $(indep_hdrs_pkg_name)
 indep_hdrdir = $(CURDIR)/debian/$(indep_hdrpkg)/usr/src/$(indep_hdrpkg)
 install-headers:
        @echo Debug: $@