[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-driver/debian (alsa-base.apm changelog)

Jordi Mallach jordi@haydn.debian.org
Tue, 13 Apr 2004 16:18:05 -0600


    Date: Tuesday, April 13, 2004 @ 16:18:05
  Author: jordi
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.apm changelog

Fix apm bug and release.


---------------+
 alsa-base.apm |    6 +++---
 changelog     |    8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.apm
diff -u debian/alsa-driver/debian/alsa-base.apm:1.5 debian/alsa-driver/debian/alsa-base.apm:1.6
--- debian/alsa-driver/debian/alsa-base.apm:1.5	Tue Nov 11 21:25:24 2003
+++ debian/alsa-driver/debian/alsa-base.apm	Tue Apr 13 16:18:04 2004
@@ -8,7 +8,7 @@
 	. /etc/default/alsa
 fi
 
-devices=$(find /dev -type c | xargs stat -c '%t %n' | sed -n 's/^e //p')
+devices=$(find /dev -type c | xargs stat -c '%t %n' | sed -n 's/^e //p; s/^74 //p')
 if [ "$1" = suspend ]; then
 	if [ "$force_stop_modules_before_suspend" = "forcibly-unload-driver" ]; then
 		alsactl store || true
@@ -16,7 +16,7 @@
 		/etc/init.d/alsa force-stop || true
 	elif [ "$force_stop_modules_before_suspend" = "stop-procs" ]; then
 		if [ -d /proc/asound ]; then
-			kill -STOP $(fuser $devices) | cut -d: -f2 | tr '\n' ' '
+			fuser -k -STOP $devices
 		fi
 	fi
 	sleep 1
@@ -27,7 +27,7 @@
         alsactl restore || true
 	elif [ "$force_stop_modules_before_suspend" = "stop-procs" ]; then
 		if [ -d /proc/asound ]; then
-			kill -CONT $(fuser $devices) | cut -d: -f2 | tr '\n' ' '
+			fuser -k CONT $devices
 		fi
 	fi
 fi
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.231 debian/alsa-driver/debian/changelog:1.232
--- debian/alsa-driver/debian/changelog:1.231	Tue Apr 13 13:39:26 2004
+++ debian/alsa-driver/debian/changelog	Tue Apr 13 16:18:04 2004
@@ -1,6 +1,6 @@
 alsa-driver (1.0.4-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release.
   * Jordi Mallach:
     - debian/po/cs.po: new Czech translation of debconf templates
       (thanks Miroslav Kure <kurem@upcase.inf.upol.cz>; closes: #235644).
@@ -8,9 +8,11 @@
       avoid unresolved symbols when calling depmod on alsa-modules's
       postinsts (closes: #236543).
     - debian/control: change Maintainer name to "Debian ALSA Maintainers".
-  * Unreleased.
+    - debian/alsa-base.apm: apply suggestions from Marius Gedminas to
+      improve the detection of ALSA devices and the usage of fuser to stop
+      processes, thanks! (closes: #238994).
 
- -- David B. Harris <dbharris@debian.org>  Tue, 13 Apr 2004 15:37:34 -0400
+ -- Jordi Mallach <jordi@debian.org>  Wed, 14 Apr 2004 00:11:52 +0200
 
 alsa-driver (1.0.3-1) unstable; urgency=high