about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2014-03-28 16:42:56 +0100
committerMichael Biebl <biebl@debian.org>2014-03-28 16:43:02 +0100
commit5590b8812debbc46b34bfa69c7e2590fb6b9d233 (patch)
treed28e5c06f48b609ef9727a84fff8b3a3ffdd9eb7
parent89c5e59d05811fac53f9e40b8ffb84a8bcff3a89 (diff)
Install PolicyKit rules and pkla file into the system directory
/etc/polkit-1 is reserved for local configuration.
-rw-r--r--debian/changelog2
-rw-r--r--debian/network-manager.install4
-rw-r--r--debian/network-manager.maintscript2
3 files changed, 6 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index a9adbed2..2a6d3a98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ network-manager (0.9.8.8-4) UNRELEASED; urgency=medium
   * Fix URL to keyfile spec in README.Debian.
   * Remove /etc/systemd/system/network-manager.service symlink, which was
     previously created dynamically via Alias=, on upgrades.
+  * Install PolicyKit rules and pkla file into the system directory.
+    /etc/polkit-1 is reserved for local configuration.
 
  -- Laurent Bigonville <bigon@debian.org>  Wed, 26 Feb 2014 00:21:13 +0100
 
diff --git a/debian/network-manager.install b/debian/network-manager.install
index fe653880..c35a87cd 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -22,5 +22,5 @@ lib/systemd/system/NetworkManager.service
 lib/systemd/system/NetworkManager-dispatcher.service
 lib/systemd/system/NetworkManager-wait-online.service
 debian/NetworkManager.conf etc/NetworkManager/
-debian/org.freedesktop.NetworkManager.pkla etc/polkit-1/localauthority/10-vendor.d/
-debian/60-network-manager.rules etc/polkit-1/rules.d/
+debian/org.freedesktop.NetworkManager.pkla var/lib/polkit-1/localauthority/10-vendor.d/
+debian/60-network-manager.rules usr/share/polkit-1/rules.d/
diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript
index c77e5105..f480f995 100644
--- a/debian/network-manager.maintscript
+++ b/debian/network-manager.maintscript
@@ -1 +1,3 @@
 mv_conffile /etc/dbus-1/system.d/NetworkManager.conf /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 0.9.4.0-1~ network-manager
+rm_conffile /etc/polkit-1/localauthority/10-vendor.d/org.freedesktop.NetworkManager.pkla 0.9.8.8-4~ network-manager
+rm_conffile /etc/polkit-1/rules.d/60-network-manager.rules 0.9.8.8-4~ network-manager