[Pkg-alsa-devel] CVS tree not actually at 1.0.6

[Thomas Hood]

--=-PpZa5OLQWEokSC+A7edV
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

I downloaded alsa-driver-1.0.6a.tar.bz2 and unpacked it and compared the
result with what I get from "cvs up".  Very different.  We are not
working with version 1.0.6a of alsa-driver.

We just released a package named 'alsa-utils_1.0.6-1'.  However, there
is a minor difference between our package and upstream.  Upstream
alsaconf from the 1.0.6 tarball (and also from our .orig.tar.gz)
contains a new "--config" option which is not to be found in our
alsaconf.  I attach the diff.

Thus far we are not in very deep doo-doo, but obviously the problem
needs to be corrected before we do any more releasing.  How should we
bring our CVS tree up to date?
-- 
Thomas

--=-PpZa5OLQWEokSC+A7edV
Content-Disposition: attachment; filename=alsaconf.in.diff
Content-Type: text/x-patch; name=alsaconf.in.diff; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit

--- /home/jdthood/src/pkg-alsa/debian/alsa-utils/alsaconf/alsaconf.in	2004-09-21 19:56:00.000000000 +0200
+++ alsa-utils-1.0.6/alsaconf/alsaconf.in	2004-08-05 16:33:56.000000000 +0200
@@ -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
@@ -175,6 +184,7 @@
   cfgfile="/etc/modules.conf"
   touch /etc/modules.conf
 fi
+fi
 
 # Check for dialog, whiptail, gdialog, awk, ... ?
 if which dialog > /dev/null; then

--=-PpZa5OLQWEokSC+A7edV--