Package: pulseaudio Version: 0.9.23-2 Severity: normal Tags: patch User: [email protected] Usertags: origin-ubuntu oneiric ubuntu-patch
Hi folks, Please find attached a patch to pulseaudio 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 included in Ubuntu Oneiric. I would encourage you to apply it in Debian as well, since pulseaudio is part of the audio stack included in ia32-libs, which we would like to get rid of for wheezy. Note that I have examined the -dev packages and confirmed that they contain no architecture-specific headers, so I have marked these packages Multi-Arch: same in addition to the runtime library packages. By way of explanation, here is the changelog for the upload to Ubuntu: * Build for multiarch: - libpulse{,-mainloop-glib}0{,-dbg} and libpulse-dev are Multi-Arch: same. - pulseaudio itself should be Multi-Arch: foreign, since it's a daemon. 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/ [email protected] [email protected]
diff -Nru pulseaudio-0.9.23/debian/control pulseaudio-0.9.23/debian/control --- pulseaudio-0.9.23/debian/control 2011-07-25 15:11:13.000000000 -0700 +++ pulseaudio-0.9.23/debian/control 2011-08-12 20:26:01.000000000 -0700 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Pulseaudio maintenance team <[email protected]> Uploaders: CJ van den Berg <[email protected]>, Sjoerd Simons <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, quilt, m4, dh-autoreconf, +Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93), quilt, m4, dh-autoreconf, libltdl-dev (>= 2.2.6a-2), libsamplerate0-dev, libsndfile1-dev (>= 1.0.20), libglib2.0-dev, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], @@ -25,6 +25,7 @@ Package: pulseaudio Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, lsb-base (>= 3.2-13), consolekit, udev (>= 143) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] @@ -340,6 +341,8 @@ Package: libpulse0 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: pavucontrol (<< 0.9.8) Suggests: pulseaudio @@ -354,6 +357,7 @@ Package: libpulse0-dbg Section: debug Architecture: any +Multi-Arch: same Priority: extra Depends: ${misc:Depends}, libpulse0 (= ${binary:Version}) Description: PulseAudio client libraries detached debugging symbols @@ -366,6 +370,8 @@ Package: libpulse-mainloop-glib0 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: PulseAudio client libraries (glib support) PulseAudio, previously known as Polypaudio, is a sound server for POSIX and @@ -380,6 +386,7 @@ Package: libpulse-mainloop-glib0-dbg Section: debug Architecture: any +Multi-Arch: same Priority: extra Depends: ${misc:Depends}, libpulse-mainloop-glib0 (= ${binary:Version}) Description: PulseAudio client libraries (glib support) debugging symbols @@ -420,6 +427,7 @@ Package: libpulse-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: ${misc:Depends}, libpulse0 (= ${binary:Version}), libpulse-mainloop-glib0 (= ${binary:Version}), diff -Nru pulseaudio-0.9.23/debian/libpulse0.install pulseaudio-0.9.23/debian/libpulse0.install --- pulseaudio-0.9.23/debian/libpulse0.install 2011-07-25 15:11:13.000000000 -0700 +++ pulseaudio-0.9.23/debian/libpulse0.install 2011-08-12 20:25:40.000000000 -0700 @@ -1,4 +1,4 @@ etc/pulse/client.conf -usr/lib/libpulse.so.* -usr/lib/libpulse-simple.so.* -usr/lib/libpulsecommon-*.so +usr/lib/*/libpulse.so.* +usr/lib/*/libpulse-simple.so.* +usr/lib/*/libpulsecommon-*.so diff -Nru pulseaudio-0.9.23/debian/libpulse-dev.install pulseaudio-0.9.23/debian/libpulse-dev.install --- pulseaudio-0.9.23/debian/libpulse-dev.install 2011-07-25 15:11:13.000000000 -0700 +++ pulseaudio-0.9.23/debian/libpulse-dev.install 2011-08-12 20:26:46.000000000 -0700 @@ -1,6 +1,6 @@ -usr/lib/libpulse.so -usr/lib/libpulse-simple.so -usr/lib/libpulse-browse.so -usr/lib/libpulse-mainloop-glib.so -usr/lib/pkgconfig/* +usr/lib/*/libpulse.so +usr/lib/*/libpulse-simple.so +usr/lib/*/libpulse-browse.so +usr/lib/*/libpulse-mainloop-glib.so +usr/lib/*/pkgconfig/* usr/include/pulse/* diff -Nru pulseaudio-0.9.23/debian/libpulse-mainloop-glib0.install pulseaudio-0.9.23/debian/libpulse-mainloop-glib0.install --- pulseaudio-0.9.23/debian/libpulse-mainloop-glib0.install 2011-07-25 15:11:13.000000000 -0700 +++ pulseaudio-0.9.23/debian/libpulse-mainloop-glib0.install 2011-08-12 20:25:40.000000000 -0700 @@ -1 +1 @@ -usr/lib/libpulse-mainloop-glib.so.* +usr/lib/*/libpulse-mainloop-glib.so.* diff -Nru pulseaudio-0.9.23/debian/pulseaudio-dev.install pulseaudio-0.9.23/debian/pulseaudio-dev.install --- pulseaudio-0.9.23/debian/pulseaudio-dev.install 2011-07-25 15:11:13.000000000 -0700 +++ pulseaudio-0.9.23/debian/pulseaudio-dev.install 2011-08-12 20:25:40.000000000 -0700 @@ -1,2 +1,2 @@ -usr/lib/libpulsecore.so +usr/lib/*/libpulsecore.so usr/lib usr/include/pulsecore/* diff -Nru pulseaudio-0.9.23/debian/pulseaudio.install pulseaudio-0.9.23/debian/pulseaudio.install --- pulseaudio-0.9.23/debian/pulseaudio.install 2011-07-25 15:11:13.000000000 -0700 +++ pulseaudio-0.9.23/debian/pulseaudio.install 2011-08-12 20:27:54.000000000 -0700 @@ -66,5 +66,5 @@ usr/share/man/man5/default.pa.5 usr/share/locale usr/share/pulseaudio -usr/lib/libpulsecore-*.so +usr/lib/*/libpulsecore-*.so usr/lib usr/share/lintian/overrides/pulseaudio diff -Nru pulseaudio-0.9.23/debian/pulseaudio-utils.install pulseaudio-0.9.23/debian/pulseaudio-utils.install --- pulseaudio-0.9.23/debian/pulseaudio-utils.install 2011-07-25 15:11:13.000000000 -0700 +++ pulseaudio-0.9.23/debian/pulseaudio-utils.install 2011-08-12 20:25:40.000000000 -0700 @@ -9,5 +9,5 @@ usr/bin/padsp usr/bin/pax11publish usr/bin/pasuspender -usr/lib/libpulsedsp.so +usr/lib/*/libpulsedsp.so usr/lib usr/share/lintian/overrides/pulseaudio-utils diff -Nru pulseaudio-0.9.23/debian/rules pulseaudio-0.9.23/debian/rules --- pulseaudio-0.9.23/debian/rules 2011-07-25 15:11:13.000000000 -0700 +++ pulseaudio-0.9.23/debian/rules 2011-08-12 20:27:16.000000000 -0700 @@ -45,7 +45,9 @@ mv $${patch}.chomped $$patch ; \ done -DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 +DEB_CONFIGURE_EXTRA_FLAGS = --enable-x11 \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ + --with-module-dir=\$${prefix}/lib/pulse-0.9.23/modules ifneq (,$(findstring $(DEB_HOST_ARCH_OS), "linux")) DEB_CONFIGURE_EXTRA_FLAGS += --enable-hal-compat --disable-hal
