[Pkg-libvirt-commits] [libvirt] 07/09: Enable policykit and qemu for all architectures

[Guido Guenther]

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

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

commit 110db68cffce37b481a1ed061b7f5770c91cfee4
Author: Pino Toscano <pino at debian.org>
Date:   Thu Mar 31 15:14:55 2016 +0200

    Enable policykit and qemu for all architectures
    
    Closes: #819298
---
 debian/control                       |  4 ++--
 debian/libvirt-daemon-system.install |  3 +++
 debian/rules                         | 11 ++---------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index c8e799a..1c3640a 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Build-Depends:
 # for libssh2 connection URIs
  libssh2-1-dev,
 # for qemu-bridge-helper
- qemu-system-common [linux-any],
+ qemu-system-common,
 # For "make check"
  augeas-tools,
  dwarves,
@@ -66,7 +66,7 @@ Build-Depends:
  netcat-openbsd,
  ebtables [linux-any],
  iptables [linux-any],
- qemu-utils [linux-any],
+ qemu-utils,
 Build-Conflicts: dpkg-dev (= 1.15.3)
 Vcs-Git: git://anonscm.debian.org/pkg-libvirt/libvirt.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-libvirt/libvirt.git/
diff --git a/debian/libvirt-daemon-system.install b/debian/libvirt-daemon-system.install
index 091cfc8..b97704c 100644
--- a/debian/libvirt-daemon-system.install
+++ b/debian/libvirt-daemon-system.install
@@ -1,4 +1,7 @@
 etc/libvirt/libvirtd.conf
+etc/libvirt/qemu.conf
+etc/libvirt/qemu-lockd.conf
 etc/libvirt/virtlockd.conf
 etc/libvirt/virtlogd.conf
 etc/sasl2/*
+usr/share/polkit-1
diff --git a/debian/rules b/debian/rules
index 6ee9967..64b7e75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,10 +26,8 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   WITH_STORAGE_RBD    = --with-storage-rbd
   WITH_UDEV           = --with-udev
   WITH_CAPNG          = --with-capng
-  WITH_POLKIT         = --with-polkit
   WITH_MACVTAP        = --with-macvtap
   WITH_NETWORK        = --with-network
-  WITH_QEMU           = --with-qemu
   WITH_OPENVZ         = --with-openvz
   WITH_NETCF          = --with-netcf
   WITH_SANLOCK        = --with-sanlock
@@ -62,10 +60,8 @@ else
   WITH_STORAGE_RBD    = --without-storage-rbd
   WITH_UDEV           = --without-udev
   WITH_CAPNG          = --without-capng
-  WITH_POLKIT         = --without-polkit
   WITH_MACVTAP        = --without-macvtap
   WITH_NETWORK        = --without-network
-  WITH_QEMU           = --without-qemu
   WITH_LXC            = --without-lxc
   WITH_NUMA           = --without-numactl
   WITH_NETCF          = --without-netcf
@@ -87,7 +83,7 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	--with-default-editor="sensible-editor" \
 	--disable-silent-rules   \
 	--disable-rpath          \
-	$(WITH_QEMU)		 \
+	--with-qemu		 \
 	--with-qemu-user=libvirt-qemu  \
 	--with-qemu-group=libvirt-qemu \
 	$(WITH_OPENVZ)		 \
@@ -95,7 +91,7 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	--with-sasl              \
 	--with-yajl              \
 	--with-ssh2		 \
-	$(WITH_POLKIT)		 \
+	--with-polkit		 \
 	$(WITH_UDEV)		 \
 	--with-storage-fs        \
 	$(WITH_STORAGE_LVM)	 \
@@ -169,13 +165,10 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
 	dh_install -p libvirt-daemon-system etc/apparmor.d
 	dh_apparmor -p libvirt-daemon-system --profile-name=usr.lib.libvirt.virt-aa-helper
 	dh_apparmor -p libvirt-daemon-system --profile-name=usr.sbin.libvirtd
-	dh_install -p libvirt-daemon-system usr/share/polkit-1
 	# Not all linux arches have systemtap yet
 	mkdir -p debian/tmp/usr/share/systemtap
 	dh_install -p libvirt-daemon-system usr/share/systemtap
 	dh_install -p libvirt-daemon-system etc/libvirt/lxc.conf
-	dh_install -p libvirt-daemon-system etc/libvirt/qemu.conf
-	dh_install -p libvirt-daemon-system etc/libvirt/qemu-lockd.conf
 	dh_install -p libvirt-daemon-system etc/libvirt/qemu-sanlock.conf
 	dh_install -p libvirt-daemon-system etc/libvirt/qemu/networks/
 	dh_install -p libvirt-daemon-system etc/libvirt/nwfilter/

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