UBUNTU: [Packaging] switch up to debhelper 9

Signed-off-by: Andy Whitcroft <apw@canonical.com>

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 8d4275a3faf85fce0c94e9d6bb54f4236705ce23..d49b74442c5223be60e55411ecde09e2d647f19f 100644 (file)
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com>
 Standards-Version: 3.9.4.0
 Build-Depends:
- debhelper (>= 5),
+ debhelper (>= 9),
  dh-systemd,
  cpio,
  kernel-wedge,

diff --git a/debian/compat b/debian/compat
index 7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index edda3f3ba845ee66fe2d680cd172234f3673abbf..93b48dc2371ae170aada539667fa1bba7ed12ad3 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -109,10 +109,10 @@ install-%: checks-%
        @echo Debug: $@ kernel_file $(kernel_file) kernfile $(kernfile) install_file $(install_file) instfile $(instfile)
        dh_testdir
        dh_testroot
-       dh_clean -k -p$(bin_pkg_name)-$*
-       dh_clean -k -p$(hdrs_pkg_name)-$*
+       dh_prep -p$(bin_pkg_name)-$*
+       dh_prep -p$(hdrs_pkg_name)-$*
 ifneq ($(skipdbg),true)
-       dh_clean -k -p$(dbg_pkg_name)-$*
+       dh_prep -p$(dbg_pkg_name)-$*
 endif
 
        # The main image
@@ -408,7 +408,7 @@ install-arch-headers:
        @echo Debug: $@
        dh_testdir
        dh_testroot
-       dh_clean -k -plinux-libc-dev
+       dh_prep -plinux-libc-dev
 
        rm -rf $(headers_tmp)
        install -d $(headers_tmp) $(headers_dir)/usr/include/