Converting for multiarch

6 files changed, 30 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index a70c401..ca5c2bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,19 @@ uriparser (0.8.1-1) unstable; urgency=low
     - Removed because xz is now standard compression.
   * debian/rules:
     - Enable hardening.
+  * Enable mulitarch:
+    - debian/rules:
+      + Add --libdir to confflags
+    - debian/liburiparser-dev.links:
+      + Add dh-exec shebang line.
+      + Add ${DEB_HOST_MULTIARCH}.
+      + make file executable.
+    - debian/*.install:
+      + Change the path (add /*/).
+    - debian/control:
+      + Add dh-exec (>=0.3) to Build-Depends.
+      + Add Pre-Depends: ${misc:Pre-Depends} to package liburiparser1.
+      + Add Multi-Arch: same to package liburiparser1.
 
  -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 18 Feb 2015 08:27:43 +0100
 
diff --git a/debian/control b/debian/control
index fe43959..b7d51e2 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,8 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Build-Depends:
  debhelper (>= 9),
- dh-autoreconf
+ dh-autoreconf,
+ dh-exec (>=0.3)
 Standards-Version: 3.9.6
 Homepage: http://uriparser.sourceforge.net
 Vcs-Git: git://anonscm.debian.org/collab-maint/uriparser.git
@@ -12,7 +13,12 @@ Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/uriparser.git
 
 Package: liburiparser1
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends}
 Description: URI parsing library compliant with RFC 3986
  uriparser is a library that parses Uniform Resource Identifiers (URIs),
  strictly adhering to RFC 3986 where syntax for URIs is defined. URIs
@@ -33,7 +39,9 @@ Description: URI parsing library compliant with RFC 3986
 Package: liburiparser-dev
 Architecture: any
 Section: libdevel
-Depends: liburiparser1 (= ${binary:Version}), ${misc:Depends}
+Depends:
+ liburiparser1 (= ${binary:Version}),
+ ${misc:Depends}
 Description: development files for uriparser
  This package provides the development files for uriparser, a library to parse
  Uniform Resource Identifiers (URIs). Install it if you want to compile a
diff --git a/debian/liburiparser-dev.install b/debian/liburiparser-dev.install
index fbbe2f0..68e5a87 100644
--- a/debian/liburiparser-dev.install
+++ b/debian/liburiparser-dev.install
@@ -1,2 +1,2 @@
 usr/include
-usr/lib/pkgconfig/*
+usr/lib/*/pkgconfig/*
diff --git a/debian/liburiparser-dev.links b/debian/liburiparser-dev.links
index 59b8a02..cccd3d3 100644..100755
--- a/debian/liburiparser-dev.links
+++ b/debian/liburiparser-dev.links
@@ -1 +1,3 @@
-usr/lib/liburiparser.so.1.0.17 usr/lib/liburiparser.so
+#! /usr/bin/dh-exec
+
+usr/lib/${DEB_HOST_MULTIARCH}/liburiparser.so.1.0.17 usr/lib/${DEB_HOST_MULTIARCH}/liburiparser.so
diff --git a/debian/liburiparser1.install b/debian/liburiparser1.install
index 093956b..3de3b10 100644
--- a/debian/liburiparser1.install
+++ b/debian/liburiparser1.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/rules b/debian/rules
index 6144eb1..05a19fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 # Configure arguments
 
-confflags = --prefix=/usr --disable-test --disable-doc
+confflags = --prefix=/usr --disable-test --disable-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)