[Pkg-libvirt-commits] [libvirt] 02/05: Cleanup old conffile

[Guido Guenther]

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

agx pushed a commit to annotated tag debian/1.2.6-1
in repository libvirt.

commit 60ec538752cb36e670a0e231e948529cf9eca060
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jul 22 15:15:59 2014 +0200

    Cleanup old conffile
    
    Closes: #748720
---
 debian/libvirt-daemon-system.maintscript | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/libvirt-daemon-system.maintscript b/debian/libvirt-daemon-system.maintscript
index dbd40af..ef23d13 100644
--- a/debian/libvirt-daemon-system.maintscript
+++ b/debian/libvirt-daemon-system.maintscript
@@ -1,2 +1,6 @@
-mv_conffile /etc/default/libvirt-bin /etc/default/libvirtd 1.2.6-1~ libvirt-bin -- "$@"
-mv_conffile /etc/init.d/libvirt-bin /etc/init.d/libvirtd 1.2.6-1~ libvirt-bin -- "$@"
+# libvirt-bin renamed to libvirtd
+mv_conffile /etc/default/libvirt-bin /etc/default/libvirtd 1.2.6-1~ libvirt-bin
+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.6-1~

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