From 991fa776256664ded143e89ae0c6e4946b2b9a42 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sun, 14 Jun 2015 10:54:12 +0000
Subject: [PATCH] Convert to multiarch.

---
 debian/changelog               |  1 +
 debian/compat                  |  2 +-
 debian/control.in              | 10 ++++++++--
 debian/gir1.2-gtop-2.0.install |  2 +-
 debian/libgtop2-10.install     |  2 +-
 debian/libgtop2-dev.install    |  6 +++---
 debian/rules                   |  5 +++--
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 383ee549..d11c7e62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ libgtop2 (2.30.0-1) UNRELEASED; urgency=medium
 
   [ Michael Biebl ]
   * Drop obsolete Replaces from pre-wheezy.
+  * Convert to multiarch.
 
  -- Jackson Doak <noskcaj@ubuntu.com>  Wed, 02 Jul 2014 08:45:13 +1000
 
diff --git a/debian/compat b/debian/compat
index 45a4fb75..ec635144 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control.in b/debian/control.in
index f947c2cc..e4d2874f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,14 +3,14 @@ Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
                gettext,
                pkg-config,
                libxau-dev,
                libglib2.0-dev (>= 2.6.0),
                gnome-pkg-tools (>= 0.10),
                dh-autoreconf,
-               cdbs,
+               cdbs (>= 0.4.93),
                texinfo,
                intltool (>= 0.35.0),
                libxt-dev,
@@ -27,6 +27,8 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libgtop
 
 Package: libgtop2-10
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtop2-common (>= ${source:Version})
@@ -38,6 +40,7 @@ Description: gtop system monitoring library (shared)
 
 Package: libgtop2-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libgtop2-10 (= ${binary:Version}),
@@ -51,6 +54,7 @@ Description: gtop system monitoring library (devel)
 
 Package: libgtop2-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Description: gtop system monitoring library (common)
  The gtop library reads information about processes and the state of the
@@ -60,6 +64,7 @@ Description: gtop system monitoring library (common)
 
 Package: libgtop2-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends},
 Description: gtop system monitoring library (documentation)
@@ -70,6 +75,7 @@ Description: gtop system monitoring library (documentation)
 
 Package: gir1.2-gtop-2.0
 Architecture: any
+Multi-Arch: same
 Section: introspection
 Depends: ${misc:Depends},
          ${gir:Depends}
diff --git a/debian/gir1.2-gtop-2.0.install b/debian/gir1.2-gtop-2.0.install
index e8a103ca..e68ee28e 100644
--- a/debian/gir1.2-gtop-2.0.install
+++ b/debian/gir1.2-gtop-2.0.install
@@ -1 +1 @@
-usr/lib/girepository-*
+usr/lib/*/girepository-*
diff --git a/debian/libgtop2-10.install b/debian/libgtop2-10.install
index 093956b1..3de3b10a 100644
--- a/debian/libgtop2-10.install
+++ b/debian/libgtop2-10.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/libgtop2-dev.install b/debian/libgtop2-dev.install
index ad5ec157..4999cae7 100644
--- a/debian/libgtop2-dev.install
+++ b/debian/libgtop2-dev.install
@@ -1,5 +1,5 @@
 usr/include/libgtop-2.0
-usr/lib/libgtop-2.0.a
-usr/lib/libgtop-2.0.so
-usr/lib/pkgconfig
+usr/lib/*/libgtop-2.0.a
+usr/lib/*/libgtop-2.0.so
+usr/lib/*/pkgconfig
 usr/share/gir-*
diff --git a/debian/rules b/debian/rules
index 11706577..a3b97673 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,8 @@ DEB_DH_AUTORECONF_ARGS = --as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += -V '$(SHARED_PKG) (>= 2.24.0)'
 
-DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/$(SHARED_PKG)
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+                             --libexecdir=\$${libdir}/$(SHARED_PKG)
 
 DEB_FIXPERMS_EXCLUDE += libgtop_server2
 
@@ -30,5 +31,5 @@ install/$(SHARED_PKG)::
 	# The server is only necessary on kFreeBSD
 	dh_install --autodest -p$(SHARED_PKG) \
 		--ignore=debian/$(SHARED_PKG).install \
-		debian/tmp/usr/lib/*/libgtop_server2
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$(SHARED_PKG)/libgtop_server2
 endif