From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 24 Mar 2016 11:06:41 +0000 (+0000)
Subject: debian/: Multi-Arch support.
X-Git-Tag: 1.1.1~1
X-Git-Url: https://git.distorted.org.uk/~mdw/preload-hacks/commitdiff_plain/f6b2c98d6a754b737f0eb7a5e8cff0ffb7d80019

debian/: Multi-Arch support.
---

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index d60f22b..154b6a6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,15 @@ Source: preload-hacks
 Section: utils
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 9)
 Standards-Version: 3.8.0
 
 Package: uopen
 Architecture: any
 Suggests: fwd
 Depends: ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Automatic connection to Unix-domain sockets
  uopen is a preload hack which detects attempts to open(2) Unix-domain
  sockets and connects to the socket instead.  This can be used, for 
@@ -17,6 +19,8 @@ Description: Automatic connection to Unix-domain sockets
 Package: noip
 Architecture: any
 Depends: ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Run programs with limited network access
  noip is a preload hack which traps socket calls and forces (most)
  attempts to use TCP/IP to use Unix-domain sockets in a private directory
diff --git a/debian/noip.install b/debian/noip.install
index 53b5ef3..1d1848c 100644
--- a/debian/noip.install
+++ b/debian/noip.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin/noip
-debian/tmp/usr/lib/noip.so
+debian/tmp/usr/lib/*/noip.so
 debian/tmp/usr/share/man/man1/noip.1
diff --git a/debian/noip.lintian-overrides b/debian/noip.lintian-overrides
index ec440f7..4a751c2 100644
--- a/debian/noip.lintian-overrides
+++ b/debian/noip.lintian-overrides
@@ -1,4 +1,4 @@
 ### Overrides for noip
 
 ## You're not meant to link against the library.
-noip binary: sharedobject-in-library-directory-missing-soname usr/lib/noip.so
+noip binary: sharedobject-in-library-directory-missing-soname usr/lib/*/noip.so
diff --git a/debian/rules b/debian/rules
index cade6f7..81d3e4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,11 @@
 #! /usr/bin/make -f
 
+arch = $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
+
 %:; dh $@ --parallel
 
 override_dh_auto_install:
 	dh_auto_install --parallel -- \
 		prefix=/usr mandir=/usr/share/man \
+		libdir=/usr/lib/$(arch) \
 		DESTDIR=debian/tmp
diff --git a/debian/uopen.install b/debian/uopen.install
index 957cd42..6bdd177 100644
--- a/debian/uopen.install
+++ b/debian/uopen.install
@@ -1,3 +1,3 @@
 debian/tmp/usr/bin/uopen
-debian/tmp/usr/lib/uopen.so
+debian/tmp/usr/lib/*/uopen.so
 debian/tmp/usr/share/man/man1/uopen.1
diff --git a/debian/uopen.lintian-overrides b/debian/uopen.lintian-overrides
index 8c19eaa..ee894dc 100644
--- a/debian/uopen.lintian-overrides
+++ b/debian/uopen.lintian-overrides
@@ -1,4 +1,4 @@
 ### Overrides for uopen
 
 ## You're not meant to link against the library.
-uopen binary: sharedobject-in-library-directory-missing-soname usr/lib/uopen.so
+uopen binary: sharedobject-in-library-directory-missing-soname usr/lib/*/uopen.so