[SCM] sord/master: Build with MultiArch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5c54e31fc1fdedb64ca94a82fb72102b3e2399b2
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 24 11:08:31 2012 +0100

    Build with MultiArch.

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 0b114c8..4cecd6d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Alessio Treglia <alessio at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
  doxygen,
  graphviz,
  libserd-dev (>= 0.5.0),
@@ -17,6 +17,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/sord.git
 Package: libsord-0-0
 Section: utils
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Suggests: sordi
@@ -29,9 +31,10 @@ Description: library for storing RDF data in memory
 
 Package: libsord-dev
 Section: libdevel
-Architecture: all
-Depends: libsord-0-0 (>= ${source:Version}),
- libsord-0-0 (<< ${source:Upstream-Version}+1~),
+Architecture: any
+Multi-Arch: same
+Depends:
+ libsord-0-0 (= ${binary:Version}),
  libserd-dev,
  ${misc:Depends}
 Suggests: libsord-doc
@@ -69,6 +72,7 @@ Package: sord-dbg
 Priority: extra
 Section: debug
 Architecture: any
+Multi-Arch: same
 Depends: libsord-0-0 (= ${binary:Version}),
  sordi (= ${binary:Version}),
  ${misc:Depends}
diff --git a/debian/libsord-0-0.install b/debian/libsord-0-0.install
index 093956b..3de3b10 100644
--- a/debian/libsord-0-0.install
+++ b/debian/libsord-0-0.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/libsord-dev.install b/debian/libsord-dev.install
index d994896..30dab19 100644
--- a/debian/libsord-dev.install
+++ b/debian/libsord-dev.install
@@ -1,3 +1,3 @@
-usr/lib/*.so
+usr/lib/*/*.so
 usr/include
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig
diff --git a/debian/rules b/debian/rules
index c23d14f..382368d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LDFLAGS+=-Wl,--as-needed
 WAF = ./waf
 
@@ -10,6 +11,7 @@ override_dh_auto_configure:
 	$(WAF) configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--strict \
 		--debug \
 		--docs

-- 
sord packaging