[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-utils (6 files)
Thomas Hood
jdthood-guest@haydn.debian.org
Mon, 06 Sep 2004 06:28:52 -0600
Date: Monday, September 6, 2004 @ 06:28:52
Author: jdthood-guest
Path: /cvsroot/pkg-alsa/debian/alsa-utils
Added: debian/patches/91_debian_alsaconf_noclear.dpatch
Modified: alsaconf/alsaconf.in alsactl/alsactl.1 alsactl/alsactl.c
debian/patches/00list
Removed: debian/patches/30_debian_alsaconf_noclear.dpatch
Renumber clear patch from 30 to 91
--------------------------------------------------+
alsaconf/alsaconf.in | 34 ++++++++----------
alsactl/alsactl.1 | 4 +-
alsactl/alsactl.c | 2 -
debian/patches/00list | 2 -
debian/patches/30_debian_alsaconf_noclear.dpatch | 38 ---------------------
debian/patches/91_debian_alsaconf_noclear.dpatch | 33 ++++++++++++++++++
6 files changed, 53 insertions(+), 60 deletions(-)
Index: debian/alsa-utils/alsaconf/alsaconf.in
diff -u debian/alsa-utils/alsaconf/alsaconf.in:1.3 debian/alsa-utils/alsaconf/alsaconf.in:1.4
--- debian/alsa-utils/alsaconf/alsaconf.in:1.3 Mon Sep 6 04:33:19 2004
+++ debian/alsa-utils/alsaconf/alsaconf.in Mon Sep 6 06:28:51 2004
@@ -40,13 +40,6 @@
distribution="unknown"
fi
-for prog in lspci lsmod; do
- for path in /sbin /usr/sbin /bin /usr/bin;do
- [[ -x $path/$prog ]] && eval $prog=$path/$prog
- done
-done
-unset prog path
-
usage() {
echo "ALSA configurator version $version"
echo "usage: alsaconf [options]"
@@ -67,6 +60,11 @@
exit 1
}
+clear() {
+ # Run the real clear command here if you prefer to hide error messages
+ echo
+}
+
OPTS=`getopt -o lmLhp:Pu:g:d:rs: --long legacy,modinfo,log,help,probe,listprobe,uid,gid,devmode,strict,sound -n alsaconf -- "$@"` || exit 1
eval set -- "$OPTS"
@@ -74,8 +72,8 @@
use_modinfo_db=0
do_logging=0
alsa_uid=0
-alsa_gid=0
-alsa_mode=0666
+alsa_gid=29
+alsa_mode=0660
legacy_probe_card=""
LOGFILE="/tmp/alsaconf.log"
TESTSOUND="@TESTSOUND@"
@@ -166,7 +164,7 @@
fi
cfgfile="/etc/modprobe.conf"
elif [ "$distribution" = "debian" ]; then
- cfgfile="/etc/alsa/modutils/0.9"
+ cfgfile="/etc/modutils/alsa-base"
elif [ -e /etc/modules.conf ]; then
cfgfile="/etc/modules.conf"
elif [ -e /etc/conf.modules ]; then
@@ -501,7 +499,7 @@
/^[<literal space><literal tab>]*PCI: /{
gsub(/0x/, "");
gsub(/=/, ":");
- x = sprintf ("'$lspci' -n 2>/dev/null| grep '"'Class 0401'"' | grep %s", $2);
+ x = sprintf ("'/usr/bin/lspci' -n | grep '"' 0401: '"' | grep %s", $2);
if (system (x) == 0)
printf "%s %s\n", $2, driver >>"'"$FOUND"'"
}
@@ -532,7 +530,7 @@
#
find_device_name () {
if expr "$1" : '[0-9a-f][0-9a-f][0-9a-f][0-9a-f]:[0-9a-f][0-9a-f][0-9a-f][0-9a-f]' >/dev/null; then
- $lspci -d $1 2>/dev/null| sed -e 's/^.*:..\.. Multimedia audio controller: //g'
+ /usr/bin/lspci -d $1 2>/dev/null| sed -e 's/^.*:..\.. Multimedia audio controller: //g'
return
elif expr "$1" : '[A-Z@][A-Z@][A-Z@][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' >/dev/null; then
cardname=`grep '^Card [0-9]\+ '\'$1':' $DUMP | head -n 1 | sed -e 's/^Card [0-9]\+ '\''.*:\(.*\)'\'' .*$/\1/'`
@@ -684,8 +682,8 @@
aplay $TESTSOUND
fi
fi
- if [ ! -r /etc/asound.state ]; then
- echo "Saving the mixer setup used for this in /etc/asound.state."
+ if [ ! -r /var/lib/alsa/asound.state ]; then
+ echo "Saving the mixer setup used for this in /var/lib/alsa/asound.state."
$sbindir/alsactl store
fi
clear
@@ -730,7 +728,7 @@
ac_try_load () {
test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
/sbin/modprobe snd-$1 ${*:2} >/dev/null 2>&1
- if $lsmod | grep -E '^(snd-|snd_)'$1' ' >/dev/null 2>&1; then
+ if /bin/lsmod | grep -E '^(snd-|snd_)'$1' ' >/dev/null 2>&1; then
: ;
else
modprobe -r snd-$1 >/dev/null 2>&1
@@ -769,7 +767,7 @@
ac_try_capture () {
test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
/sbin/modprobe snd-$1 ${*:3} >/dev/null 2>&1
- if $lsmod | grep -E '^(snd-|snd_)'$1' ' >/dev/null 2>&1; then
+ if /bin/lsmod | grep -E '^(snd-|snd_)'$1' ' >/dev/null 2>&1; then
: ;
else
modprobe -r snd-$1 >/dev/null 2>&1
@@ -1125,7 +1123,7 @@
# check for TP600E
#
if [ ${devs_found[0]} = cs46xx ]; then
- if $lspci -nv 2>/dev/null| grep -q "Subsystem: 1014:1010"; then
+ if /usr/bin/lspci -nv 2>/dev/null| grep -q "Subsystem: 1014:1010"; then
if $DIALOG --yesno "
Looks like you having a Thinkpad 600E or 770 notebook.
On this notebook, CS4236 driver should be used
@@ -1138,7 +1136,7 @@
ac_config_legacy cs4236
exit 0
fi
- elif $lspci -nv 2>/dev/null| grep -q "Subsystem: 8086:8080"; then
+ elif /usr/bin/lspci -nv 2>/dev/null| grep -q "Subsystem: 8086:8080"; then
if $DIALOG --yesno "
Looks like you having a Dell Dimension machine.
On this machine, CS4232 driver should be used
Index: debian/alsa-utils/alsactl/alsactl.1
diff -u debian/alsa-utils/alsactl/alsactl.1:1.1.1.1 debian/alsa-utils/alsactl/alsactl.1:1.2
--- debian/alsa-utils/alsactl/alsactl.1:1.1.1.1 Fri Sep 6 09:21:01 2002
+++ debian/alsa-utils/alsactl/alsactl.1 Mon Sep 6 06:28:51 2004
@@ -34,7 +34,7 @@
.TP
\fI-f, --file\fP
-Select the configuration file to use. The default is /etc/asound.state
+Select the configuration file to use. The default is /var/lib/alsa/asound.state
.TP
\fI-F, --force\fP
@@ -50,7 +50,7 @@
Print alsactl version number.
.SH FILES
-\fI/etc/asound.state\fP (or whatever file you specify with the
+\fI/var/lib/alsa/asound.state\fP (or whatever file you specify with the
\fB-f\fP flag) is used to store current settings for your
soundcards. The settings include all the usual soundcard mixer
settings. More importantly, alsactl is
Index: debian/alsa-utils/alsactl/alsactl.c
diff -u debian/alsa-utils/alsactl/alsactl.c:1.1.1.1 debian/alsa-utils/alsactl/alsactl.c:1.2
--- debian/alsa-utils/alsactl/alsactl.c:1.1.1.1 Fri Jun 20 12:13:28 2003
+++ debian/alsa-utils/alsactl/alsactl.c Mon Sep 6 06:28:51 2004
@@ -29,7 +29,7 @@
#include <errno.h>
#include <alsa/asoundlib.h>
-#define SYS_ASOUNDRC "/etc/asound.state"
+#define SYS_ASOUNDRC "/var/lib/alsa/asound.state"
int debugflag = 0;
int force_restore = 0;
Index: debian/alsa-utils/debian/patches/00list
diff -u debian/alsa-utils/debian/patches/00list:1.4 debian/alsa-utils/debian/patches/00list:1.5
--- debian/alsa-utils/debian/patches/00list:1.4 Mon Sep 6 04:51:20 2004
+++ debian/alsa-utils/debian/patches/00list Mon Sep 6 06:28:51 2004
@@ -1,4 +1,4 @@
10_move_asound_state_to_var
20_alsaconf_lspci
90_debian_alsaconf
-30_debian_alsaconf_noclear
+91_debian_alsaconf_noclear
Index: debian/alsa-utils/debian/patches/30_debian_alsaconf_noclear.dpatch
diff -u debian/alsa-utils/debian/patches/30_debian_alsaconf_noclear.dpatch:1.1 debian/alsa-utils/debian/patches/30_debian_alsaconf_noclear.dpatch:removed
--- debian/alsa-utils/debian/patches/30_debian_alsaconf_noclear.dpatch:1.1 Mon Sep 6 04:53:57 2004
+++ debian/alsa-utils/debian/patches/30_debian_alsaconf_noclear.dpatch Mon Sep 6 06:28:52 2004
@@ -1,39 +0,0 @@
-#! /bin/sh -e
-## 30_debian_alsaconf_noclear.dpatch by <jdthood@yahoo.co.uk>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in 2004-09-06 12:45:25.000000000 +0200
-+++ alsa-utils/alsaconf/alsaconf.in 2004-09-06 12:45:59.000000000 +0200
-@@ -67,6 +60,11 @@
- exit 1
- }
-
-+clear() {
-+ # Run the real clear command here if you prefer to hide error messages
-+ echo
-+}
-+
- OPTS=`getopt -o lmLhp:Pu:g:d:rs: --long legacy,modinfo,log,help,probe,listprobe,uid,gid,devmode,strict,sound -n alsaconf -- "$@"` || exit 1
- eval set -- "$OPTS"
Index: debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch
diff -u /dev/null debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch:1.1
--- /dev/null Mon Sep 6 06:28:52 2004
+++ debian/alsa-utils/debian/patches/91_debian_alsaconf_noclear.dpatch Mon Sep 6 06:28:51 2004
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+## 30_debian_alsaconf_noclear.dpatch by <jdthood@yahoo.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
+--- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in 2004-09-06 12:45:25.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in 2004-09-06 12:45:59.000000000 +0200
+@@ -67,6 +60,11 @@
+ exit 1
+ }
+
++clear() {
++ # Run the real clear command here if you prefer to hide error messages
++ echo
++}
++
+ OPTS=`getopt -o lmLhp:Pu:g:d:rs: --long legacy,modinfo,log,help,probe,listprobe,uid,gid,devmode,strict,sound -n alsaconf -- "$@"` || exit 1
+ eval set -- "$OPTS"