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

[Thomas Hood]

    Date: Thursday, September 2, 2004 @ 05:52:17
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.apm changelog

Simplify apm proxy script; update changelog accordingly


---------------+
 alsa-base.apm |   32 +++++++++++++-------------------
 changelog     |    5 +++++
 2 files changed, 18 insertions(+), 19 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.apm
diff -u debian/alsa-driver/debian/alsa-base.apm:1.11 debian/alsa-driver/debian/alsa-base.apm:1.12
--- debian/alsa-driver/debian/alsa-base.apm:1.11	Mon Aug 23 05:44:08 2004
+++ debian/alsa-driver/debian/alsa-base.apm	Thu Sep  2 05:52:17 2004
@@ -1,25 +1,19 @@
 #!/bin/sh
-
-# stop/continue processes using sound devices.
+#
+# apmd proxy script for ALSA
 
 set -e
 
-[ -e /etc/default/alsa ] && . /etc/default/alsa
-
-if [ "$force_stop_modules_before_suspend" != "true" ]; then
-    exit 0
-fi
+[ -f /etc/default/alsa ] && . /etc/default/alsa
 
-devices=$(find /dev -type c | xargs stat -c '%t %n' | sed -n 's/^e //p; s/^74 //p')
-if [ "$1" = suspend ]; then
-    if [ -d /proc/asound ]; then
-	fuser -k -STOP $devices || :
-	sleep 1
-	/etc/init.d/alsa force-stop
-    fi
-elif [ "$1" = resume ]; then
-    if [ -d /proc/asound ]; then
-	fuser -k -CONT $devices || :
-    fi
-fi
+case "$1" in
+suspend)
+	if [ "$force_stop_modules_before_suspend" = "true" ]; then
+		/etc/init.d/alsa force-stop
+	fi
+	;;
+# resume)
+	# Do stuff here
+	# ;;
+esac
 
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.267 debian/alsa-driver/debian/changelog:1.268
--- debian/alsa-driver/debian/changelog:1.267	Thu Sep  2 05:40:33 2004
+++ debian/alsa-driver/debian/changelog	Thu Sep  2 05:52:17 2004
@@ -58,6 +58,11 @@
         where people have replaced conf files by symlinks
       + Always use -f option with mv and rm
       + Replace 'autosave always' by 'always autosave'
+    - /etc/apm/event.d/alsa
+      + Clean up
+      + Remove redundant fuser commands.  Calling the initscript with
+        "force-stop" should everything that is required.
+        (Closes: #269282)
   * Unreleased.
 
  -- Steve Kowalik <stevenk@debian.org>  Wed,  1 Sep 2004 13:07:24 +1000