Package: libao4
Version: 1.0.0-5
Severity: normal
Tags: patch
Hi,
Please find attached my diff to add multi-arch support to libao. I
have also removed the .la files that were shipped by the package, which
closes bug #633179.
-- System Information:
Debian Release: squeeze/sid
APT prefers natty-updates
APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.38-10-generic (SMP w/2 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages libao4 depends on:
ii libao-common 1.0.0-5 Cross Platform Audio Output Librar
ii libc6 2.13-0ubuntu13 Embedded GNU C Library: Shared lib
libao4 recommends no packages.
Versions of packages libao4 suggests:
ii 1.0.24.1-0ubuntu5 shared library for ALSA applicatio
ii 1.9.2-4ubuntu1 Network Audio System - shared libr
ii 0.2.41-8 Enlightened Sound Daemon - Shared
ii 1:0.9.22+stable-queue-24-g67d18-0ubu PulseAudio client libraries
-- no debconf information
diff -u libao-1.1.0/debian/compat libao-1.1.0/debian/compat
--- libao-1.1.0/debian/compat
+++ libao-1.1.0/debian/compat
@@ -1 +1 @@
-7
+9
diff -u libao-1.1.0/debian/libao4.install libao-1.1.0/debian/libao4.install
--- libao-1.1.0/debian/libao4.install
+++ libao-1.1.0/debian/libao4.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/ao/plugins-4/*.so
-debian/tmp/usr/lib/libao.so.*
+debian/tmp/usr/lib/*/ao/plugins-4/*.so
+debian/tmp/usr/lib/*/libao.so.*
diff -u libao-1.1.0/debian/libao-dev.install libao-1.1.0/debian/libao-dev.install
--- libao-1.1.0/debian/libao-dev.install
+++ libao-1.1.0/debian/libao-dev.install
@@ -1,9 +1,7 @@
debian/tmp/usr/include/ao/*
-debian/tmp/usr/lib/ao/plugins-4/*.a
-debian/tmp/usr/lib/ao/plugins-4/*.la
-debian/tmp/usr/lib/libao.a
-debian/tmp/usr/lib/libao.la
-debian/tmp/usr/lib/libao.so
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/ao/plugins-4/*.a
+debian/tmp/usr/lib/*/libao.a
+debian/tmp/usr/lib/*/libao.so
+debian/tmp/usr/lib/*/pkgconfig/*
debian/tmp/usr/share/aclocal/*
debian/tmp/usr/share/doc/libao-*/* usr/share/doc/libao-dev/html
diff -u libao-1.1.0/debian/control libao-1.1.0/debian/control
--- libao-1.1.0/debian/control
+++ libao-1.1.0/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Xiph.org Maintainers <pkg-xiph-ma...@lists.alioth.debian.org>
Uploaders: John Francesco Ferlito <jo...@inodes.org>
-Build-Depends: autotools-dev, debhelper (>= 7.0.50~),
+Build-Depends: autotools-dev, debhelper (>= 8.1.3~),
libasound2-dev [!kfreebsd-i386 !hurd-i386 !kfreebsd-amd64],
libaudio-dev, libesd0-dev, libpulse-dev, libxt-dev, libxau-dev,
libroar-dev, libsndio-dev
@@ -13,10 +13,12 @@
Package: libao4
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, libao-common
Suggests: libasound2, libaudio2, libesd0 | libesd-alsa0, libpulse0, libroar1, libsndio0,
roaraudio-server, roaraudio-server
Replaces: libao-pulse
+Multi-Arch: same
Description: Cross Platform Audio Output Library
Libao is a cross-platform audio library that allows programs to output audio
using a simple API on a wide variety of platforms. It currently supports:
@@ -34,6 +36,7 @@
Architecture: any
Section: libdevel
Depends: ${misc:Depends}, libao4 (= ${binary:Version}), libc6-dev
+Multi-Arch: same
Description: Cross Platform Audio Output Library Development
Libao is a cross-platform audio library that allows programs to output audio
using a simple API on a wide variety of platforms. It currently supports:
@@ -55,6 +58,7 @@
Section: debug
Priority: extra
Depends: ${misc:Depends}, libao4 (= ${binary:Version})
+Multi-Arch: same
Description: Cross Platform Audio Output Library Debug Symbols
Libao is a cross-platform audio library that allows programs to output audio
using a simple API on a wide variety of platforms. It currently supports:
@@ -72,11 +76,12 @@
libao package.
Package: libao-common
-Architecture: any
+Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libao2
Replaces: libao4 (<< 1.0.0-2)
Breaks: libao4 (<< 1.0.0-2)
+Multi-Arch: foreign
Description: Cross Platform Audio Output Library (Common files)
Libao is a cross-platform audio library that allows programs to output audio
using a simple API on a wide variety of platforms. It currently supports:
