[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-utils/debian (2 files)

[Jordi Mallach]

    Date: Tuesday, April 13, 2004 @ 13:45:38
  Author: jordi
    Path: /cvsroot/pkg-alsa/debian/alsa-utils/debian

Modified: changelog patches/90_debian_alsaconf.dpatch

Update alsaconf patch and fix modutils bug.


-----------------------------------+
 changelog                         |    2 +
 patches/90_debian_alsaconf.dpatch |   50 +++++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 17 deletions(-)


Index: debian/alsa-utils/debian/changelog
diff -u debian/alsa-utils/debian/changelog:1.22 debian/alsa-utils/debian/changelog:1.23
--- debian/alsa-utils/debian/changelog:1.22	Wed Apr  7 19:38:50 2004
+++ debian/alsa-utils/debian/changelog	Tue Apr 13 13:45:38 2004
@@ -6,6 +6,8 @@
     - debian/control: change Maintainer name to "Debian ALSA Maintainers".
     - debian/postinst: remove update-menus call and a #DEBHELPER# marker
       instead.
+    - debian/patches/90_debian_alsaconf.dpatch: update path to the Debian
+      modutils file (0.9 -> 1.0).
 
  -- Jordi Mallach <jordi@debian.org>  Sun, 21 Mar 2004 00:51:41 +0100
 
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch
diff -u debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.2 debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.3
--- debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.2	Wed Feb 25 20:43:15 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch	Tue Apr 13 13:45:38 2004
@@ -25,10 +25,10 @@
 exit 0
 
 @DPATCH@
-diff -urNad /home/dbharris/source/debian/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
---- /home/dbharris/source/debian/alsa-utils/alsaconf/alsaconf.in	2003-12-05 08:13:00.000000000 -0500
-+++ alsa-utils/alsaconf/alsaconf.in	2003-12-25 12:43:32.000000000 -0500
-@@ -34,13 +34,6 @@
+diff -urNad /home/jordi/deb/alsa/alsa-utils/alsaconf/alsaconf.in alsa-utils/alsaconf/alsaconf.in
+--- /home/jordi/deb/alsa/alsa-utils/alsaconf/alsaconf.in	2004-04-13 21:43:14.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-04-13 21:43:15.000000000 +0200
+@@ -38,13 +38,6 @@
    distribution="unknown"
  fi
  
@@ -42,7 +42,7 @@
  usage() {
      echo "ALSA configurator version $version"
      echo "usage: alsaconf [options]"
-@@ -68,8 +61,8 @@
+@@ -72,8 +65,8 @@
  use_modinfo_db=0
  do_logging=0
  alsa_uid=0
@@ -53,7 +53,16 @@
  legacy_probe_card=""
  LOGFILE="/tmp/alsaconf.log"
  TESTSOUND="@TESTSOUND@"
-@@ -485,7 +478,7 @@
+@@ -162,7 +155,7 @@
+   fi
+   cfgfile="/etc/modprobe.conf"
+ elif [ "$distribution" = "debian" ]; then
+-  cfgfile="/etc/alsa/modutils/0.9"
++  cfgfile="/etc/alsa/modutils/1.0"
+ elif [ -e /etc/modules.conf ]; then
+   cfgfile="/etc/modules.conf"
+ elif [ -e /etc/conf.modules ]; then
+@@ -497,7 +490,7 @@
  /^[<literal space><literal tab>]*PCI: /{
  	gsub(/0x/, "");
  	gsub(/=/, ":");
@@ -62,7 +71,7 @@
  	if (system (x) == 0)
  		printf "%s %s\n", $2, driver >>"'"$FOUND"'"
  }
-@@ -516,7 +509,7 @@
+@@ -528,7 +521,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
@@ -71,25 +80,25 @@
  	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/'`
-@@ -683,7 +676,7 @@
+@@ -723,7 +716,7 @@
  ac_try_load () {
      test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
      /sbin/modprobe snd-$1 ${*:2} >/dev/null 2>&1
--    $lsmod | grep -E '(snd-|snd_)'$1 >/dev/null 2>&1 || return 1
-+    /bin/lsmod | grep -E '(snd-|snd_)'$1 >/dev/null 2>&1 || return 1
- 
-     # mute mixers
-     amixer set Master 0% mute >/dev/null 2>&1
-@@ -717,7 +710,7 @@
+-    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
+@@ -762,7 +755,7 @@
  ac_try_capture () {
      test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
      /sbin/modprobe snd-$1 ${*:3} >/dev/null 2>&1
--    $lsmod | grep -E '(snd-|snd_)'$1 >/dev/null 2>&1 || return 1
-+    /bin/lsmod | grep -E '(snd-|snd_)'$1 >/dev/null 2>&1 || return 1
- 
-     # mute mixers
-     amixer set Master 0% mute >/dev/null 2>&1
-@@ -1068,7 +1061,7 @@
+-    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
+@@ -1118,7 +1111,7 @@
      # check for TP600E
      #
      if [ ${devs_found[0]} = cs46xx ]; then
@@ -98,3 +107,12 @@
  	    if $DIALOG --yesno "
   Looks like you having a Thinkpad 600E or 770 notebook.
   On this notebook, CS4236 driver should be used
+@@ -1131,7 +1124,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