[Pkg-libvirt-commits] [libvirt] 03/03: Move polkit rule to /u/s/polkit-1/rules.d/

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to branch experimental
in repository libvirt.

commit de9dcf9b5439a0352a46e7b9366c3e305fa47b8a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sun Oct 12 09:05:32 2014 +0200

    Move polkit rule to /u/s/polkit-1/rules.d/
    
    since /e/polkit-1 is for admin changes
    
    Closes: #764826
---
 debian/libvirt-daemon-system.dirs        | 2 +-
 debian/libvirt-daemon-system.maintscript | 1 +
 debian/rules                             | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/libvirt-daemon-system.dirs b/debian/libvirt-daemon-system.dirs
index 717d18a..02a782d 100644
--- a/debian/libvirt-daemon-system.dirs
+++ b/debian/libvirt-daemon-system.dirs
@@ -9,4 +9,4 @@
 /var/log/libvirt/uml
 /var/log/libvirt/lxc
 /etc/libvirt/hooks
-/etc/polkit-1/rules.d/
+/usr/share/polkit-1/rules.d/
\ No newline at end of file
diff --git a/debian/libvirt-daemon-system.maintscript b/debian/libvirt-daemon-system.maintscript
index bd6b3e9..579f510 100644
--- a/debian/libvirt-daemon-system.maintscript
+++ b/debian/libvirt-daemon-system.maintscript
@@ -5,6 +5,7 @@ mv_conffile /etc/init.d/libvirt-bin /etc/init.d/libvirtd 1.2.6-1~ libvirt-bin
 # Installed incorrectly
 rm_conffile /etc/apparmor.d/libvirtd/TEMPLATE 1.2.7-5~ libvirt-bin
 rm_conffile /etc/apparmor.d/libvirtd/TEMPLATE 1.2.7-5~ libvirt-daemon-system
+rm_conffile /etc/polkit-1/rules.d/60-libvirt.rules 1.2.9-3~
 # Obsolete
 rm_conffile /etc/apparmor.d/libvirt/TEMPLATE 1.2.7-5~ libvirt-bin
 rm_conffile /etc/apparmor.d/libvirt/TEMPLATE 1.2.7-5~ libvirt-daemon-system
diff --git a/debian/rules b/debian/rules
index c9842e8..d80a43f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,7 +147,7 @@ override_dh_install:
 	    debian/libvirt-daemon-system.libvirt-guests.default
 	# Add our backward compat polkit rule
 	cp debian/polkit/60-libvirt.rules \
-	    debian/libvirt-daemon-system/etc/polkit-1/rules.d/
+	    debian/libvirt-daemon-system/usr/share/polkit-1/rules.d/
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
 	# Linux supports more nice things:
 	dh_install -p libvirt-daemon-system usr/lib/systemd/system lib/systemd/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libvirt.git