about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-10-23 12:33:50 +0200
committerMichael Biebl <biebl@debian.org>2018-10-25 00:05:51 +0200
commit2034b7ef86afd9d007e5812aa1fb2a2a717ba635 (patch)
treec1037c50c2541d5172ee9aaca678b8127c38ea26 /debian
parent0b95e1fcffef2fb46aa6babc7d094dbe71cca01d (diff)
Switch to debhelper compat level 12 and dh_installsystemd
Diffstat (limited to 'debian')
-rw-r--r--debian/compat2
-rw-r--r--debian/control2
-rw-r--r--debian/network-manager.links1
-rwxr-xr-xdebian/rules8
4 files changed, 6 insertions, 7 deletions
diff --git a/debian/compat b/debian/compat
index f599e28b..48082f72 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+12
diff --git a/debian/control b/debian/control
index 45d1f3de..27fa8d2b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.
 Uploaders: Michael Biebl <biebl@debian.org>,
  Sjoerd Simons <sjoerd@debian.org>,
  Aron Xu <aron@debian.org>
-Build-Depends: debhelper (>= 10.3),
+Build-Depends: debhelper (>= 11.4~),
                automake (>= 1.12),
                dpkg-dev (>= 1.17.14),
                pkg-config,
diff --git a/debian/network-manager.links b/debian/network-manager.links
new file mode 100644
index 00000000..d32ad80e
--- /dev/null
+++ b/debian/network-manager.links
@@ -0,0 +1 @@
+lib/systemd/system/NetworkManager.service lib/systemd/system/network-manager.service
diff --git a/debian/rules b/debian/rules
index 28e8eca5..023d1884 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,11 +65,9 @@ override_dh_missing:
 override_dh_makeshlibs:
 	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/
 
-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_installsystemd:
+	dh_installsystemd -pnetwork-manager --no-start NetworkManager-dispatcher.service NetworkManager-wait-online.service
+	dh_installsystemd -pnetwork-manager --no-also NetworkManager.service
 
 override_dh_ppp:
 	dh_ppp --breaks