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

[Thomas Hood]

    Date: Monday, September 6, 2004 @ 14:11:55
  Author: jdthood-guest
    Path: /cvsroot/pkg-alsa/debian/alsa-utils/debian/patches

   Added: 90_debian_alsaconf_cfgfile.dpatch
Modified: 00list 90_debian_alsaconf.dpatch

Split out change of cfgfile into separate patch 90_debian_alsaconf_cfgfile


-----------------------------------+
 00list                            |    1 +
 90_debian_alsaconf.dpatch         |   28 ++++++++++------------------
 90_debian_alsaconf_cfgfile.dpatch |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 18 deletions(-)


Index: debian/alsa-utils/debian/patches/00list
diff -u debian/alsa-utils/debian/patches/00list:1.5 debian/alsa-utils/debian/patches/00list:1.6
--- debian/alsa-utils/debian/patches/00list:1.5	Mon Sep  6 06:28:51 2004
+++ debian/alsa-utils/debian/patches/00list	Mon Sep  6 14:11:53 2004
@@ -1,4 +1,5 @@
 10_move_asound_state_to_var
 20_alsaconf_lspci
 90_debian_alsaconf
+90_debian_alsaconf_cfgfile
 91_debian_alsaconf_noclear
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch
diff -u debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.5 debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.6
--- debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch:1.5	Thu Jul 15 09:52:14 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf.dpatch	Mon Sep  6 14:11:53 2004
@@ -26,10 +26,10 @@
 exit 0
 
 @DPATCH@
-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 @@
+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 22:06:06.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:07:16.000000000 +0200
+@@ -40,13 +40,6 @@
    distribution="unknown"
  fi
  
@@ -43,7 +43,7 @@
  usage() {
      echo "ALSA configurator version $version"
      echo "usage: alsaconf [options]"
-@@ -72,8 +65,8 @@
+@@ -79,8 +72,8 @@
  use_modinfo_db=0
  do_logging=0
  alsa_uid=0
@@ -54,16 +54,7 @@
  legacy_probe_card=""
  LOGFILE="/tmp/alsaconf.log"
  TESTSOUND="@TESTSOUND@"
-@@ -162,7 +155,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
-@@ -497,7 +490,7 @@
+@@ -506,7 +499,7 @@
  /^[<literal space><literal tab>]*PCI: /{
  	gsub(/0x/, "");
  	gsub(/=/, ":");
@@ -72,7 +63,7 @@
  	if (system (x) == 0)
  		printf "%s %s\n", $2, driver >>"'"$FOUND"'"
  }
-@@ -528,7 +521,7 @@
+@@ -537,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
@@ -81,7 +72,7 @@
  	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/'`
-@@ -723,7 +716,7 @@
+@@ -735,7 +728,7 @@
  ac_try_load () {
      test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
      /sbin/modprobe snd-$1 ${*:2} >/dev/null 2>&1
@@ -90,7 +81,7 @@
  	: ;
      else
  	modprobe -r snd-$1 >/dev/null 2>&1
-@@ -762,7 +755,7 @@
+@@ -774,7 +767,7 @@
  ac_try_capture () {
      test $do_logging = 1 && echo "$1 ${*:2}" >> $LOGFILE
      /sbin/modprobe snd-$1 ${*:3} >/dev/null 2>&1
@@ -99,7 +90,7 @@
  	: ;
      else
  	modprobe -r snd-$1 >/dev/null 2>&1
-@@ -1118,7 +1111,7 @@
+@@ -1130,7 +1123,7 @@
      # check for TP600E
      #
      if [ ${devs_found[0]} = cs46xx ]; then
@@ -108,7 +99,7 @@
  	    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 @@
+@@ -1143,7 +1136,7 @@
  		ac_config_legacy cs4236
  		exit 0
  	    fi
Index: debian/alsa-utils/debian/patches/90_debian_alsaconf_cfgfile.dpatch
diff -u /dev/null debian/alsa-utils/debian/patches/90_debian_alsaconf_cfgfile.dpatch:1.1
--- /dev/null	Mon Sep  6 14:11:55 2004
+++ debian/alsa-utils/debian/patches/90_debian_alsaconf_cfgfile.dpatch	Mon Sep  6 14:11:53 2004
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 90_debian_alsaconf_cfgfile.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 22:09:12.000000000 +0200
++++ alsa-utils/alsaconf/alsaconf.in	2004-09-06 22:09:44.000000000 +0200
+@@ -164,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