From 2868fc6f559fe0996b2f0f96c4266f42d949b8c3 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Wed, 3 Jul 2019 23:43:52 +0200 Subject: [PATCH] TT#61954 Set debhelper compat level in Build-Depends instead of debian/compat - Stop copying debian/compat into the kernel source packages. - Use dh_installsystemd instead of deprecated dh_systemd_*. - Disable dwz as it cannot cope with some of the plugins generated. Change-Id: Ibdc92e94955ef3c5d89b24fc341474236c49b986 --- debian/compat | 1 - debian/control | 4 ++-- debian/rules | 13 ++++++------- 3 files changed, 8 insertions(+), 10 deletions(-) delete mode 100644 debian/compat diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28b8..000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 71bc89292..e207098e6 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Sipwise Development Team Homepage: https://www.sipwise.com/ Standards-Version: 3.9.8 Build-Depends: - debhelper (>= 10~), + debhelper-compat (= 12), default-libmysqlclient-dev, gperf, iptables-dev (>= 1.4), @@ -109,7 +109,7 @@ Package: ngcp-rtpengine-kernel-source Architecture: all Section: kernel Depends: - debhelper (>= 5), + debhelper-compat (= 12), module-assistant, ${misc:Depends}, Conflicts: diff --git a/debian/rules b/debian/rules index 4aab86e93..83dbf34b2 100755 --- a/debian/rules +++ b/debian/rules @@ -36,7 +36,7 @@ override_dh_auto_install-indep: # Copy the needed debian/ pieces to the proper location cp debian/*.modules.in* debian/$(psource)/usr/src/modules/$(sname)/debian cp debian/control debian/changelog debian/copyright \ - debian/compat debian/$(psource)/usr/src/modules/$(sname)/debian/ + debian/$(psource)/usr/src/modules/$(sname)/debian/ install -m 0755 debian/rules.modules debian/$(psource)/usr/src/modules/$(sname)/debian/rules cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules @@ -58,10 +58,9 @@ override_dh_install: override_dh_strip: dh_strip --dbgsym-migration='ngcp-rtpengine-dbg (<= 6.0.0.0+0~mr6.0.0.0)' -override_dh_systemd_enable: - dh_systemd_enable - dh_systemd_enable -pngcp-rtpengine-recording-daemon --name=ngcp-rtpengine-recording-nfs-mount +override_dh_dwz: + # Disable, as dwz cannot cope with some of the plugins generated. -override_dh_systemd_start: - dh_systemd_start - dh_systemd_start -pngcp-rtpengine-recording-daemon --name=ngcp-rtpengine-recording-nfs-mount +override_dh_installsystemd: + dh_installsystemd + dh_installsystemd -pngcp-rtpengine-recording-daemon --name=ngcp-rtpengine-recording-nfs-mount