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

[Thomas Hood]

    Date: Monday, September 6, 2004 @ 15:43:25
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.init control

Don't restore mixer settings in initscript start method ; alsa-base to Depend on alsa-utils 1.0.6 whose alsaconf sets up the module loader to restore mixer settings


----------------+
 alsa-base.init |   19 +++++++++----------
 control        |    2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.init
diff -u debian/alsa-driver/debian/alsa-base.init:1.51 debian/alsa-driver/debian/alsa-base.init:1.52
--- debian/alsa-driver/debian/alsa-base.init:1.51	Thu Sep  2 07:27:05 2004
+++ debian/alsa-driver/debian/alsa-base.init	Mon Sep  6 15:43:25 2004
@@ -22,16 +22,15 @@
 start()
 {
 	# ALSA mixer settings should be restored via the module loader
-	# For now, continue to do it manually
-	printf "Restoring ALSA mixer settings..."
-	sleep 5
-	if alsactl restore > /dev/null 2>&1; then
-	    echo "done."
-	    return 0
-	else
-	    echo "failed. Run 'alsactl restore' manually to view error messages."
-	    return 1
-	fi
+#	printf "Restoring ALSA mixer settings..."
+#	sleep 5
+#	if alsactl restore > /dev/null 2>&1; then
+#	    echo "done."
+#	    return 0
+#	else
+#	    echo "failed. Run 'alsactl restore' manually to view error messages."
+#	    return 1
+#	fi
 }
 
 stop()
Index: debian/alsa-driver/debian/control
diff -u debian/alsa-driver/debian/control:1.32 debian/alsa-driver/debian/control:1.33
--- debian/alsa-driver/debian/control:1.32	Thu Sep  2 02:16:07 2004
+++ debian/alsa-driver/debian/control	Mon Sep  6 15:43:25 2004
@@ -9,7 +9,7 @@
 Package: alsa-base
 Architecture: all
 Replaces: alsa-modules, alsa-base-0.4
-Depends: psmisc, modutils (>= 2.3.5-1) | module-init-tools, debconf, alsa-utils (>= 1.0.2-2), debianutils (>= 1.6)
+Depends: psmisc, modutils (>= 2.3.5-1) | module-init-tools, debconf, alsa-utils (>= 1.0.6-1), debianutils (>= 1.6)
 Suggests: apmd (>= 3.0.2-1)
 Conflicts: alsa-base-0.4, alsa-modules, modutils (= 2.3.20-1), alsaconf (<< 0.4.3b-4), lsof-2.2 (<< 4.64)
 Provides: alsa