diff -Nru sndobj-2.6.6.1/debian/changelog sndobj-2.6.6.1/debian/changelog
--- sndobj-2.6.6.1/debian/changelog	2011-02-14 06:40:06.000000000 +0000
+++ sndobj-2.6.6.1/debian/changelog	2012-02-05 13:29:18.000000000 +0000
@@ -1,3 +1,12 @@
+sndobj (2.6.6.1-3) unstable; urgency=low
+
+  * Build for Multiarch.
+  * Replace negated list of architectures with linux-any (Closes: #634493)
+  * Properly clean the sources tree.
+  * Bump Standards.
+
+ -- Alessio Treglia <alessio@debian.org>  Sun, 05 Feb 2012 14:28:44 +0100
+
 sndobj (2.6.6.1-2) unstable; urgency=low
 
   * Add gbp config file.
diff -Nru sndobj-2.6.6.1/debian/compat sndobj-2.6.6.1/debian/compat
--- sndobj-2.6.6.1/debian/compat	2011-02-13 10:51:41.000000000 +0000
+++ sndobj-2.6.6.1/debian/compat	2012-02-05 11:56:32.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru sndobj-2.6.6.1/debian/control sndobj-2.6.6.1/debian/control
--- sndobj-2.6.6.1/debian/control	2011-02-14 06:38:10.000000000 +0000
+++ sndobj-2.6.6.1/debian/control	2012-02-05 12:21:03.000000000 +0000
@@ -2,13 +2,15 @@
 Section: sound
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
-Uploaders: Alessio Treglia <alessio@debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Uploaders:
+ Alessio Treglia <alessio@debian.org>
+Build-Depends:
+ debhelper (>= 8.1.3~),
  fftw-dev,
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libasound2-dev [linux-any],
  libjack-dev,
  scons
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://sndobj.sourceforge.net/
 Vcs-Git: git://git.debian.org/pkg-multimedia/sndobj.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/sndobj.git
@@ -16,12 +18,14 @@
 Package: libsndobj-dev
 Section: libdevel
 Architecture: any
-Depends: libsndobj2c2 (= ${binary:Version}),
+Multi-Arch: same
+Depends:
  fftw-dev,
+ libsndobj2c2 (= ${binary:Version}),
  ${misc:Depends}
 Description: Sound Object library (development files)
- The Sound Object Library is an object-oriented audio processing library. 
- It provides objects for synthesis and processing of sound that can be used 
+ The Sound Object Library is an object-oriented audio processing library.
+ It provides objects for synthesis and processing of sound that can be used
  to build applications for computer-generated music.
  .
  This package contains the development files.
@@ -29,10 +33,15 @@
 Package: libsndobj2c2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Replaces: libsndobj2
-Conflicts: libsndobj2
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ libsndobj2
+Conflicts:
+ libsndobj2
 Description: Sound Object library
  The Sound Object Library is an object-oriented audio processing library.
  It provides objects for synthesis and processing of sound that can be used
diff -Nru sndobj-2.6.6.1/debian/libsndobj2c2.install sndobj-2.6.6.1/debian/libsndobj2c2.install
--- sndobj-2.6.6.1/debian/libsndobj2c2.install	2011-02-13 10:51:41.000000000 +0000
+++ sndobj-2.6.6.1/debian/libsndobj2c2.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-lib/*.so.* usr/lib
diff -Nru sndobj-2.6.6.1/debian/libsndobj-dev.install sndobj-2.6.6.1/debian/libsndobj-dev.install
--- sndobj-2.6.6.1/debian/libsndobj-dev.install	2011-02-13 10:51:41.000000000 +0000
+++ sndobj-2.6.6.1/debian/libsndobj-dev.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-include/SndObj usr/include
-lib/*.so usr/lib
diff -Nru sndobj-2.6.6.1/debian/rules sndobj-2.6.6.1/debian/rules
--- sndobj-2.6.6.1/debian/rules	2011-02-14 06:33:15.000000000 +0000
+++ sndobj-2.6.6.1/debian/rules	2012-02-05 12:20:35.000000000 +0000
@@ -1,19 +1,27 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@
 
+override_dh_auto_clean:
+	rm -rf lib
+	dh_auto_clean
+
 override_dh_auto_build:
+	mkdir lib
 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