Bug#645978: Please build esound for multiarch

[Steve Langasek]

Package: esound
Version: 0.2.41-9
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Hi folks,

In Ubuntu, I've applied the attached patch to build esound for multiarch.
It's a straightforward transition, with no particular surprises; I've
updated the package to use debhelper compat level 9 at the same time, which
doesn't seem to have any negative impact on the build.

I should note that libesd.la is still listed on
http://release.debian.org/~aba/la/current.txt because libao references it. 
So after applying this patch, libao will need a rebuild (or better yet, to
have its .la file dropped).

Thanks for considering the patch.

-- 
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/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
=== modified file 'debian/compat'
--- debian/compat	2009-02-17 23:31:24 +0000
+++ debian/compat	2011-10-20 05:05:41 +0000
@@ -1 +1 @@
-5
+9

=== modified file 'debian/control'
--- debian/control	2011-04-16 18:22:49 +0000
+++ debian/control	2011-10-20 05:24:12 +0000
@@ -13,8 +13,8 @@
                libasound2-dev [linux-any],
                libwrap0-dev,
                pkg-config,
-               debhelper (>> 5),
-               cdbs,
+               debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                gnome-pkg-tools (>= 0.7),
                quilt
 Build-Depends-Indep: docbook-utils,
@@ -22,6 +22,7 @@
 
 Package: esound-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Conflicts: libesd-alsa0
 Description: Enlightened Sound Daemon - Common files
@@ -32,6 +33,8 @@
 
 Package: libesd0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -46,6 +49,7 @@
 
 Package: libesd0-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libesd0 (= ${binary:Version}),

=== modified file 'debian/control.in'
--- debian/control.in	2011-04-16 18:22:49 +0000
+++ debian/control.in	2011-10-20 05:24:12 +0000
@@ -8,8 +8,8 @@
                libasound2-dev [linux-any],
                libwrap0-dev,
                pkg-config,
-               debhelper (>> 5),
-               cdbs,
+               debhelper (>= 8.1.3~),
+               cdbs (>= 0.4.93~),
                gnome-pkg-tools (>= 0.7),
                quilt
 Build-Depends-Indep: docbook-utils,
@@ -17,6 +17,7 @@
 
 Package: esound-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends},
 Conflicts: libesd-alsa0
 Description: Enlightened Sound Daemon - Common files
@@ -27,6 +28,8 @@
 
 Package: libesd0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -41,6 +44,7 @@
 
 Package: libesd0-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends},
          libesd0 (= ${binary:Version}),

=== modified file 'debian/esound-common.install'
--- debian/esound-common.install	2011-04-16 18:22:49 +0000
+++ debian/esound-common.install	2011-10-20 05:07:24 +0000
@@ -1 +1 @@
-debian/tmp/etc
+etc

=== modified file 'debian/libesd0-dev.install'
--- debian/libesd0-dev.install	2009-02-17 23:31:24 +0000
+++ debian/libesd0-dev.install	2011-10-20 05:07:05 +0000
@@ -1,8 +1,8 @@
-debian/tmp/usr/lib/libesd.so
-debian/tmp/usr/lib/libesd.la
-debian/tmp/usr/lib/libesd.a
-debian/tmp/usr/include
-debian/tmp/usr/bin/esd-config
-debian/tmp/usr/share/aclocal
-debian/tmp/usr/share/man/man1/esd-config.1
-debian/tmp/usr/lib/pkgconfig
+usr/lib/*/libesd.so
+usr/lib/*/libesd.la
+usr/lib/*/libesd.a
+usr/include
+usr/bin/esd-config
+usr/share/aclocal
+usr/share/man/man1/esd-config.1
+usr/lib/*/pkgconfig

=== modified file 'debian/libesd0.install'
--- debian/libesd0.install	2009-02-17 23:31:24 +0000
+++ debian/libesd0.install	2011-10-20 05:06:38 +0000
@@ -1 +1 @@
-debian/tmp/usr/lib/libesd.so.*
+usr/lib/*/libesd.so.*

=== modified file 'debian/rules'
--- debian/rules	2009-11-03 20:32:35 +0000
+++ debian/rules	2011-10-20 05:06:20 +0000
@@ -7,7 +7,8 @@
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-ipv6 --with-libwrap
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-ipv6 --with-libwrap \
+	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libesd0 (>= 0.2.35)"
 DEB_DH_MAKESHLIBS_ARGS_esound-clients := --no-act