Use multiarch layout

Based on the on what Ubuntu does

Closes: #813062

debian/control

@@ -236,6 +236,8 @@ Description: Libvirt daemon configuration files
 
 Package: libvirt0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: lvm2 [linux-any]
 Breaks: selinux-policy-default (<< 2:2.20131214-1~), selinux-policy-mls (<< 2:2.20131214-1~), libvirt-daemon (<< 4.10.0-2~)
@@ -262,6 +264,7 @@ Description: documentation for the libvirt library
 Package: libvirt-dev
 Architecture: any
 Section: libdevel
+Multi-Arch: same
 Depends: ${misc:Depends}, libvirt0 (= ${binary:Version}), libxen-dev [i386 amd64 armhf arm64]
 Recommends: pkg-config
 Description: development files for the libvirt library
@@ -295,6 +298,8 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
  libvirt0 (= ${binary:Version}),
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Priority: optional
 Description: nss plugin providing IP address resolution for virtual machines
  Libvirt is a C toolkit to interact with the virtualization capabilities

debian/libvirt-dev.install

-usr/lib/libvirt.so
-usr/lib/libvirt-admin.so
-usr/lib/libvirt-lxc.so
-usr/lib/libvirt-qemu.so
+usr/lib/*/libvirt.so
+usr/lib/*/libvirt-admin.so
+usr/lib/*/libvirt-lxc.so
+usr/lib/*/libvirt-qemu.so
 usr/include/*
-usr/lib/pkgconfig/*
+usr/lib/*/pkgconfig/*
 usr/share/libvirt/api/*-api.xml

debian/libvirt0.install

-usr/lib/libvirt.so.*
-usr/lib/libvirt-admin.so.*
-usr/lib/libvirt-lxc.so.*
-usr/lib/libvirt-qemu.so.*
+usr/lib/*/libvirt.so.*
+usr/lib/*/libvirt-admin.so.*
+usr/lib/*/libvirt-lxc.so.*
+usr/lib/*/libvirt-qemu.so.*
 usr/share/libvirt/cpu_map.xml
 usr/share/libvirt/schemas/*
 usr/share/libvirt/test-screenshot.png

debian/rules

@@ -168,6 +168,15 @@ override_dh_auto_test:
 	fi
 
 override_dh_install-arch:
+	# Multiarch:
+	# don't configure with --libdir, but move the files manually, because
+	# we don't want to change other places in /usr/lib/
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	mv debian/tmp/usr/lib/lib*a \
+	   debian/tmp/usr/lib/lib*.so* \
+	   debian/tmp/usr/lib/pkgconfig \
+	   debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+
 	dh_install
 
 	# Copy upstream files to debian/ so dh_* can find them
@@ -197,7 +206,9 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
 	dh_install -p libvirt-daemon-system etc/libvirt/qemu/networks/
 	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/libnss_libvirt.so.2 lib/$(DEB_HOST_MULTIARCH)/
+	dh_install -p libnss-libvirt \
+                      usr/lib/$(DEB_HOST_MULTIARCH)/libnss_libvirt.so.2 \
+                      lib/$(DEB_HOST_MULTIARCH)/
 endif
 ifeq ($(XEN_ENABLED), 1)
 	dh_install -p libvirt-daemon-system etc/libvirt/libxl.conf