--- orig/debian/alsaplayer-alsa.install
+++ mod/debian/alsaplayer-alsa.install
@@ -1 +1 @@
-usr/lib/alsaplayer/output/libalsa_out.so
+usr/lib/*/alsaplayer/output/libalsa_out.so

--- orig/debian/alsaplayer-common.install
+++ mod/debian/alsaplayer-common.install
@@ -1,5 +1,5 @@
 usr/bin/alsaplayer
-usr/lib/alsaplayer/input/*.so
-usr/lib/alsaplayer/output/libnull_out.so
-usr/lib/alsaplayer/reader/*.so
+usr/lib/*/alsaplayer/input/*.so
+usr/lib/*/alsaplayer/output/libnull_out.so
+usr/lib/*/alsaplayer/reader/*.so
 usr/share/man/man1/alsaplayer.1

--- orig/debian/alsaplayer-daemon.install
+++ mod/debian/alsaplayer-daemon.install
@@ -1,3 +1,3 @@
-usr/lib/alsaplayer/interface/libdaemon_interface.so
+usr/lib/*/alsaplayer/interface/libdaemon_interface.so
 
--- orig/debian/alsaplayer-esd.install
+++ mod/debian/alsaplayer-esd.install
@@ -1 +1 @@
-usr/lib/alsaplayer/output/libesound_out.so
+usr/lib/*/alsaplayer/output/libesound_out.so

--- orig/debian/alsaplayer-gtk.install
+++ mod/debian/alsaplayer-gtk.install
@@ -1,2 +1,2 @@
-usr/lib/alsaplayer/scopes/*.so
-usr/lib/alsaplayer/interface/libgtk_interface.so
+usr/lib/*/alsaplayer/scopes/*.so
+usr/lib/*/alsaplayer/interface/libgtk_interface.so

--- orig/debian/alsaplayer-jack.install
+++ mod/debian/alsaplayer-jack.install
@@ -1 +1 @@
-usr/lib/alsaplayer/output/libjack_out.so
+usr/lib/*/alsaplayer/output/libjack_out.so

--- orig/debian/alsaplayer-nas.install
+++ mod/debian/alsaplayer-nas.install
@@ -1 +1 @@
-usr/lib/alsaplayer/output/libnas_out.so
+usr/lib/*/alsaplayer/output/libnas_out.so

--- orig/debian/alsaplayer-oss.install
+++ mod/debian/alsaplayer-oss.install
@@ -1 +1 @@
-usr/lib/alsaplayer/output/liboss_out.so
+usr/lib/*/alsaplayer/output/liboss_out.so

--- orig/debian/alsaplayer-text.install
+++ mod/debian/alsaplayer-text.install
@@ -1,2 +1,2 @@
-usr/lib/alsaplayer/interface/libtext_interface.so
+usr/lib/*/alsaplayer/interface/libtext_interface.so

--- orig/debian/alsaplayer-xosd.install
+++ mod/debian/alsaplayer-xosd.install
@@ -1,2 +1,2 @@
-usr/lib/alsaplayer/interface/libxosd_interface.so
+usr/lib/*/alsaplayer/interface/libxosd_interface.so

--- orig/debian/changelog
+++ mod/debian/changelog
@@ -1,3 +1,9 @@
+alsaplayer (0.99.76-0.3multiarch1) multiarch; urgency=low
+
+  * Multiarch build
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Mon, 14 Feb 2005 15:46:37 +0100
+
 alsaplayer (0.99.76-0.3) unstable; urgency=low
 
   * Non-Maintainer Upload

--- orig/debian/libalsaplayer-dev.install
+++ mod/debian/libalsaplayer-dev.install
@@ -1,6 +1,6 @@
-usr/include/alsaplayer/*.h
-usr/lib/libalsaplayer.a
-usr/lib/libalsaplayer.la
-usr/lib/libalsaplayer.so
-usr/lib/pkgconfig/alsaplayer.pc
+usr/include/*/alsaplayer/*.h
+usr/lib/*/libalsaplayer.a
+usr/lib/*/libalsaplayer.la
+usr/lib/*/libalsaplayer.so
+usr/lib/*/pkgconfig/alsaplayer.pc
 usr/share/doc/alsaplayer/reference

--- orig/debian/libalsaplayer0.install
+++ mod/debian/libalsaplayer0.install
@@ -1,2 +1,2 @@
-usr/lib/libalsaplayer.so.0
-usr/lib/libalsaplayer.so.0.0.2
+usr/lib/*/libalsaplayer.so.0
+usr/lib/*/libalsaplayer.so.0.0.2

--- orig/debian/rules
+++ mod/debian/rules
@@ -2,6 +2,11 @@
 
 PWD=$(shell pwd)
 
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
 configure-stamp:
 	dh_testdir
 	mkdir -p build
@@ -13,7 +18,9 @@
 		    --enable-jack \
 		    --cache-file=../config.cache \
 		    --enable-oggvorbis=yes --enable-audiofile \
-		    --enable-static --enable-shared 
+		    --enable-static --enable-shared \
+		    --libdir=/usr/lib/$(DEB_BUILD_GNU_TYPE) \
+		    --includedir=/usr/include/$(DEB_BUILD_GNU_TYPE)
 	touch configure-stamp
 
 maintainerclean: clean

* added files

