From c55059284d9849c894e5bad0e2b7a4b85668fd2f Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 23 Nov 2020 13:14:45 +0100 Subject: [PATCH] * Fix dh_installinit dh_installsystemd calls, and switch to debhelper-compat 12 (Closes: #961746). --- debian/changelog | 2 ++ debian/control | 2 +- debian/rules | 9 +++------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index e170df32c..76f7b13cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ openvswitch (2.13.0+dfsg1-13) UNRELEASED; urgency=medium * Starts openvswitch-nonetwork.service after dpdk.service. Thanks to Adriaan Schmidt from Siemens for the report (Closes: #968333). * Fix ifupdown.sh script (Closes: #964029). + * Fix dh_installinit dh_installsystemd calls, and switch to debhelper-compat + 12 (Closes: #961746). -- Thomas Goirand Tue, 01 Sep 2020 23:11:04 +0200 diff --git a/debian/control b/debian/control index 0b5e230f7..834341f78 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Build-Depends: autoconf, automake, bzip2, - debhelper-compat (= 10), + debhelper-compat (= 12), dh-python, graphviz, libcap-ng-dev, diff --git a/debian/rules b/debian/rules index 0cd796c77..59608a875 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,7 @@ include /usr/share/openstack-pkg-tools/pkgos.make export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow %: - dh $@ --with autoreconf,python3,systemd,sphinxdoc + dh $@ --with autoreconf,python3,sphinxdoc # use --as-needed only if supported by dh-autoreconf (to simplify backporting) DH_AS_NEEDED=$(shell dpkg --compare-versions $$(dpkg --status dh-autoreconf | grep Version | cut -d' ' -f2) ge 6 && echo --as-needed) @@ -231,12 +231,9 @@ override_dh_installinit: dh_installinit --restart-after-upgrade dh_installinit -popenvswitch-switch --name=ovsdb-server --no-start dh_installinit -popenvswitch-switch --name=ovs-vswitchd --no-start - dh_installinit -popenvswitch-switch --name=openvswitch-nonetwork --no-start --no-scripts -override_dh_systemd_start: - dh_systemd_start --restart-after-upgrade - dh_systemd_start -popenvswitch-switch --name=ovsdb-server --no-start - dh_systemd_start -popenvswitch-switch --name=ovs-vswitchd --no-start +override_dh_installsystemd: + dh_installsystemd --restart-after-upgrade -Xovs-vswitchd.service -Xovsdb-server.service override_dh_strip: dh_strip --dbg-package=openvswitch-dbg -- 2.39.2