--- orig/debian/changelog
+++ mod/debian/changelog
@@ -1,3 +1,27 @@
+libogg (1.1.0-1multiarch4) multiarch; urgency=low
+
+  * Remove libogg0-dev.docs as well
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Thu, 10 Feb 2005 13:19:12 +0100
+
+libogg (1.1.0-1multiarch3) multiarch; urgency=low
+
+  * Make sure to install symlinks to -common in their respective packages.
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Thu, 10 Feb 2005 13:19:12 +0100
+
+libogg (1.1.0-1multiarch2) multiarch; urgency=low
+
+  * Remove libogg0.README.Debian in clean, since it's in the orig.tar.gz
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Thu, 10 Feb 2005 13:19:12 +0100
+
+libogg (1.1.0-1multiarch1) multiarch; urgency=low
+
+  * Multiarch build
+
+ -- Tollef Fog Heen <tfheen@debian.org>  Thu, 10 Feb 2005 13:19:12 +0100
+
 libogg (1.1.0-1) unstable; urgency=low
 
   * New upstream.
@@ -57,6 +81,4 @@
 
  -- Christopher L Cheney <ccheney@debian.org>  Sun, 29 Oct 2000 01:11:57 -0500
 
-Local variables:
-mode: debian-changelog
-End:
+

--- orig/debian/control
+++ mod/debian/control
@@ -8,7 +8,7 @@
 Package: libogg0
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libogg0-common (= ${Source-Version})
 Description: Ogg Bitstream Library
  Libogg is a library for manipulating ogg bitstreams.  It handles
  both making ogg bitstreams and getting packets from ogg bitstreams.
@@ -20,3 +20,22 @@
 Description: Ogg Bitstream Library Development
  The libogg-dev package contains the header files and documentation
  needed to develop applications with libogg.
+
+Package: libogg0-common
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: Ogg Bitstream Library - common files
+ Libogg is a library for manipulating ogg bitstreams.  It handles
+ both making ogg bitstreams and getting packets from ogg bitstreams.
+ .
+ This package contains the arch-independent parts of libogg0
+
+Package: libogg-dev-common
+Architecture: any
+Section: libdevel
+Description: Ogg Bitstream Library Development
+ The libogg-dev package contains the header files and documentation
+ needed to develop applications with libogg.
+ .
+ This package contains the arch-independent parts of libogg-dev

--- orig/debian/libogg-dev.install
+++ mod/debian/libogg-dev.install
@@ -1,8 +1,7 @@
-debian/tmp/usr/include/ogg/config_types.h
-debian/tmp/usr/include/ogg/ogg.h
-debian/tmp/usr/include/ogg/os_types.h
-debian/tmp/usr/lib/libogg.a
-debian/tmp/usr/lib/libogg.la
-debian/tmp/usr/lib/libogg.so
-debian/tmp/usr/lib/pkgconfig/ogg.pc
-debian/tmp/usr/share/aclocal/ogg.m4
+debian/tmp/usr/include/*/ogg/config_types.h
+debian/tmp/usr/include/*/ogg/ogg.h
+debian/tmp/usr/include/*/ogg/os_types.h
+debian/tmp/usr/lib/*/libogg.a
+debian/tmp/usr/lib/*/libogg.la
+debian/tmp/usr/lib/*/libogg.so
+debian/tmp/usr/lib/*/pkgconfig/ogg.pc

--- orig/debian/libogg0.install
+++ mod/debian/libogg0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libogg.so.*
+debian/tmp/usr/lib/*/libogg.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
 
@@ -78,7 +80,8 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-arch-stamp build-indep-stamp configure-stamp
+	rm -f build-arch-stamp build-indep-stamp configure-stamp \
+	    debian/libogg0.README.Debian debian/libogg-dev.docs
 
 	# Remove build tree
 	rm -rf $(objdir)
@@ -113,6 +116,8 @@
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
 	dh_install -s --list-missing
+	dh_link -plibogg0 usr/share/doc/libogg0-common usr/share/doc/libogg0 
+	dh_link -plibogg-dev usr/share/doc/libogg-dev-common usr/share/doc/libogg-dev 
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep


--- /dev/null
+++ mod/debian/libogg-dev-common.install
@@ -0,0 +1 @@
+debian/tmp/usr/share/aclocal/ogg.m4
