Package: libvorbis Version: 1.3.2-1 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
Hi folks, Please find attached a patch to libvorbis to transition it to use of the multiarch library paths as described at <http://wiki.debian.org/Multiarch/Implementation>. This patch has been tested and will be uploaded shortly to Ubuntu Oneiric. I would encourage you to apply this patch in Debian as well, since libvorbis is pretty low in the audio stack included in ia32-libs, which we would like to get rid of for wheezy. Note that this moves the .la files included in the -dev package, which means any other .la file on the system with a hard-coded reference to those .la files will be broken by this change. As such, if you apply this patch it's probably best to fix bug #633339 at the same time by simply dropping the .la files from your package. Note also that I have examined the -dev package and confirmed that it contains no architecture-specific headers, so I have marked this package Multi-Arch: same in addition to the runtime library packages. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/compat' --- debian/compat 2010-03-26 19:10:35 +0000 +++ debian/compat 2011-08-12 18:54:16 +0000 @@ -1 +1 @@ -7 +9 === modified file 'debian/control' --- debian/control 2011-02-19 18:41:36 +0000 +++ debian/control 2011-08-12 18:54:16 +0000 @@ -4,12 +4,14 @@ Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> XSBC-Original-Maintainer: Debian Xiph.org Maintainers <pkg-xiph-ma...@lists.alioth.debian.org> Uploaders: Peter Samuelson <pe...@p12n.org>, John Francesco Ferlito <jo...@inodes.org> -Build-Depends: autotools-dev, debhelper (>= 7.0.50~), libogg-dev +Build-Depends: autotools-dev, debhelper (>= 8.1.3), libogg-dev Standards-Version: 3.9.1 Vcs-Bzr: http://bzr.debian.org/bzr/pkg-xiph/libvorbis Package: libvorbis0a Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libvorbis0 Replaces: libvorbis0 @@ -22,6 +24,8 @@ Package: libvorbisenc2 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libvorbis0a (= ${binary:Version}) Conflicts: libvorbis0 (<< 1.0.0) Replaces: libvorbis0 (<< 1.0.0) @@ -35,6 +39,8 @@ Package: libvorbisfile3 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libvorbis0a (= ${binary:Version}) Conflicts: libvorbis0 (<< 1.0.0) Replaces: libvorbis0 (<< 1.0.0) @@ -48,6 +54,7 @@ Package: libvorbis-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: ${misc:Depends}, libogg-dev, libvorbis0a (= ${binary:Version}), libvorbisenc2 (= ${binary:Version}), libvorbisfile3 (= ${binary:Version}) Description: The Vorbis General Audio Compression Codec (development files) @@ -60,6 +67,7 @@ Package: libvorbis-dbg Architecture: any +Multi-Arch: same Section: debug Priority: extra Depends: ${misc:Depends}, libvorbis0a (= ${binary:Version}), libvorbisenc2 (= ${binary:Version}), libvorbisfile3 (= ${binary:Version}) === modified file 'debian/libvorbis-dev.install' --- debian/libvorbis-dev.install 2010-03-26 19:10:35 +0000 +++ debian/libvorbis-dev.install 2011-08-12 18:54:16 +0000 @@ -1,7 +1,7 @@ debian/tmp/usr/include/vorbis/* -debian/tmp/usr/lib/*.a -debian/tmp/usr/lib/*.la -debian/tmp/usr/lib/*.so -debian/tmp/usr/lib/pkgconfig/*.pc +debian/tmp/usr/lib/*/*.a +debian/tmp/usr/lib/*/*.la +debian/tmp/usr/lib/*/*.so +debian/tmp/usr/lib/*/pkgconfig/*.pc debian/tmp/usr/share/aclocal/*.m4 debian/tmp/usr/share/doc/libvorbis-*/* usr/share/doc/libvorbis-dev/html === modified file 'debian/libvorbis0a.install' --- debian/libvorbis0a.install 2003-12-09 01:00:00 +0000 +++ debian/libvorbis0a.install 2011-08-12 18:54:16 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/libvorbis.so.* +debian/tmp/usr/lib/*/libvorbis.so.* === modified file 'debian/libvorbisenc2.install' --- debian/libvorbisenc2.install 2003-12-09 01:00:00 +0000 +++ debian/libvorbisenc2.install 2011-08-12 18:54:16 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/libvorbisenc.so.* +debian/tmp/usr/lib/*/libvorbisenc.so.* === modified file 'debian/libvorbisfile3.install' --- debian/libvorbisfile3.install 2003-12-09 01:00:00 +0000 +++ debian/libvorbisfile3.install 2011-08-12 18:54:16 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/libvorbisfile.so.* +debian/tmp/usr/lib/*/libvorbisfile.so.*