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

[David B Harris]

    Date: Saturday, February 28, 2004 @ 18:39:01
  Author: dbharris-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-driver/debian

Modified: alsa-base.config changelog

Use /etc/alsa/modutils/1.0 if it exists, and if it doesn't only then use /etc/alsa/modutils/0.9.


------------------+
 alsa-base.config |   12 ++++++++++--
 changelog        |    2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)


Index: debian/alsa-driver/debian/alsa-base.config
diff -u debian/alsa-driver/debian/alsa-base.config:1.35 debian/alsa-driver/debian/alsa-base.config:1.36
--- debian/alsa-driver/debian/alsa-base.config:1.35	Fri Nov 28 07:07:22 2003
+++ debian/alsa-driver/debian/alsa-base.config	Sat Feb 28 18:39:01 2004
@@ -75,14 +75,22 @@
 }
 
 if (-f "/etc/modutils/alsa" && ! -l "/etc/modutils/alsa") {
-  move_file("/etc/modutils/alsa", "/etc/alsa/modutils/0.9");
+  move_file("/etc/modutils/alsa", "/etc/alsa/modutils/1.0");
 }
 
 my @alsa_file = ();
-if (-f "/etc/alsa/modutils/0.9") {
+if (-f "/etc/alsa/modutils/1.0") {
+
+  open(ALSAFILE, "</etc/alsa/modutils/1.0");
+  @alsa_file = grep(/^\s*alias snd-card-/, <ALSAFILE>);
+  close ALSAFILE;
+
+} elsif (-f "/etc/alsa/modutils/0.9") {
+
   open(ALSAFILE, "</etc/alsa/modutils/0.9");
   @alsa_file = grep(/^\s*alias snd-card-/, <ALSAFILE>);
   close ALSAFILE;
+
 }
 
 my @file_cards_untouched = ();
Index: debian/alsa-driver/debian/changelog
diff -u debian/alsa-driver/debian/changelog:1.212 debian/alsa-driver/debian/changelog:1.213
--- debian/alsa-driver/debian/changelog:1.212	Fri Feb 27 18:30:45 2004
+++ debian/alsa-driver/debian/changelog	Sat Feb 28 18:39:01 2004
@@ -21,6 +21,8 @@
       settings). Now if you boot into single-user mode and reboot right from
       there, mixer settings won't be saved (so on your next boot you'll have
       your normal levels, not all-muted). (Closes: #233974)
+    - debian/alsa-base.config: Use /etc/alsa/modutils/1.0 if it exists, and
+      if it doesn't only then use /etc/alsa/modutils/0.9.
   * Unreleased.
 
  -- David B. Harris <dbharris@debian.org>  Thu, 26 Feb 2004 19:16:13 -0500