12 files changed, 26 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index 7d401e3d..dee20baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 network-manager (0.9.8.8-5) UNRELEASED; urgency=medium
 
   * Bump debhelper compatibility level to 9.
+  * Convert to multi-arch. Mark libnm-glib4, libnm-glib-vpn1 and libnm-util2
+    as M-A: same. As pppd has not been converted yet, keep installing the ppp
+    plugin to /usr/lib/pppd/2.4.5/.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 01 Apr 2014 23:22:57 +0200
 
diff --git a/debian/control b/debian/control
index 95f6676f..338efce3 100644
--- a/debian/control
+++ b/debian/control
@@ -91,6 +91,8 @@ Description: network management framework (development files)
 Package: libnm-glib4
 Section: libs
 Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: network management framework (GLib shared library)
@@ -126,6 +128,8 @@ Description: network management framework (GLib interface)
 Package: libnm-glib-vpn1
 Section: libs
 Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: network management framework (GLib VPN shared library)
@@ -158,6 +162,8 @@ Description: network management framework (GLib interface)
 Package: libnm-util2
 Section: libs
 Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: network management framework (shared library)
diff --git a/debian/gir1.2-networkmanager-1.0.install b/debian/gir1.2-networkmanager-1.0.install
index c395f7ac..03255f60 100644
--- a/debian/gir1.2-networkmanager-1.0.install
+++ b/debian/gir1.2-networkmanager-1.0.install
@@ -1 +1 @@
-usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/ usr/lib/
diff --git a/debian/libnm-glib-dev.install b/debian/libnm-glib-dev.install
index cf0d1905..9974311d 100644
--- a/debian/libnm-glib-dev.install
+++ b/debian/libnm-glib-dev.install
@@ -1,5 +1,5 @@
-usr/lib/pkgconfig/libnm-glib.pc
-usr/lib/libnm-glib.so
+usr/lib/*/pkgconfig/libnm-glib.pc
+usr/lib/*/libnm-glib.so
 usr/include/libnm-glib/libnm_glib.h
 usr/include/libnm-glib/nm-object.h
 usr/include/libnm-glib/nm-client.h
diff --git a/debian/libnm-glib-vpn-dev.install b/debian/libnm-glib-vpn-dev.install
index b995b981..2c3797a5 100644
--- a/debian/libnm-glib-vpn-dev.install
+++ b/debian/libnm-glib-vpn-dev.install
@@ -1,4 +1,4 @@
-usr/lib/pkgconfig/libnm-glib-vpn.pc
-usr/lib/libnm-glib-vpn.so
+usr/lib/*/pkgconfig/libnm-glib-vpn.pc
+usr/lib/*/libnm-glib-vpn.so
 usr/include/libnm-glib/nm-vpn-plugin*
 usr/include/libnm-glib/nm-vpn-enum-types.h
diff --git a/debian/libnm-glib-vpn1.install b/debian/libnm-glib-vpn1.install
index 08a78e6e..14151d0b 100644
--- a/debian/libnm-glib-vpn1.install
+++ b/debian/libnm-glib-vpn1.install
@@ -1 +1 @@
-usr/lib/libnm-glib-vpn.so.*
+usr/lib/*/libnm-glib-vpn.so.*
diff --git a/debian/libnm-glib4.install b/debian/libnm-glib4.install
index 94919f75..f3319279 100644
--- a/debian/libnm-glib4.install
+++ b/debian/libnm-glib4.install
@@ -1 +1 @@
-usr/lib/libnm-glib.so.*
+usr/lib/*/libnm-glib.so.*
diff --git a/debian/libnm-util-dev.install b/debian/libnm-util-dev.install
index 634aa3b0..c46bca71 100644
--- a/debian/libnm-util-dev.install
+++ b/debian/libnm-util-dev.install
@@ -1,5 +1,5 @@
-usr/lib/pkgconfig/libnm-util.pc
-usr/lib/libnm-util.so
+usr/lib/*/pkgconfig/libnm-util.pc
+usr/lib/*/libnm-util.so
 usr/include/NetworkManager/nm-connection.h
 usr/include/NetworkManager/nm-utils.h
 usr/include/NetworkManager/nm-setting.h
diff --git a/debian/libnm-util2.install b/debian/libnm-util2.install
index 87b3191a..0f0f2a45 100644
--- a/debian/libnm-util2.install
+++ b/debian/libnm-util2.install
@@ -1 +1 @@
-usr/lib/libnm-util.so.*
+usr/lib/*/libnm-util.so.*
diff --git a/debian/network-manager-dev.install b/debian/network-manager-dev.install
index 61069c63..9c29adcf 100644
--- a/debian/network-manager-dev.install
+++ b/debian/network-manager-dev.install
@@ -1,4 +1,4 @@
-usr/lib/pkgconfig/NetworkManager.pc
+usr/lib/*/pkgconfig/NetworkManager.pc
 usr/include/NetworkManager/NetworkManager.h
 usr/include/NetworkManager/NetworkManagerVPN.h
 usr/include/NetworkManager/nm-version.h
diff --git a/debian/network-manager.install b/debian/network-manager.install
index c35a87cd..e9e5b9b7 100644
--- a/debian/network-manager.install
+++ b/debian/network-manager.install
@@ -5,7 +5,7 @@ usr/bin/nmcli
 usr/lib/NetworkManager/nm-dhcp-client.action
 usr/lib/NetworkManager/nm-dispatcher.action
 usr/lib/NetworkManager/nm-avahi-autoipd.action
-usr/lib/NetworkManager/libnm-settings-plugin-ifupdown.so
+usr/lib/*/NetworkManager/libnm-settings-plugin-ifupdown.so
 usr/lib/pppd/*/*.so
 usr/share/locale/
 usr/share/man/
diff --git a/debian/rules b/debian/rules
index 9b2ac384..92823651 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,15 @@
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --with gir,systemd
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--libexecdir=/usr/lib/NetworkManager \
+		--with-pppd-plugin-dir=/usr/lib/pppd/2.4.5 \
 		--with-resolvconf=/sbin/resolvconf \
 		--with-dhclient=/sbin/dhclient \
 		--with-iptables=/sbin/iptables \
@@ -16,6 +19,7 @@ override_dh_auto_configure:
 		--with-crypto=gnutls \
 		--with-session-tracking=systemd \
 		--with-suspend-resume=systemd \
+		--with-modem-manager-1 \
 		--disable-more-warnings \
 		--disable-modify-system \
 		--enable-polkit \
@@ -24,7 +28,6 @@ override_dh_auto_configure:
 		--enable-introspection \
 		--enable-doc \
 		--enable-concheck \
-		--with-modem-manager-1 \
 		--enable-bluez4
 
 override_dh_install:
@@ -38,7 +41,7 @@ override_dh_installinit:
 	dh_installinit -pnetwork-manager --restart-after-upgrade
 
 override_dh_makeshlibs:
-	dh_makeshlibs -X/usr/lib/NetworkManager/ -X/usr/lib/pppd/
+	dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/
 
 override_dh_strip:
 	dh_strip --dbg-package=network-manager-dbg