debian/: Multi-Arch support.

diff --git a/debian/compat b/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/debian/control b/debian/control
index d60f22bf910ac5f68e34f2e3a87d5d80c1601d3f..154b6a6a3a75c470ce2b14a7b5f91b11ae8f906e 100644 (file)
--- 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 53b5ef3ddbccc668f8b1705ada17b9f05b45e8e0..1d1848ccae74d9d8f4c54d09ec82db89482e32c0 100644 (file)
--- 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 ec440f70cf482d2421818116f3702735b6848738..4a751c25dae44bee6057280eb4d9e41d0f872fbd 100644 (file)
--- 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 cade6f7dbadc9130b054ea367b8f629278f6dcc2..81d3e4b9bd17bf84f6d2ae37652b4a62f18b7257 100755 (executable)
--- 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 957cd42e653b8f5acaee7f69fb960787b813e5f2..6bdd177ecbc9da58f19e27f9ab4c6f469a5ccc71 100644 (file)
--- 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 8c19eaa981fc4fa4207f8c1895cc0178c270c267..ee894dc168d205396f87fcf283ac6c02f3c6f84d 100644 (file)
--- 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