[Pkg-libvirt-commits] [SCM] Libvirt debian packaging branch, master, updated. debian/0.5.1-6-4-g1238706

[Guido Günther]

The following commit has been merged in the master branch:
commit 1238706f6abc40c566e16ca526370d908ec05115
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Feb 21 17:32:27 2009 +0100

    Recommend dnsmasq-base instead of dnsmasq
    
    this keeps us out of all the dnsmasq already running troubles.
    
    Closes: #516443
    Thanks: Bin Zhang for the suggestion and the doc update

diff --git a/debian/README.Debian b/debian/README.Debian
index 567810d..6dc78e2 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -37,8 +37,10 @@ To make the default network start automatically use:
  virsh net-autostart default
 
 In order for things to work this way you need to have the recommended packages
-dnsmasq, bridge-utils and iptables installed. However Debian's default dnsmasq
-needs to be adjusted slightly to interoperate with libvirtd:
+dnsmasq-base, bridge-utils and iptables installed.
+
+You don't need the package dnsmasq. However, if you install it, Debian's
+default dnsmasq needs to be adjusted slightly to interoperate with libvirtd:
 
 cat <<EOF >/etc/dnsmasq.d/00_libvirtd.conf
 # only bind to loopback by default
diff --git a/debian/control b/debian/control
index fa71b7a..0d08bc6 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libvirt0 (>= ${binary:Version}), logrotate
 Enhances: qemu, kvm, xen
 Section: admin
-Recommends: netcat-openbsd, bridge-utils, dnsmasq (>= 2.46-1), iptables, qemu (>= 0.9.1)
+Recommends: netcat-openbsd, bridge-utils, dnsmasq-base (>= 2.46-1), iptables, qemu (>= 0.9.1)
 Suggests: policykit
 Description: the programs for the libvirt library
  Libvirt is a C toolkit to interact with the virtualization capabilities

-- 
Libvirt debian packaging