summaryrefslogtreecommitdiff
path: root/source/ap/alsa-utils/alsa-utils.alsaconf.diff
diff options
context:
space:
mode:
Diffstat (limited to 'source/ap/alsa-utils/alsa-utils.alsaconf.diff')
-rw-r--r--source/ap/alsa-utils/alsa-utils.alsaconf.diff55
1 files changed, 29 insertions, 26 deletions
diff --git a/source/ap/alsa-utils/alsa-utils.alsaconf.diff b/source/ap/alsa-utils/alsa-utils.alsaconf.diff
index 92e05b83..43aab43b 100644
--- a/source/ap/alsa-utils/alsa-utils.alsaconf.diff
+++ b/source/ap/alsa-utils/alsa-utils.alsaconf.diff
@@ -1,6 +1,32 @@
-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
+--- ./alsaconf/alsaconf.in.orig 2010-04-16 06:11:06.000000000 -0500
++++ ./alsaconf/alsaconf.in 2010-05-29 21:08:39.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
+@@ -302,10 +304,12 @@
+ else
+ if [ "$distribution" = "gentoo" ]; then
+ cfgfile="/etc/modules.d/alsa"
++elif [ "$distribution" = "slackware" ]; then
++ cfgfile="/etc/modprobe.d/sound.conf"
+ 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 //')
+--- ./alsaconf/alsaconf.8.orig 2010-04-16 06:11:06.000000000 -0500
++++ ./alsaconf/alsaconf.8 2010-05-29 21:07:51.000000000 -0500
@@ -16,8 +16,6 @@
This manual page documents briefly the
.B alsaconf
@@ -31,26 +57,3 @@ diff -Nur alsa-utils-1.0.21.orig/alsaconf/alsaconf.8 alsa-utils-1.0.21/alsaconf/
-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 //')