Martin Stransky a6b76c
--- alsa-utils-1.0.14/alsaconf/alsaconf.in~	2007-05-31 11:07:21.000000000 +0300
Martin Stransky a6b76c
+++ alsa-utils-1.0.14/alsaconf/alsaconf.in	2007-08-26 22:40:21.000000000 +0300
Martin Stransky a6b76c
@@ -938,8 +938,8 @@ If you have a big amplifier, lower your 
Martin Stransky a6b76c
 	  aplay -N $TESTSOUND
Martin Stransky a6b76c
       fi
Martin Stransky a6b76c
     fi
Martin Stransky a6b76c
-    if [ ! -r /etc/asound.state ]; then
Martin Stransky a6b76c
-	xecho "Saving the mixer setup used for this in /etc/asound.state."
Martin Stransky a6b76c
+    if [ ! -r /etc/alsa/asound.state ]; then
Martin Stransky a6b76c
+	xecho "Saving the mixer setup used for this in /etc/alsa/asound.state."
Martin Stransky a6b76c
 	$sbindir/alsactl store
Martin Stransky a6b76c
     fi
Martin Stransky a6b76c
     clear
Martin Stransky a6b76c
--- alsa-utils-1.0.14/alsaconf/po/ja.po~	2007-05-31 11:07:21.000000000 +0300
Martin Stransky a6b76c
+++ alsa-utils-1.0.14/alsaconf/po/ja.po	2007-08-26 22:40:43.000000000 +0300
Martin Stransky a6b76c
@@ -203,8 +203,8 @@ msgstr ""
Martin Stransky a6b76c
 "  テスト音が聞こえるかどうか確認してください。\n"
Martin Stransky a6b76c
 
Martin Stransky a6b76c
 #: ../alsaconf.in:932
Martin Stransky a6b76c
-msgid "Saving the mixer setup used for this in /etc/asound.state."
Martin Stransky a6b76c
-msgstr "ミキサーの設定を /etc/asound.state に保存します"
Martin Stransky a6b76c
+msgid "Saving the mixer setup used for this in /etc/alsa/asound.state."
Martin Stransky a6b76c
+msgstr "ミキサーの設定を /etc/alsa/asound.state に保存します"
Martin Stransky a6b76c
 
Martin Stransky a6b76c
 #: ../alsaconf.in:936
Martin Stransky a6b76c
 msgid ""
Martin Stransky a6b76c
--- alsa-utils-1.0.14/alsaconf/po/ru.po~	2007-05-31 11:07:21.000000000 +0300
Martin Stransky a6b76c
+++ alsa-utils-1.0.14/alsaconf/po/ru.po	2007-08-26 22:40:34.000000000 +0300
Martin Stransky a6b76c
@@ -211,8 +211,8 @@ msgstr ""
Martin Stransky a6b76c
 "  и удостоверьтесь что вы слышите тестовый пример.\n"
Martin Stransky a6b76c
 
Martin Stransky a6b76c
 #: ../alsaconf.in:932
Martin Stransky a6b76c
-msgid "Saving the mixer setup used for this in /etc/asound.state."
Martin Stransky a6b76c
-msgstr "Сохраняем настройки микшера в /etc/asound.state."
Martin Stransky a6b76c
+msgid "Saving the mixer setup used for this in /etc/alsa/asound.state."
Martin Stransky a6b76c
+msgstr "Сохраняем настройки микшера в /etc/alsa/asound.state."
Martin Stransky a6b76c
 
Martin Stransky a6b76c
 #: ../alsaconf.in:936
Martin Stransky a6b76c
 msgid ""
Martin Stransky a6b76c
--- alsa-utils-1.0.14/alsactl/alsactl.1~	2007-05-31 11:07:21.000000000 +0300
Martin Stransky a6b76c
+++ alsa-utils-1.0.14/alsactl/alsactl.1	2007-08-26 22:40:03.000000000 +0300
Martin Stransky a6b76c
@@ -35,7 +35,7 @@ Help: show available flags and commands.
Martin Stransky a6b76c
 
Martin Stransky a6b76c
 .TP
Martin Stransky a6b76c
 \fI\-f, \-\-file\fP
Martin Stransky a6b76c
-Select the configuration file to use. The default is /etc/asound.state or
Martin Stransky a6b76c
+Select the configuration file to use. The default is /etc/alsa/asound.state or
Martin Stransky a6b76c
 /etc/asound.names (for the \fInames\fP command).
Martin Stransky a6b76c
 
Martin Stransky a6b76c
 .TP
Martin Stransky a6b76c
@@ -52,7 +52,7 @@ Use debug mode: a bit more verbose.
Martin Stransky a6b76c
 Print alsactl version number.
Martin Stransky a6b76c
 
Martin Stransky a6b76c
 .SH FILES
Martin Stransky a6b76c
-\fI/etc/asound.state\fP (or whatever file you specify with the
Martin Stransky a6b76c
+\fI/etc/alsa/asound.state\fP (or whatever file you specify with the
Martin Stransky a6b76c
 \fB\-f\fP flag) is used to store current settings for your
Martin Stransky a6b76c
 soundcards. The settings include all the usual soundcard mixer
Martin Stransky a6b76c
 settings.  More importantly, alsactl is
Martin Stransky a6b76c
--- alsa-utils-1.0.14/alsactl/alsactl.c~	2007-05-31 11:07:21.000000000 +0300
Martin Stransky a6b76c
+++ alsa-utils-1.0.14/alsactl/alsactl.c	2007-08-26 22:40:10.000000000 +0300
Martin Stransky a6b76c
@@ -30,7 +30,7 @@
Martin Stransky a6b76c
 #include <alsa asoundlib.h="">
Martin Stransky a6b76c
 #include "alsactl.h"
Martin Stransky a6b76c
 
Martin Stransky a6b76c
-#define SYS_ASOUNDRC "/etc/asound.state"
Martin Stransky a6b76c
+#define SYS_ASOUNDRC "/etc/alsa/asound.state"
Martin Stransky a6b76c
 #define SYS_ASOUNDNAMES "/etc/asound.names"
Martin Stransky a6b76c
 
Martin Stransky a6b76c
 int debugflag = 0;