--- orig/debian/changelog
+++ mod/debian/changelog
@@ -1,3 +1,21 @@
+libvorbis (1.0.1-1multiarch3) multiarch; urgency=low
+
+  * Bumpbump.
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Thu, 24 Feb 2005 12:14:45 +0100
+
+libvorbis (1.0.1-1multiarch2) multiarch; urgency=low
+
+  * Make sure we ship the include files.
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Mon, 21 Feb 2005 12:35:43 +0100
+
+libvorbis (1.0.1-1multiarch1) multiarch; urgency=low
+
+  * Multiarch build
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Thu, 10 Feb 2005 16:11:57 +0100
+
 libvorbis (1.0.1-1) unstable; urgency=low
 
   * New upstream.
@@ -105,6 +123,4 @@
 
  -- Michael Beattie <mickyb@es.co.nz>  Mon, 26 Jun 2000 18:59:56 +1200
 
-Local variables:
-mode: debian-changelog
-End:
+

--- orig/debian/libvorbis-dev.install
+++ mod/debian/libvorbis-dev.install
@@ -1,16 +1,16 @@
-debian/tmp/usr/include/vorbis/codec.h
-debian/tmp/usr/include/vorbis/vorbisenc.h
-debian/tmp/usr/include/vorbis/vorbisfile.h
-debian/tmp/usr/lib/libvorbis.a
-debian/tmp/usr/lib/libvorbis.la
-debian/tmp/usr/lib/libvorbis.so
-debian/tmp/usr/lib/libvorbisenc.a
-debian/tmp/usr/lib/libvorbisenc.la
-debian/tmp/usr/lib/libvorbisenc.so
-debian/tmp/usr/lib/libvorbisfile.a
-debian/tmp/usr/lib/libvorbisfile.la
-debian/tmp/usr/lib/libvorbisfile.so
-debian/tmp/usr/lib/pkgconfig/vorbis.pc
-debian/tmp/usr/lib/pkgconfig/vorbisenc.pc
-debian/tmp/usr/lib/pkgconfig/vorbisfile.pc
-debian/tmp/usr/share/aclocal/vorbis.m4
+debian/tmp/usr/include/*/vorbis/codec.h
+debian/tmp/usr/include/*/vorbis/vorbisenc.h
+debian/tmp/usr/include/*/vorbis/vorbisfile.h
+debian/tmp/usr/lib/*/libvorbis.a
+debian/tmp/usr/lib/*/libvorbis.la
+debian/tmp/usr/lib/*/libvorbis.so
+debian/tmp/usr/lib/*/libvorbisenc.a
+debian/tmp/usr/lib/*/libvorbisenc.la
+debian/tmp/usr/lib/*/libvorbisenc.so
+debian/tmp/usr/lib/*/libvorbisfile.a
+debian/tmp/usr/lib/*/libvorbisfile.la
+debian/tmp/usr/lib/*/libvorbisfile.so
+debian/tmp/usr/lib/*/pkgconfig/vorbis.pc
+debian/tmp/usr/lib/*/pkgconfig/vorbisenc.pc
+debian/tmp/usr/lib/*/pkgconfig/vorbisfile.pc
+debian/tmp/usr/share/aclocal/vorbis.m4  usr/share/aclocal-test


--- orig/debian/libvorbis0a.install
+++ mod/debian/libvorbis0a.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libvorbis.so.*
+debian/tmp/usr/lib/*/libvorbis.so.*


--- orig/debian/libvorbisenc2.install
+++ mod/debian/libvorbisenc2.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libvorbisenc.so.*
+debian/tmp/usr/lib/*/libvorbisenc.so.*


--- orig/debian/libvorbisfile3.install
+++ mod/debian/libvorbisfile3.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libvorbisfile.so.*
+debian/tmp/usr/lib/*/libvorbisfile.so.*


--- orig/debian/rules
+++ mod/debian/rules
@@ -43,7 +43,9 @@
 	# change ../configure to ../autogen.sh for CVS build
 	cd $(objdir) && \
 	../configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-	--prefix=/usr --enable-static
+	--prefix=/usr --enable-static \
+	--libdir=/usr/lib/$(DEB_BUILD_GNU_TYPE) \
+	--includedir=/usr/include/$(DEB_BUILD_GNU_TYPE)
 
 	touch configure-stamp
 
@@ -91,7 +93,7 @@
 	#if test -d CVS; then \
 		$(MAKE) cvs-clean ;\
 	fi
-
+	rm -f debian/libvorbis-dev.docs debian/libvorbis-dev.examples
 	dh_clean
 
 install: install-indep install-arch


--- orig/include/vorbis/Makefile.am
+++ mod/include/vorbis/Makefile.am
@@ -2,8 +2,6 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-includedir = $(prefix)/include/vorbis
-
-include_HEADERS = codec.h vorbisfile.h vorbisenc.h
-
+pkgincludedir = $(includedir)/vorbis
+pkginclude_HEADERS = codec.h vorbisfile.h vorbisenc.h
 


--- /dev/null
+++ mod/debian/libvorbis-dev-common.install
@@ -0,0 +1,2 @@
+
+debian/tmp/usr/share/aclocal/vorbis.m4