Merge lp:~vorlon/alsa-lib/multiarch-merge into lp:~ubuntu-audio-dev/alsa-lib/ubuntu.oneiric

[Steve Langasek]

Hey folks,

I've been working with Jordi Mallach to prepare libasound2 for multiarch in Debian. The changes have not yet been uploaded to Debian because they're waiting for Debian release team approval of the ABI bump, but those changes are all staged in svn so I've merged them up into the Ubuntu package's bzr. Please consider merging this into oneiric soonest.

(Side note: could you please fix the group membership of ubuntu-audio-dev so that people who have upload rights on this package also have commit rights to the relevant branch?)

Thanks!

[lp:~vorlon/alsa-lib/multiarch-merge]

95. By Steve Langasek on 2011-07-21

fix the libasound2-plugins breaks: version number (fix forwarded to Jordi

[Luke Yelavich (themuso)]

Hi Steve. I got persia to fix up team memberships. Ubuntu-core-dev is now a member of ubuntu-audio-dev, so you should be able to commit to branches and upload when ready. Since this is now done, I'll leave it to you to get lib/plugins sorted and push at your leasure.

Marking disapprove as per the above membership changes.

review: Disapprove

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-06 00:22:22 +0000
+++ debian/changelog	2011-07-21 02:16:33 +0000
@@ -1,3 +1,37 @@
+alsa-lib (1.0.24.1-0ubuntu7) UNRELEASED; urgency=low
+
+  * Merge changes from Debian svn:
+    - Bump to debhelper compat v8.
+    - Remove debian/tmp prefixes from .install file.
+    - Add multiarch support:
+      + Build-Depend on debhelper 8.1.3.
+      + Add Pre-Depends: ${misc:Pre-Depends} to libasound2.
+      + Declare DEB_HOST_MULTIARCH and use it to define $libdir.
+      + Add an explicit --with-plugindir argument to base plugindir on the
+        multiarch dir.
+      + Update libasound2-dev.install.
+      + Mark libasound2 Multi-Arch: same.
+    - Break current versions of packages providing ALSA plugins.
+    - Remove libasound2's .la file, as any reference will be now broken.
+    - Remove unneeded Suggests and Conflicts from -udeb.
+    - Set Section to debian-installer.
+    - Replace versioned conflicts with Breaks, and remove some obsolete ones.
+    - Bump Standards-Version to 3.9.2 (no further changes).
+    - Update upstream URL in copyright file.
+    - Use versioned pointer to LGPL 2.1 licence.
+  * Drop the hard-coded versioned dependency on libc6-i386.  If we don't need
+    this as a pre-depends for cycle breaking, we don't need to declare it at
+    all since shlibdeps will do the right thing.
+  * debian/patches/multiarch-safe-dlopen-search-path.patch: compile in
+    the ALSA search path instead of relying on ld.so.conf.
+  * With the plugin path corrected, drop the existing ld.so.conf snippets,
+    removing them on upgrade.
+  * Spell out the plugin dir path: the build system fails to expand
+    substitutions, and '${libdir}' is obviously not present on the
+    filesystem.
+
+ -- Steve Langasek <[e-mail]>  Wed, 20 Jul 2011 05:05:24 +0000
+
 alsa-lib (1.0.24.1-0ubuntu6) oneiric; urgency=low
 
   * debian/control: Update Vcs-Bzr field

=== modified file 'debian/compat'
--- debian/compat	2009-08-07 08:58:47 +0000
+++ debian/compat	2011-07-21 02:16:33 +0000
@@ -1,1 +1,1 @@
-7
+8

=== modified file 'debian/control'
--- debian/control	2011-05-05 23:56:54 +0000
+++ debian/control	2011-07-21 02:16:33 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Core Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian ALSA Maintainers <[e-mail]>
 Uploaders: Jordi Mallach <[e-mail]>, Mikael Magnusson <[e-mail]>, Elimar Riesebieter <[e-mail]>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 8.1.3),
                autotools-dev,
                doxygen,
                libc6-dev-powerpc [ppc64],
@@ -17,7 +17,7 @@
                lib64gcc1 [i386 powerpc sparc s390],
                gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc],
                python-dev
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.alsa-project.org/
 XS-Debian-Vcs-Svn: svn://svn.debian.org/pkg-alsa/trunk/alsa-lib
 XS-Debian-Vcs-Browser: http://svn.debian.org/wsvn/pkg-alsa/trunk/alsa-lib/
@@ -25,9 +25,11 @@
 
 Package: libasound2
 Architecture: linux-any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}, dpkg (>= 1.15.7.2)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libasound2-plugins (>= 1.0.18)
-Conflicts: libasound2-plugins (<< 1.0.18)
+Breaks: libasound2-plugins (<< 1.0.24-1), libasound2-plugin-equal (<= 0.6-1), bluez-alsa (<= 4.94-2)
 Description: shared library for ALSA applications
  This package contains the ALSA library and its standard plugins.
  .
@@ -39,8 +41,6 @@
 Provides: libasound-dev
 Depends: libc6-dev | libc-dev, libasound2 (= ${binary:Version}), ${misc:Depends}
 Suggests: libasound2-doc
-Conflicts: libasound-dev, alsa-headers
-Replaces: libasound2 (<< 0.9.0rc7-2), alsa-headers
 Description: shared library for ALSA applications -- development files
  This package contains files required for developing software
  that makes use of libasound2, the ALSA library.
@@ -49,9 +49,10 @@
 
 Package: lib64asound2
 Architecture: sparc s390 i386 powerpc
+Pre-Depends: dpkg (>= 1.15.7.2)
 Depends: libasound2 (= ${binary:Version}), ${shlibs:Depends}, ${bilib:depends}, ${misc:Depends}
 Suggests: lib64asound2-plugins (>= 1.0.18)
-Conflicts: libasound2-plugins (<< 1.0.18)
+Breaks: libasound2-plugins (<< 1.0.18)
 Description: shared library for ALSA applications (64 bit)
  This package contains the ALSA library (64 bit) and its standard
  plugins.
@@ -71,9 +72,10 @@
 
 Package: lib32asound2
 Architecture: amd64
-Depends: libasound2 (= ${binary:Version}), ${shlibs:Depends}, ${bilib:depends}, ${misc:Depends}, libc6-i386 (>= 2.9-18)
+Pre-Depends: dpkg (>= 1.15.7.2)
+Depends: libasound2 (= ${binary:Version}), ${shlibs:Depends}, ${bilib:depends}, ${misc:Depends}
 Suggests: lib32asound2-plugins (>= 1.0.18)
-Conflicts: libasound2-plugins (<< 1.0.18), ia32-libs (<< 1.9), libc6-i386 (<= 2.9-18)
+Breaks: libasound2-plugins (<< 1.0.18), ia32-libs (<< 1.9), libc6-i386 (<= 2.9-18)
 Replaces: ia32-libs (<< 1.9)
 Description: shared library for ALSA applications (32 bit)
  This package contains the ALSA library (32 bit) and its standard
@@ -86,7 +88,7 @@
 Section: libdevel
 Depends: lib32asound2 (= ${binary:Version}), libasound2-dev (= ${binary:Version}), ${bidev:depends}, ${misc:Depends}
 Suggests: libasound2-doc
-Conflicts: libc6-i386 (<= 2.9-18)
+Breaks: libc6-i386 (<= 2.9-18)
 Description: shared library for ALSA applications -- development files (32 bit)
  This package contains files required for developing software
  that makes use of lib32asound2, the ALSA library (32 bit).
@@ -94,13 +96,12 @@
  ALSA is the Advanced Linux Sound Architecture.
 
 Package: libasound2-udeb
+Section: debian-installer
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libasound2-plugins (>= 1.0.18)
-Conflicts: libasound2-plugins (<< 1.0.18)
 Package-Type: udeb
 Description: shared library for ALSA applications
- This package contains the ALSA library and its standard plugins.
+ This package contains the ALSA library for use in the Debian Installer.
  .
  ALSA is the Advanced Linux Sound Architecture.
 

=== modified file 'debian/copyright'
--- debian/copyright	2009-08-07 08:58:47 +0000
+++ debian/copyright	2011-07-21 02:16:33 +0000
@@ -10,7 +10,7 @@
 
 The source code was downloaded from the ALSA homepage:
 
-  http://alsa.sourceforge.net
+  http://www.alsa-project.org/
 
 alsa-lib
 --------
@@ -32,4 +32,4 @@
   MA 02110-1301, USA.
 
 On Debian systems, the complete text of the GNU Lesser General Public License
-can be found in /usr/share/common-licenses/LGPL.
+can be found in /usr/share/common-licenses/LGPL-2.1.

=== added file 'debian/lib32asound2.postinst'
--- debian/lib32asound2.postinst	1970-01-01 00:00:00 +0000
+++ debian/lib32asound2.postinst	2011-07-21 02:16:33 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib32asound2.conf 1.0.24.1-0ubuntu6 -- "$@"
+
+#DEBHELPER#

=== added file 'debian/lib32asound2.postrm'
--- debian/lib32asound2.postrm	1970-01-01 00:00:00 +0000
+++ debian/lib32asound2.postrm	2011-07-21 02:16:33 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib32asound2.conf 1.0.24.1-0ubuntu6 -- "$@"
+
+#DEBHELPER#

=== added file 'debian/lib32asound2.preinst'
--- debian/lib32asound2.preinst	1970-01-01 00:00:00 +0000
+++ debian/lib32asound2.preinst	2011-07-21 02:16:33 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib32asound2.conf 1.0.24.1-0ubuntu6 -- "$@"
+
+#DEBHELPER#

=== added file 'debian/lib64asound2.postinst'
--- debian/lib64asound2.postinst	1970-01-01 00:00:00 +0000
+++ debian/lib64asound2.postinst	2011-07-21 02:16:33 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib64asound2.conf 1.0.24.1-0ubuntu6 -- "$@"
+
+#DEBHELPER#

=== added file 'debian/lib64asound2.postrm'
--- debian/lib64asound2.postrm	1970-01-01 00:00:00 +0000
+++ debian/lib64asound2.postrm	2011-07-21 02:16:33 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib64asound2.conf 1.0.24.1-0ubuntu6 -- "$@"
+
+#DEBHELPER#

=== added file 'debian/lib64asound2.preinst'
--- debian/lib64asound2.preinst	1970-01-01 00:00:00 +0000
+++ debian/lib64asound2.preinst	2011-07-21 02:16:33 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/lib64asound2.conf 1.0.24.1-0ubuntu6 -- "$@"
+
+#DEBHELPER#

=== modified file 'debian/libasound2-dev.install'
--- debian/libasound2-dev.install	2009-08-07 08:58:47 +0000
+++ debian/libasound2-dev.install	2011-07-21 02:16:33 +0000
@@ -1,6 +1,5 @@
-debian/tmp/usr/share/aclocal
-debian/tmp/usr/include
-debian/tmp/usr/lib/libasound.a
-debian/tmp/usr/lib/libasound.so
-debian/tmp/usr/lib/libasound.la
-debian/tmp/usr/lib/pkgconfig
+usr/share/aclocal
+usr/include
+usr/lib/*/libasound.a
+usr/lib/*/libasound.so
+usr/lib/*/pkgconfig

=== modified file 'debian/libasound2.postinst'
--- debian/libasound2.postinst	2009-08-07 08:58:47 +0000
+++ debian/libasound2.postinst	2011-07-21 02:16:33 +0000
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
 
+dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/libasound2.conf 1.0.24.1-0ubuntu6 -- "$@"
+
 case "$1" in
 configure)
 	# Remove very old cruft
@@ -11,4 +13,3 @@
 esac
 
 #DEBHELPER#
-

=== modified file 'debian/libasound2.postrm'
--- debian/libasound2.postrm	2009-08-07 08:58:47 +0000
+++ debian/libasound2.postrm	2011-07-21 02:16:33 +0000
@@ -1,6 +1,8 @@
 #!/bin/sh
 set -e
 
+dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/libasound2.conf 1.0.24.1-0ubuntu6 -- "$@"
+
 case "$1" in
 purge)
 	# Remove very old cruft
@@ -11,4 +13,3 @@
 esac
 
 #DEBHELPER#
-

=== added file 'debian/libasound2.preinst'
--- debian/libasound2.preinst	1970-01-01 00:00:00 +0000
+++ debian/libasound2.preinst	2011-07-21 02:16:33 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile /etc/ld.so.conf.d/libasound2.conf 1.0.24.1-0ubuntu6 -- "$@"
+
+#DEBHELPER#

=== added file 'debian/patches/multiarch-safe-dlopen-search-path.patch'
--- debian/patches/multiarch-safe-dlopen-search-path.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/multiarch-safe-dlopen-search-path.patch	2011-07-21 02:16:33 +0000
@@ -0,0 +1,41 @@
+Description: compile in the ALSA search path instead of relying on ld.so.conf
+ The Ubuntu package currently uses ld.so.conf.d fragments to add
+ /usr/lib/alsa-lib and /usr/lib{32,64}/alsa-lib to the dlopen search path.
+ These don't *belong* on the global search path, and it becomes much more
+ problematic to put them there with the advent of multiarch because each
+ architecture then needs its own distinct config file to add the separate
+ path... which is then also put in the global library namespace.  Instead,
+ let ALSA make use of the already defined ALSA_PLUGIN_DIR to look up plugins.
+Author: Steve Langasek <[e-mail]>
+
+Index: alsa-lib-1.0.24.1/src/dlmisc.c
+===================================================================
+--- alsa-lib-1.0.24.1.orig/src/dlmisc.c
++++ alsa-lib-1.0.24.1/src/dlmisc.c
+@@ -67,7 +67,25 @@
+ #endif
+ #endif
+ #ifdef HAVE_LIBDL
+-	return dlopen(name, mode);
++	/*
++	 * Handle the plugin dir not being on the default dlopen search
++	 * path, without resorting to polluting the entire system namespace
++	 * via ld.so.conf.
++	 */
++	void *handle = NULL;
++	char *filename;
++
++	if (name && name[0] != '/') {
++		filename = malloc(sizeof(ALSA_PLUGIN_DIR) + 1 + strlen(name) + 1);
++		strcpy(filename, ALSA_PLUGIN_DIR);
++		strcat(filename, "/");
++		strcat(filename, name);
++		handle = dlopen(filename, mode);
++		free(filename);
++	}
++	if (!handle)
++		handle = dlopen(name, mode);
++	return handle;
+ #else
+ 	return NULL;
+ #endif

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-28 09:12:43 +0000
+++ debian/patches/series	2011-07-21 02:16:33 +0000
@@ -7,3 +7,4 @@
 lp652035-use-extended-namehints.patch
 alsa-lib-ucm-allow-values-to-be-read-from-devices.patch
 lp178442-ICE1712.patch
+multiarch-safe-dlopen-search-path.patch

=== modified file 'debian/rules'
--- debian/rules	2011-05-06 00:21:55 +0000
+++ debian/rules	2011-07-21 02:16:33 +0000
@@ -6,11 +6,12 @@
 PACKAGE:= alsa-lib
 #include /usr/share/quilt/quilt.make
 
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) 
 
 biarch_map := i386=amd64 powerpc=ppc64 sparc=sparc64 s390=s390x \
 		amd64=i386 # ppc64=powerpc
@@ -54,12 +55,13 @@
 	ln -s /usr/share/misc/config.sub config.sub
 	ln -s /usr/share/misc/config.guess config.guess
 	./configure --prefix=/usr \
+		    --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		    --mandir=\$${prefix}/share/man \
 		    --infodir=\$${prefix}/share/info \
 		    --datadir=\$${prefix}/share \
+		    --with-plugindir=/usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib \
 		    --build $(DEB_BUILD_GNU_TYPE) \
-		    --enable-static --disable-maintainer-mode \
-		    --with-plugindir=/usr/lib/alsa-lib
+		    --enable-static --disable-maintainer-mode
 	touch configure-stamp
 
 configure-biarch-stamp:
@@ -128,32 +130,29 @@
 	    debian/lib$(bi)asound2/$(bilibdir)/alsa-lib/smixer/
 	mkdir -p debian/lib$(bi)asound2-dev/$(bilibdir)/alsa-lib/smixer
 #	mkdir -p debian/lib$(bi)asound2-dev/$(bilibdir)/pkgconfig
-	cp -a \
-	  debian/bitmp/usr/lib/libasound.so \
-	  debian/bitmp/usr/lib/libasound.a \
-	    debian/lib$(bi)asound2-dev/$(bilibdir)/
+	cp -a debian/bitmp/usr/lib/libasound.so \
+	    debian/bitmp/usr/lib/libasound.a \
+	    debian/lib$(bi)asound2-dev/$(bilibdir)
 	sed -e "/^libdir=/s,=.*,='/$(bilibdir)',;s,^dependency_libs=.*,dependency_libs=''," \
 	  debian/bitmp/usr/lib/libasound.la \
 	    > debian/lib$(bi)asound2-dev/$(bilibdir)/libasound.la
-	mkdir -p debian/lib$(bi)asound2/etc/ld.so.conf.d
-	echo "/$(bilibdir)/alsa-lib" > debian/lib$(bi)asound2/etc/ld.so.conf.d/lib$(bi)asound2.conf
 #	sed -e "/^libdir=.*lib$$/s,=.*,=/$(bilibdir)," \
 #	  debian/bitmp/usr/lib/pkgconfig/alsa.pc \
 #	    > debian/lib$(bi)asound2-dev/$(bilibdir)/pkgconfig/alsa.pc
-else
-	sed -ie "s,^dependency_libs=.*,dependency_libs=''," \
-	  debian/tmp/usr/lib/libasound.la
 endif
-	mkdir -p debian/libasound2/etc/ld.so.conf.d
-	echo "/usr/lib/alsa-lib" > debian/libasound2/etc/ld.so.conf.d/libasound2.conf
 	dh_installdirs -s
 	dh_install -s
 	dh_installdocs -plibasound2
 	dh_installexamples -s doc/asoundrc.txt
 	dh_installchangelogs -plibasound2 debian/changelog.ALSA
-	dh_install -plibasound2 /usr/lib/libasound.so.2.0.0 /usr/lib/libasound.so.2 /usr/lib
-	dh_install -plibasound2-udeb /usr/lib/libasound.so.2.0.0 /usr/lib/libasound.so.2 /usr/lib
-	dh_install -plibasound2 /usr/lib/alsa-lib/smixer/*.so /usr/lib/alsa-lib
+	dh_install -plibasound2 \
+	    /usr/lib/$(DEB_HOST_MULTIARCH)/libasound.so.2.0.0 \
+	    /usr/lib/$(DEB_HOST_MULTIARCH)/libasound.so.2 \
+	    /usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_install -plibasound2-udeb \
+	    /usr/lib/$(DEB_HOST_MULTIARCH)/libasound.so.2.0.0 \
+	    /usr/lib/$(DEB_HOST_MULTIARCH)/libasound.so.2 /usr/lib
+	dh_install -plibasound2 /usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib/smixer/*.so /usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib
 	cp -a debian/tmp/usr/share/alsa debian/libasound2/usr/share/
 	cp -a debian/tmp/usr/share/alsa debian/libasound2-udeb/usr/share/
 	dh_strip -s
@@ -176,7 +175,7 @@
 	dh_fixperms -i
 
 binary-arch: build-arch-stamp install-arch
-	dh_makeshlibs -plibasound2  -V'libasound2 (>> 1.0.24.1)' --add-udeb=libasound2-udeb --exclude=usr/lib/alsa-lib/smixer
+	dh_makeshlibs -plibasound2  -V'libasound2 (>> 1.0.24.1)' --add-udeb=libasound2-udeb --exclude=usr/lib/$(DEB_HOST_MULTIARCH)/alsa-lib/smixer
 ifneq (,$(build_biarch_stamp))
 	dh_makeshlibs -plib$(bi)asound2  -V'lib$(bi)asound2 (>> 1.0.24.1)' --exclude=usr/lib$(bi)/alsa-lib/smixer
 endif
@@ -202,7 +201,7 @@
 	#-$(MAKE) distclean
 	[ ! -f Makefile ] || $(MAKE) distclean
 	-rm -f *-stamp
-	rm -f config.sub config.guess config.status config.cache
+	-rm -f config.sub config.guess config.status config.cache
 	-rm -rf doc/doxygen
 	rm -rf bibuild debian/bitmp
 	-rm -f include/alsa