[Pkg-alsa-devel] [Debian ALSA CVS] debian/alsa-utils (alsaconf/alsaconf.in debian/changelog)

[Jordi Mallach]

    Date: Tuesday, September 21, 2004 @ 15:09:39
  Author: jordi
    Path: /cvsroot/pkg-alsa/debian/alsa-utils

Modified: alsaconf/alsaconf.in debian/changelog

New upstream source


----------------------+
 alsaconf/alsaconf.in |   12 +++++++++++-
 debian/changelog     |    4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)


Index: debian/alsa-utils/alsaconf/alsaconf.in
diff -u debian/alsa-utils/alsaconf/alsaconf.in:1.8 debian/alsa-utils/alsaconf/alsaconf.in:1.9
--- debian/alsa-utils/alsaconf/alsaconf.in:1.8	Tue Sep  7 02:03:59 2004
+++ debian/alsa-utils/alsaconf/alsaconf.in	Tue Sep 21 15:09:36 2004
@@ -63,11 +63,12 @@
     echo "  -p|--probe card-name"
     echo "                 probe a legacy non-isapnp card and print module options"
     echo "  -P|--listprobe list the supported legacy card modules"
+    echo "  -c|--config    specify the module config file"
     echo "  -h|--help      what you're reading"
     exit 1
 }
 
-OPTS=`getopt -o lmLhp:Pu:g:d:rs: --long legacy,modinfo,log,help,probe,listprobe,uid,gid,devmode,strict,sound -n alsaconf -- "$@"` || exit 1
+OPTS=`getopt -o lmLhp:Pu:g:d:rs:c: --long legacy,modinfo,log,help,probe,listprobe,uid,gid,devmode,strict,sound,config -n alsaconf -- "$@"` || exit 1
 eval set -- "$OPTS"
 
 do_legacy_only=0
@@ -108,6 +109,8 @@
 	alsa_mode="$2"; shift 2;;
     -r|--strict)
 	alsa_uid=0; alsa_gid=17; alsa_mode=0660; shift;;
+    -c|--config)
+	cfgfile="$2"; shift 2;;
     --) shift ; break ;;
     *) usage ; exit 1 ;;
     esac
@@ -155,6 +158,12 @@
 
 # cfgfile = base config file to remove/update the sound setting
 # cfgout = new config file to write the sound setting (if different from $cfgfile)
+if [ -n "$cfgfile" ]; then
+  if [ ! -r "$cfgfile" ]; then
+    echo "ERROR: The config file $cfgfile doesn't exist."
+    exit 1
+  fi
+else
 if [ "$distribution" = "gentoo" ]; then
   cfgfile="/etc/modules.d/alsa"
 elif [ "$kernel" = "new" ]; then
@@ -174,6 +183,7 @@
 else
   cfgfile="/etc/modules.conf"
   touch /etc/modules.conf
+fi
 fi
 
 # Check for dialog, whiptail, gdialog, awk, ... ?
Index: debian/alsa-utils/debian/changelog
diff -u debian/alsa-utils/debian/changelog:1.54 debian/alsa-utils/debian/changelog:1.55
--- debian/alsa-utils/debian/changelog:1.54	Tue Sep 21 14:31:24 2004
+++ debian/alsa-utils/debian/changelog	Tue Sep 21 15:09:36 2004
@@ -4,8 +4,10 @@
   * Thomas Hood: 
     - speaker-test.1
       + Add
+  * Jordi Mallach:
+    - Rebuild with a correct import to get the new alsaconf in.
 
- -- Jordi Mallach <jordi@debian.org>  Tue, 21 Sep 2004 22:09:36 +0200
+ -- Jordi Mallach <jordi@debian.org>  Tue, 21 Sep 2004 22:57:43 +0200
 
 alsa-utils (1.0.6-1) unstable; urgency=low