[SCM] serd/master: Build with MultiArch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit feee5574580cf8e4fbecaa85abcc289db9dd882d
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 24 09:47:19 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 b03705e..9ab4908 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~),
  pkg-config,
  python
 Build-Depends-Indep: doxygen,
@@ -15,9 +15,10 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/serd.git
 
 Package: libserd-dev
 Section: libdevel
-Architecture: all
-Depends: libserd-0-0 (>= ${source:Version}),
- libserd-0-0 (<< ${source:Upstream-Version}+1~),
+Architecture: any
+Multi-Arch: same
+Depends:
+ libserd-0-0 (= ${binary:Version}),
  ${misc:Depends}
 Recommends: pkg-config
 Suggests: libserd-doc
@@ -29,6 +30,8 @@ Description: lightweight RDF syntax library - development files
 
 Package: libserd-0-0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Suggests: serdi
@@ -83,6 +86,7 @@ Description: lightweight RDF syntax library - documentation
 
 Package: serd-dbg
 Architecture: any
+Multi-Arch: same
 Priority: extra
 Section: debug
 Depends: serdi (= ${binary:Version}),
diff --git a/debian/libserd-0-0.install b/debian/libserd-0-0.install
index 093956b..3de3b10 100644
--- a/debian/libserd-0-0.install
+++ b/debian/libserd-0-0.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/libserd-dev.install b/debian/libserd-dev.install
index d994896..30dab19 100644
--- a/debian/libserd-dev.install
+++ b/debian/libserd-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 745ba20..8eee0a2 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
 
@@ -14,6 +15,7 @@ override_dh_auto_configure:
 	$(WAF) configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
+		--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
 		--strict \
 		--debug \
 		$(CONFIGURE_EXTRA_FLAGS)

-- 
serd packaging