Preliminary patch for vde2-2.3.2+r586 attached.
diff -ur vde2-2.3.2+r586/debian/compat vde2-2.3.2+r586.multiarch/debian/compat
--- vde2-2.3.2+r586/debian/compat 2018-02-18 22:23:17.000000000 +0000
+++ vde2-2.3.2+r586.multiarch/debian/compat 2018-02-18 22:16:33.139672545 +0000
@@ -1 +1 @@
-5
+9
diff -ur vde2-2.3.2+r586/debian/control vde2-2.3.2+r586.multiarch/debian/control
--- vde2-2.3.2+r586/debian/control 2018-02-18 22:23:17.000000000 +0000
+++ vde2-2.3.2+r586.multiarch/debian/control 2018-02-18 22:16:28.883052364 +0000
@@ -77,6 +77,8 @@
Package: libvdeplug2
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Virtual Distributed Ethernet - Plug library
VDE is a virtual switch that can connect multiple virtual machines together,
@@ -109,6 +111,8 @@
Package: libvde0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libvdemgmt0 (<= 2.2.2-3)
Replaces: libvdemgmt0
diff -ur vde2-2.3.2+r586/debian/libvde0.install vde2-2.3.2+r586.multiarch/debian/libvde0.install
--- vde2-2.3.2+r586/debian/libvde0.install 2018-02-18 22:23:17.000000000 +0000
+++ vde2-2.3.2+r586.multiarch/debian/libvde0.install 2018-02-18 22:16:48.532837724 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libvdemgmt*.so.*
+debian/tmp/usr/lib/*/libvdemgmt*.so.*
debian/tmp/etc/vde2/libvdemgmt/*
-debian/tmp/usr/lib/libvdehist*.so.*
-debian/tmp/usr/lib/libvdesnmp*.so.*
+debian/tmp/usr/lib/*/libvdehist*.so.*
+debian/tmp/usr/lib/*/libvdesnmp*.so.*
diff -ur vde2-2.3.2+r586/debian/libvde-dev.install vde2-2.3.2+r586.multiarch/debian/libvde-dev.install
--- vde2-2.3.2+r586/debian/libvde-dev.install 2018-02-18 22:23:17.000000000 +0000
+++ vde2-2.3.2+r586.multiarch/debian/libvde-dev.install 2018-02-18 22:17:17.025859620 +0000
@@ -1,12 +1,12 @@
debian/tmp/usr/include/libvdemgmt*
-debian/tmp/usr/lib/libvdemgmt*.a
-debian/tmp/usr/lib/libvdemgmt*.so
-debian/tmp/usr/lib/pkgconfig/vdemgmt.pc
+debian/tmp/usr/lib/*/libvdemgmt*.a
+debian/tmp/usr/lib/*/libvdemgmt*.so
+debian/tmp/usr/lib/*/pkgconfig/vdemgmt.pc
debian/tmp/usr/include/libvdehist*
-debian/tmp/usr/lib/libvdehist*.a
-debian/tmp/usr/lib/libvdehist*.so
-debian/tmp/usr/lib/pkgconfig/vdehist.pc
+debian/tmp/usr/lib/*/libvdehist*.a
+debian/tmp/usr/lib/*/libvdehist*.so
+debian/tmp/usr/lib/*/pkgconfig/vdehist.pc
debian/tmp/usr/include/libvdesnmp*
-debian/tmp/usr/lib/libvdesnmp*.a
-debian/tmp/usr/lib/libvdesnmp*.so
-debian/tmp/usr/lib/pkgconfig/vdesnmp.pc
+debian/tmp/usr/lib/*/libvdesnmp*.a
+debian/tmp/usr/lib/*/libvdesnmp*.so
+debian/tmp/usr/lib/*/pkgconfig/vdesnmp.pc
diff -ur vde2-2.3.2+r586/debian/libvdeplug2.install vde2-2.3.2+r586.multiarch/debian/libvdeplug2.install
--- vde2-2.3.2+r586/debian/libvdeplug2.install 2018-02-18 22:23:17.000000000 +0000
+++ vde2-2.3.2+r586.multiarch/debian/libvdeplug2.install 2018-02-18 22:17:21.782474272 +0000
@@ -1 +1 @@
-debian/tmp/usr/lib/libvdeplug*.so.*
+debian/tmp/usr/lib/*/libvdeplug*.so.*
diff -ur vde2-2.3.2+r586/debian/libvdeplug-dev.install vde2-2.3.2+r586.multiarch/debian/libvdeplug-dev.install
--- vde2-2.3.2+r586/debian/libvdeplug-dev.install 2018-02-18 22:23:17.000000000 +0000
+++ vde2-2.3.2+r586.multiarch/debian/libvdeplug-dev.install 2018-02-18 22:17:26.192426044 +0000
@@ -1,4 +1,4 @@
debian/tmp/usr/include/libvdeplug*
-debian/tmp/usr/lib/libvdeplug*.a
-debian/tmp/usr/lib/libvdeplug*.so
-debian/tmp/usr/lib/pkgconfig/vdeplug.pc
+debian/tmp/usr/lib/*/libvdeplug*.a
+debian/tmp/usr/lib/*/libvdeplug*.so
+debian/tmp/usr/lib/*/pkgconfig/vdeplug.pc
diff -ur vde2-2.3.2+r586/debian/rules vde2-2.3.2+r586.multiarch/debian/rules
--- vde2-2.3.2+r586/debian/rules 2018-02-18 22:23:17.000000000 +0000
+++ vde2-2.3.2+r586.multiarch/debian/rules 2018-02-18 22:21:51.006188407 +0000
@@ -6,22 +6,24 @@
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/autoreconf.mk
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-experimental --disable-python
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+LIBDIR = /usr/lib/$(DEB_HOST_MULTIARCH)
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-experimental --disable-python --libdir=$(LIBDIR) --libexecdir=$(LIBDIR)/vde2
# TUN/TAP is almost unsupported on kFreeBSD, so install the corresponding files
# only on Linux.
binary-install/vde2::
if test "x`uname -s`" = "xLinux"; then \
dh_install -pvde2 debian/tmp/usr/sbin/vde_tunctl; \
- dh_install -pvde2 debian/tmp/usr/lib/vde2/libvdetap.so; \
- dh_install -pvde2 debian/tmp/usr/lib/vde2/vdetap; \
+ dh_install -pvde2 debian/tmp/${LIBDIR}/vde2/libvdetap.so; \
+ dh_install -pvde2 debian/tmp/${LIBDIR}/vde2/vdetap; \
dh_installman -pvde2 debian/tmp/usr/share/man/man8/vde_tunctl.8; \
dh_installman -pvde2 debian/tmp/usr/share/man/man1/vdetaplib.1; \
fi
binary-install/libvde-dev::
if test "x`uname -o`" = "xGNU/Linux"; then \
- dh_install -plibvde-dev debian/tmp/usr/lib/vde2/libvdetap.a; \
+ dh_install -plibvde-dev debian/tmp/${LIBDIR}/vde2/libvdetap.a; \
fi
install/vde2::
diff -ur vde2-2.3.2+r586/debian/vde2.install vde2-2.3.2+r586.multiarch/debian/vde2.install
--- vde2-2.3.2+r586/debian/vde2.install 2018-02-18 22:23:17.000000000 +0000
+++ vde2-2.3.2+r586.multiarch/debian/vde2.install 2018-02-18 22:17:56.278763541 +0000
@@ -27,9 +27,9 @@
debian/tmp/usr/share/man/man1/vde_switch.1
debian/tmp/usr/share/man/man1/vdeterm.1
debian/tmp/usr/share/man/man1/wirefilter.1
-debian/tmp/usr/lib/vde2/plugins/dump.so
-debian/tmp/usr/lib/vde2/plugins/iplog.so
-debian/tmp/usr/lib/vde2/plugins/pdump.so
-debian/tmp/usr/lib/vde2/vde_l3/bfifo.so
-debian/tmp/usr/lib/vde2/vde_l3/pfifo.so
-debian/tmp/usr/lib/vde2/vde_l3/tbf.so
+debian/tmp/usr/lib/*/vde2/plugins/dump.so
+debian/tmp/usr/lib/*/vde2/plugins/iplog.so
+debian/tmp/usr/lib/*/vde2/plugins/pdump.so
+debian/tmp/usr/lib/*/vde2/vde_l3/bfifo.so
+debian/tmp/usr/lib/*/vde2/vde_l3/pfifo.so
+debian/tmp/usr/lib/*/vde2/vde_l3/tbf.so
