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

[Thomas Hood]

    Date: Wednesday, September 8, 2004 @ 07:02:39
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.apm changelog

Improve apmd proxy script


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


Index: debian/alsa-driver/debian/alsa-base.apm
diff -u debian/alsa-driver/debian/alsa-base.apm:1.12 debian/alsa-driver/debian/alsa-base.apm:1.13
--- debian/alsa-driver/debian/alsa-base.apm:1.12	Thu Sep  2 05:52:17 2004
+++ debian/alsa-driver/debian/alsa-base.apm	Wed Sep  8 07:02:35 2004
@@ -2,18 +2,21 @@
 #
 # apmd proxy script for ALSA
 
-set -e
-
-[ -f /etc/default/alsa ] && . /etc/default/alsa
+[ -f /etc/default/alsa ] || exit 0
+. /etc/default/alsa
 
 case "$1" in
 suspend)
 	if [ "$force_stop_modules_before_suspend" = "true" ]; then
+		[ -x /usr/bin/esdctl ] && esdctl off
 		/etc/init.d/alsa force-stop
 	fi
 	;;
-# resume)
-	# Do stuff here
-	# ;;
+resume)
+	if [ "$force_stop_modules_before_suspend" = "true" ]; then
+		modprobe -q snd-card-0 || :
+		[ -x /usr/bin/esdctl ] && esdctl on
+	fi
+	;;
 esac
 
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.272 debian/alsa-driver/debian/changelog:1.273
--- debian/alsa-driver/debian/changelog:1.272	Wed Sep  8 03:41:22 2004
+++ debian/alsa-driver/debian/changelog	Wed Sep  8 07:02:35 2004
@@ -46,6 +46,12 @@
         (see #268221).  (Closes: #270419)
     - /etc/default/alsa
       + Try to improve comments some more
+    - /etc/apm/event.d/alsa
+      + Rewrite
+      + Add esdctl commands if esdctl is present
+      + Remove redundant fuser commands.  Calling the initscript with
+        "force-stop" should do everything that is required.
+        (Closes: #269282)
     - alsa-base.postinst
       + Clean up, add comments
       + Run confmodule at the beginning since it restarts the script
@@ -61,11 +67,6 @@
         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)
     - debian/control:
       + Make alsa-base Depend on alsa-utils >= 1.0.6-1
     - debian/po/nl.po: