[SCM] sndobj/master: Build for Multiarch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9250c5c663e0f6f5dc69531c01705021713558ff
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Feb 5 13:20:23 2012 +0100

    Build for 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 8e67677..538e023 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: sound
 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~),
  fftw-dev,
  libasound2-dev [linux-any],
  libjack-dev,
@@ -16,6 +16,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/sndobj.git
 Package: libsndobj-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libsndobj2c2 (= ${binary:Version}),
  fftw-dev,
  ${misc:Depends}
@@ -29,6 +30,8 @@ Description: Sound Object library (development files)
 Package: libsndobj2c2
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Replaces: libsndobj2
diff --git a/debian/libsndobj-dev.install b/debian/libsndobj-dev.install
deleted file mode 100644
index f8aa088..0000000
--- a/debian/libsndobj-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-include/SndObj usr/include
-lib/*.so usr/lib
diff --git a/debian/libsndobj2c2.install b/debian/libsndobj2c2.install
deleted file mode 100644
index 2fe5ccf..0000000
--- a/debian/libsndobj2c2.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/*.so.* usr/lib
diff --git a/debian/rules b/debian/rules
index a472a80..88dcba8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
@@ -9,15 +11,16 @@ override_dh_auto_clean:
 
 override_dh_auto_build:
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-	scons ALSA=true OSS=false JACK=true customLIBS=pthread
+	scons ALSA=true OSS=false JACK=true customLIBS=pthread customLIBPATH=/usr/lib/$(DEB_HOST_MULTIARCH)
 else
-	scons ALSA=false OSS=true JACK=false customLIBS=pthread
+	scons ALSA=false OSS=true JACK=false customLIBS=pthread customLIBPATH=/usr/lib/$(DEB_HOST_MULTIARCH)
 endif
 
 override_dh_install:
-	dh_install -plibsndobj-dev
+	dh_install -plibsndobj-dev include/SndObj usr/include
+	dh_install -plibsndobj-dev lib/*.so usr/lib/$(DEB_HOST_MULTIARCH)/
 	rm -rf debian/libsndobj-dev/usr/include/SndObj/CVS/
-	dh_install --remaining-packages
+	dh_install -plibsndobj2c2 lib/*.so.* usr/lib/$(DEB_HOST_MULTIARCH)/
 
 override_dh_installchangelogs:
 	dh_installchangelogs change.log

-- 
sndobj packaging