From d2ce6ca65880f1de967b7f47c915537e9cf86f1e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 30 Oct 2018 10:26:51 +0100 Subject: Revert "Switch to debhelper compat level 12 and dh_installsystemd" The versions of debhelper and init-system-helpers in stretch are too old. This reverts commit 2034b7ef86afd9d007e5812aa1fb2a2a717ba635. --- debian/compat | 2 +- debian/control | 2 +- debian/network-manager.links | 1 - debian/rules | 8 +++++--- 4 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 debian/network-manager.links diff --git a/debian/compat b/debian/compat index 48082f72..f599e28b 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -12 +10 diff --git a/debian/control b/debian/control index 27fa8d2b..45d1f3de 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Utopia Maintenance Team , Sjoerd Simons , Aron Xu -Build-Depends: debhelper (>= 11.4~), +Build-Depends: debhelper (>= 10.3), automake (>= 1.12), dpkg-dev (>= 1.17.14), pkg-config, diff --git a/debian/network-manager.links b/debian/network-manager.links deleted file mode 100644 index d32ad80e..00000000 --- a/debian/network-manager.links +++ /dev/null @@ -1 +0,0 @@ -lib/systemd/system/NetworkManager.service lib/systemd/system/network-manager.service diff --git a/debian/rules b/debian/rules index 023d1884..28e8eca5 100755 --- a/debian/rules +++ b/debian/rules @@ -65,9 +65,11 @@ override_dh_missing: override_dh_makeshlibs: dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/ -override_dh_installsystemd: - dh_installsystemd -pnetwork-manager --no-start NetworkManager-dispatcher.service NetworkManager-wait-online.service - dh_installsystemd -pnetwork-manager --no-also NetworkManager.service +override_dh_systemd_start: + dh_link -pnetwork-manager \ + lib/systemd/system/NetworkManager.service \ + lib/systemd/system/network-manager.service + dh_systemd_start -pnetwork-manager --no-also NetworkManager.service override_dh_ppp: dh_ppp --breaks -- cgit 1.3.0-6-gf8a5