Bug#638741: updated patch

[Kees Cook]

Hi,

This is an updated Multi-arch path with additional changes to the rules
file.

Thanks,

-Kees

-- 
Kees Cook                                            @debian.org
-------------- next part --------------
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/changelog libao-1.1.0/debian/changelog
--- libao-1.1.0/debian/changelog
+++ libao-1.1.0/debian/changelog
@@ -1,3 +1,11 @@
+libao (1.1.0-2) UNRELEASED; urgency=low
+
+  * debian/{compat,control,rules,*.install}: Convert to Multi-arch.
+  * debian/control: Switch libao-common to Arch: all.
+  * debian/libao-dev.install: Drop .la files (no build deps using them).
+
+ -- Kees Cook <kees at debian.org>  Thu, 08 Dec 2011 11:13:21 -0800
+
 libao (1.1.0-1) unstable; urgency=low
 
   * New upstream release.
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/rules libao-1.1.0/debian/rules
--- libao-1.1.0/debian/rules
+++ libao-1.1.0/debian/rules
@@ -7,7 +7,7 @@
 	dh_strip --dbg-package=libao-dbg
 
 override_dh_shlibdeps:
-	dh_shlibdeps --exclude=/usr/lib/ao/plugins-4
+	dh_shlibdeps --exclude=/usr/lib/$(DEB_HOST_MULTIARCH)/ao/plugins-4
 
 # Put config.sub rules in until http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559098 is fixed
 override_dh_auto_configure:
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-maint at lists.alioth.debian.org>
 Uploaders: John Francesco Ferlito <johnf at 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,6 +13,8 @@
 
 Package: libao4
 Architecture: any
+Multi-Arch: same
+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
@@ -32,6 +34,7 @@
 
 Package: libao-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, libao4 (= ${binary:Version}), libc6-dev
 Description: Cross Platform Audio Output Library Development
@@ -52,6 +55,7 @@
 
 Package: libao-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: ${misc:Depends}, libao4 (= ${binary:Version})
@@ -72,7 +76,8 @@
  libao package.
 
 Package: libao-common
-Architecture: any
+Architecture: all
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libao2
 Replaces: libao4 (<< 1.0.0-2)