debian/control

@@ -53,7 +53,7 @@ Build-Depends:
  librbd-dev [linux-any],
  librados-dev [linux-any],
 # for --with-storage-gluster
- glusterfs-common (>= 3.4.0),
+ libglusterfs-dev,
 # for --with-wireshark-dissector
  libwireshark-dev (>= 1.11.3),
  libwiretap-dev,
@@ -279,14 +279,15 @@ Depends:
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Priority: optional
-Description: nss plugin providing IP address resolution for virtual machines
+Description: nss plugins providing IP address resolution for virtual machines
  Libvirt is a C toolkit to interact with the virtualization capabilities
  of recent versions of Linux (and other OSes). The library aims at providing
  a long term stable C API for different virtualization mechanisms. It currently
  supports QEMU, KVM, XEN, OpenVZ, LXC, and VirtualBox.
  .
- This package contains the nss plugin for IP address resolution of libvirt
- managed virtual machines.
+ This package contains two nss plugins for IP address resolution of libvirt
+ managed virtual machines. libnss_libvirt_guest uses libvirt's domain names
+ while the other (libnss_libvirt) looks at the guest's hostname.
 
 Package: libvirt-wireshark
 Architecture: any

debian/rules

@@ -208,7 +208,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
 	dh_install -p libvirt-daemon-system etc/libvirt/nwfilter/
 	dh_install -p libvirt-clients etc/libvirt/virt-login-shell.conf
 	dh_install -p libnss-libvirt \
-                      usr/lib/$(DEB_HOST_MULTIARCH)/libnss_libvirt.so.2 \
+                      usr/lib/$(DEB_HOST_MULTIARCH)/libnss_libvirt*.so.2 \
                       lib/$(DEB_HOST_MULTIARCH)/
 endif
 ifeq ($(XEN_ENABLED), 1)