about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2023-10-20 01:20:28 +0200
committerMichael Biebl <biebl@debian.org>2023-10-20 14:51:11 +0200
commit01c68376e23f457247b57b213561b3da73e8ffb6 (patch)
tree3670804ff64c710c4a27eca6fe4704bb1e7a8ac8 /debian
parent71ca9cc8eb995c1a154d413712991411fa16109c (diff)
Move systemd services files and udev rules to /usr
Add a corresponding versioned Build-Depends on debhelper (>= 13.11.6) to
ensure we have a recent enough dh_installsystemd.
Diffstat (limited to 'debian')
-rw-r--r--debian/control1
-rw-r--r--debian/network-manager.install7
-rwxr-xr-xdebian/rules4
3 files changed, 5 insertions, 7 deletions
diff --git a/debian/control b/debian/control
index 1fa1ccb4..e19c75fd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper-compat (= 13),
+               debhelper (>= 13.11.6),
                dh-sequence-gir,
                automake (>= 1.12),
                pkg-config,
diff --git a/debian/network-manager.install b/debian/network-manager.install
index a1227a3d..f6f13593 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -9,6 +9,8 @@ usr/lib/*/NetworkManager/*/libnm-ppp-plugin.so
 usr/lib/*/NetworkManager/*/libnm-wwan.so
 usr/lib/pppd/*/*.so
 usr/lib/firewalld/zones/nm-shared.xml
+usr/lib/systemd/system/*.service
+usr/lib/udev/rules.d/*.rules
 usr/share/locale/
 usr/share/man/
 usr/share/dbus-1/system-services/
@@ -19,10 +21,5 @@ usr/share/polkit-1/
 usr/share/bash-completion/
 etc/NetworkManager/
 var/lib/NetworkManager/
-lib/udev/rules.d/*.rules
-lib/systemd/system/NetworkManager.service
-lib/systemd/system/NetworkManager-dispatcher.service
-lib/systemd/system/NetworkManager-wait-online.service
-lib/systemd/system/nm-priv-helper.service
 debian/NetworkManager.conf etc/NetworkManager/
 debian/org.freedesktop.NetworkManager.rules usr/share/polkit-1/rules.d/
diff --git a/debian/rules b/debian/rules
index db3974a7..1fdb9574 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,8 @@ override_dh_auto_configure:
 		--with-dnsmasq=/usr/sbin/dnsmasq \
 		--with-modprobe=/sbin/modprobe \
 		--with-polkit-agent-helper-1=/usr/lib/policykit-1/polkit-agent-helper-1 \
-		--with-systemdsystemunitdir=/lib/systemd/system \
-		--with-udev-dir=/lib/udev \
+		--with-systemdsystemunitdir=/usr/lib/systemd/system \
+		--with-udev-dir=/usr/lib/udev \
 		--with-dbus-sys-dir=/usr/share/dbus-1/system.d \
 		--with-crypto=gnutls \
 		--with-session-tracking=systemd \