diff -Nru alsa-driver-1.0.24+dfsg/debian/alsa-base.init alsa-driver-1.0.24+dfsg/debian/alsa-base.init --- alsa-driver-1.0.24+dfsg/debian/alsa-base.init 2011-02-21 07:06:31.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/alsa-base.init 2011-05-05 05:23:14.000000000 +0000 @@ -47,12 +47,12 @@ echo_procs_using_sound() { - echo $( \ - lsof +D /dev -F rt \ - | awk '/^p/ {pid=$1} /^t/ {type=$1} /^r0x(74|e)..$/ && type == "tCHR" {print pid}' \ - | cut -c 2- \ - | uniq \ - ) + for i in /proc/[0-9]*/fd/* ; do + var="$(readlink $i)" + if test x"$var" != x"${var#/dev/snd/pcm}" ; then + IFS=/; set -- $i; unset IFS; echo $3 + fi + done } # $* [PID]... diff -Nru alsa-driver-1.0.24+dfsg/debian/alsa-base.README.Debian alsa-driver-1.0.24+dfsg/debian/alsa-base.README.Debian --- alsa-driver-1.0.24+dfsg/debian/alsa-base.README.Debian 2011-02-21 07:06:31.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/alsa-base.README.Debian 2011-05-05 05:23:14.000000000 +0000 @@ -6,14 +6,14 @@ news loading modules creating device files -reloading modules after suspension +reloading modules across APM suspend-and-resume unloading modules -initscript +getting OSS support internal speaker news ---- -Last updated 30 April 2009 +Last updated 16 January 2011 loading modules diff -Nru alsa-driver-1.0.24+dfsg/debian/alsa-base-udeb.debhelper.log alsa-driver-1.0.24+dfsg/debian/alsa-base-udeb.debhelper.log --- alsa-driver-1.0.24+dfsg/debian/alsa-base-udeb.debhelper.log 1970-01-01 00:00:00.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/alsa-base-udeb.debhelper.log 2011-05-14 13:10:39.000000000 +0000 @@ -0,0 +1,2 @@ +dh_prep +dh_prep diff -Nru alsa-driver-1.0.24+dfsg/debian/alsa-base-udeb.dirs alsa-driver-1.0.24+dfsg/debian/alsa-base-udeb.dirs --- alsa-driver-1.0.24+dfsg/debian/alsa-base-udeb.dirs 1970-01-01 00:00:00.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/alsa-base-udeb.dirs 2011-05-05 05:23:14.000000000 +0000 @@ -0,0 +1 @@ +etc/modprobe.d diff -Nru alsa-driver-1.0.24+dfsg/debian/alsa-source.dirs alsa-driver-1.0.24+dfsg/debian/alsa-source.dirs --- alsa-driver-1.0.24+dfsg/debian/alsa-source.dirs 2011-02-21 07:06:31.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/alsa-source.dirs 2011-05-05 05:23:14.000000000 +0000 @@ -1,4 +1,3 @@ etc/alsa usr/share/alsa-source -usr/share/lintian/overrides usr/share/bug/alsa-source diff -Nru alsa-driver-1.0.24+dfsg/debian/changelog alsa-driver-1.0.24+dfsg/debian/changelog --- alsa-driver-1.0.24+dfsg/debian/changelog 2011-02-22 09:02:46.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/changelog 2011-05-14 13:10:33.000000000 +0000 @@ -1,8 +1,40 @@ -alsa-driver (1.0.24+dfsg-0ubuntu1~lucid1) lucid; urgency=low +alsa-driver (1.0.24+dfsg-0ubuntu2~lucid1) lucid; urgency=low * Build for Lucid. - -- Aron Xu Tue, 22 Feb 2011 17:02:35 +0800 + -- Aron Xu Sat, 14 May 2011 21:10:24 +0800 + +alsa-driver (1.0.24+dfsg-0ubuntu2) oneiric; urgency=low + + * debian/control: Update Vcs-Bzr field + Cherry-pick changes from debian ALSA svn: + + [ Elimar Riesebieter ] + * Provide alsa-base-udeb based on a patch from Samuel Thibault. Thanks. + (closes: #613095) + * Correct mismatches in README.Debian.gz (thanks Petr Vorel; closes: #610008) + * Removed useless entry '# Comment this entry in order to load pcspkr driver' + from /etc/modprobe.d/alsa-base-blacklist.conf. + + [ Jordi Mallach ] + * Remove all replaces and conflicts for all packages: all referred to + versions available even in etch, or are no longer in Debian. + * Bump Standards-Version to 3.9.2 (no further changes required). + * Remove Suggests from udeb (not supported) and set Section to + debian-installer. + * Point to non-symlinked GPL file. + * Update upstream url in copyright. + * Remove empty override dirs. + + [ Daniel T Chen ] + * debian/alsa-base.init: Modify echo_procs_using_sound to avoid using + lsof, which reduces our footprint, at the cost of being somewhat + slower. Because *unload is not in the fast path generally, this + tradeoff seems acceptable. Based on work by Kai Hendry et al. at + http://stackoverflow.com/questions/526132/finding-processes-using-alsa-sound-fast, + many thanks (closes: #514661)! + + -- Luke Yelavich Thu, 05 May 2011 15:04:35 +1000 alsa-driver (1.0.24+dfsg-0ubuntu1) natty; urgency=low diff -Nru alsa-driver-1.0.24+dfsg/debian/control alsa-driver-1.0.24+dfsg/debian/control --- alsa-driver-1.0.24+dfsg/debian/control 2011-02-21 07:06:31.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/control 2011-05-05 05:23:14.000000000 +0000 @@ -6,18 +6,16 @@ Uploaders: Jordi Mallach , Elimar Riesebieter Build-Depends-Indep: autoconf, bzip2, cpio Build-Depends: debhelper (>= 7), po-debconf -Standards-Version: 3.8.4 +Standards-Version: 3.9.2 Homepage: http://www.alsa-project.org/ XS-Debian-Vcs-Svn: svn://svn.debian.org/pkg-alsa/trunk/alsa-driver XS-Debian-Vcs-Browser: http://svn.debian.org/wsvn/pkg-alsa/trunk/alsa-driver/ -Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-audio-dev/alsa-driver/ubuntu.natty +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-audio-dev/alsa-driver/ubuntu.oneiric Package: linux-sound-base Architecture: all Depends: ${misc:Depends}, module-init-tools (>= 3.2.1) Suggests: alsa-base (>= 1.0.18-1) -Conflicts: alsa-base (<= 1.0.8-7) -Replaces: alsa-base (<= 1.0.8-7) Description: base package for ALSA and OSS sound systems This package allows the administrator to choose between the OSS and ALSA sound systems. @@ -28,10 +26,9 @@ Package: alsa-base Architecture: all Provides: alsa -Depends: ${misc:Depends}, lsof (>= 4.64), module-init-tools (>= 3.2.1), linux-sound-base, udev +Depends: ${misc:Depends}, module-init-tools (>= 3.2.1), linux-sound-base, udev Recommends: alsa-utils Suggests: apmd (>= 3.0.2-1), alsa-oss, oss-compat -Conflicts: modutils (= 2.3.20-1), lsof-2.2 (<< 4.64), discover1 (<< 1.7.3), discover (<< 2.0.7-1), alsa-utils (<< 1.0.9a-4) Description: ALSA driver configuration files This package contains various configuration files for the ALSA drivers. @@ -48,6 +45,17 @@ . ALSA is the Advanced Linux Sound Architecture. +Package: alsa-base-udeb +Architecture: all +Section: debian-installer +Provides: alsa +Depends: ${misc:Depends} +Recommends: alsa-utils +Package-Type: udeb +Description: ALSA driver configuration files + This package contains minimum configuration files for + the ALSA drivers for the Debian Installer. + Package: alsa-source Architecture: all Section: kernel diff -Nru alsa-driver-1.0.24+dfsg/debian/copyright alsa-driver-1.0.24+dfsg/debian/copyright --- alsa-driver-1.0.24+dfsg/debian/copyright 2011-02-21 07:06:31.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/copyright 2011-05-05 05:23:14.000000000 +0000 @@ -10,7 +10,7 @@ The source code was downloaded from the ALSA homepage: - http://alsa.sourceforge.net + http://www.alsa-project.org/ alsa-driver ----------- @@ -42,5 +42,5 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -On Debian systems, the complete text of the GNU GPL can be found in the -/usr/share/common-licenses/GPL file. +On Debian systems, the complete text of the GNU General Public License +version 2, can be found in the /usr/share/common-licenses/GPL-2 file. diff -Nru alsa-driver-1.0.24+dfsg/debian/linux-sound-base.dirs alsa-driver-1.0.24+dfsg/debian/linux-sound-base.dirs --- alsa-driver-1.0.24+dfsg/debian/linux-sound-base.dirs 2011-02-21 07:06:31.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/linux-sound-base.dirs 2011-05-05 05:23:14.000000000 +0000 @@ -1,4 +1,3 @@ etc/modprobe.d lib/linux-sound-base usr/share/linux-sound-base -usr/share/lintian/overrides diff -Nru alsa-driver-1.0.24+dfsg/debian/rules alsa-driver-1.0.24+dfsg/debian/rules --- alsa-driver-1.0.24+dfsg/debian/rules 2011-02-21 07:06:31.000000000 +0000 +++ alsa-driver-1.0.24+dfsg/debian/rules 2011-05-05 05:23:14.000000000 +0000 @@ -123,8 +123,8 @@ >> debian/alsa-base/etc/modprobe.d/alsa-base.conf echo 'blacklist snd-pcsp' \ >> debian/alsa-base/etc/modprobe.d/alsa-base.conf - echo '# Comment this entry in order to load pcspkr driver' \ - >> debian/alsa-base/etc/modprobe.d/alsa-base.conf + #echo '# Comment this entry in order to load pcspkr driver' \ + # >> debian/alsa-base/etc/modprobe.d/alsa-base.conf #echo 'blacklist pcspkr' \ # >> debian/alsa-base/etc/modprobe.d/alsa-base.conf ### Install module options @@ -159,6 +159,7 @@ >> debian/alsa-base/etc/modprobe.d/alsa-base.conf echo "options snd-usb-audio index=-2" \ >> debian/alsa-base/etc/modprobe.d/alsa-base.conf + cp debian/alsa-base/etc/modprobe.d/* debian/alsa-base-udeb/etc/modprobe.d/ ### Install debconf templates dh_installdebconf cp -p debian/alsa-source.templates_BAK debian/alsa-source.templates && rm -f debian/alsa-source.templates_BAK