2010-05-19 10:58:23 +02:00
|
|
|
diff -Nur alsa-utils-1.0.21.orig/alsaconf/alsaconf.8 alsa-utils-1.0.21/alsaconf/alsaconf.8
|
|
|
|
|
--- alsa-utils-1.0.21.orig/alsaconf/alsaconf.8 2009-08-31 10:13:36.000000000 -0500
|
|
|
|
|
+++ alsa-utils-1.0.21/alsaconf/alsaconf.8 2009-11-11 23:45:11.943377777 -0600
|
2009-08-26 17:00:38 +02:00
|
|
|
@@ -16,8 +16,6 @@
|
|
|
|
|
This manual page documents briefly the
|
|
|
|
|
.B alsaconf
|
|
|
|
|
command.
|
|
|
|
|
-This manual page was written for the Debian distribution because the
|
|
|
|
|
-original program does not have a manual page.
|
|
|
|
|
.PP
|
|
|
|
|
\fBAlsaconf\fP is a simple shell script which tries to detect the sound cards
|
|
|
|
|
on your system and writes a suitable configuration file for ALSA. It will try
|
|
|
|
|
@@ -74,13 +72,6 @@
|
|
|
|
|
Set the uid for the ALSA devices (default = 0).
|
|
|
|
|
This option is obsolete in the recent ALSA version.
|
|
|
|
|
|
|
|
|
|
-.SH DEBIAN SPECIFIC
|
|
|
|
|
-In Debian, the default gid of the device files is 29 (corresponding to the
|
|
|
|
|
-audio group) and the default device mode is 0660.
|
|
|
|
|
-
|
|
|
|
|
-For the ALSA base package, see also
|
|
|
|
|
-.I /usr/share/doc/alsa\-base/
|
|
|
|
|
-
|
|
|
|
|
.SH SEE ALSO
|
|
|
|
|
\fB
|
|
|
|
|
alsamixer(1),
|
|
|
|
|
@@ -98,5 +89,4 @@
|
|
|
|
|
Bernd Kaindl <bk@suse.de> and
|
|
|
|
|
Jan Ondrej (SAL) <ondrejj@salstar.sk>
|
|
|
|
|
|
|
|
|
|
-This manual page was written by Jordi Mallach <jordi@debian.org>,
|
|
|
|
|
-for the Debian system (but may be used by others).
|
|
|
|
|
+This manual page was written by Jordi Mallach <jordi@debian.org>.
|
2010-05-19 10:58:23 +02:00
|
|
|
diff -Nur alsa-utils-1.0.21.orig/alsaconf/alsaconf.in alsa-utils-1.0.21/alsaconf/alsaconf.in
|
|
|
|
|
--- alsa-utils-1.0.21.orig/alsaconf/alsaconf.in 2009-08-31 10:13:36.000000000 -0500
|
|
|
|
|
+++ alsa-utils-1.0.21/alsaconf/alsaconf.in 2009-11-11 23:44:21.081360666 -0600
|
|
|
|
|
@@ -50,7 +50,9 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Check for GNU/Linux distributions
|
|
|
|
|
-if [ -f /etc/SuSE-release ]; then
|
|
|
|
|
+if [ -f /etc/slackware-version ]; then
|
|
|
|
|
+ distribution="slackware"
|
|
|
|
|
+elif [ -f /etc/SuSE-release ]; then
|
|
|
|
|
distribution="suse"
|
|
|
|
|
suse_version=$(grep 'VERSION = ' /etc/SuSE-release | sed -e s/'VERSION = '//)
|
|
|
|
|
elif [ -f /etc/UnitedLinux-release ]; then
|
|
|
|
|
@@ -305,7 +307,7 @@
|
|
|
|
|
elif [ "$kernel" = "new" ]; then
|
|
|
|
|
cfgfile="/etc/modprobe.conf"
|
|
|
|
|
if [ -d /etc/modprobe.d ]; then
|
|
|
|
|
- cfgout="/etc/modprobe.d/50-sound.conf"
|
|
|
|
|
+ cfgout="/etc/modprobe.d/sound.conf"
|
|
|
|
|
cfgoldout="/etc/modprobe.d/sound"
|
|
|
|
|
if [ ! -f $cfgout ]; then
|
|
|
|
|
modver=$(modprobe -V | sed -e's/^module-init-tools version //')
|
