diff options
Diffstat (limited to 'source/ap/alsa-utils/alsa-utils.alsaconf.diff')
| -rw-r--r-- | source/ap/alsa-utils/alsa-utils.alsaconf.diff | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/source/ap/alsa-utils/alsa-utils.alsaconf.diff b/source/ap/alsa-utils/alsa-utils.alsaconf.diff index c20bf72e7..92e05b832 100644 --- a/source/ap/alsa-utils/alsa-utils.alsaconf.diff +++ b/source/ap/alsa-utils/alsa-utils.alsaconf.diff @@ -1,27 +1,6 @@ ---- ./alsaconf/alsaconf.in.orig 2007-05-31 03:07:21.000000000 -0500 -+++ ./alsaconf/alsaconf.in 2007-06-05 19:01:03.000000000 -0500 -@@ -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 -@@ -490,6 +492,8 @@ - - if [ "$distribution" = "debian" ]; then - rcalsasound=/etc/init.d/alsa -+elif [ -x /etc/rc.d/rc.alsa ]; then -+ rcalsasound=/etc/rc.d/rc.alsa - elif [ -x /etc/init.d/alsasound ]; then - rcalsasound=/etc/init.d/alsasound - elif [ -x /usr/sbin/rcalsasound ]; then ---- ./alsaconf/alsaconf.8.orig 2007-05-31 03:07:21.000000000 -0500 -+++ ./alsaconf/alsaconf.8 2007-06-05 19:01:03.000000000 -0500 +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 @@ -16,8 +16,6 @@ This manual page documents briefly the .B alsaconf @@ -52,3 +31,26 @@ -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>. +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 //') |