Merge lp:~cldunlap1/ubuntu/oneiric/alsa-utils/fix-for-816388 into lp:ubuntu/oneiric/alsa-utils

[Chad Dunlap]

Made the changes requested in lp: #816388 but forgot to do the merge proposal. Sorry All.

[Daniel Holbach (dholbach)]

The fix looks good, thanks. I just think it should go upstream, so it gets included there and we can just include it with the next update.

[Daniel Holbach (dholbach)]

David Henningson agreed to take this fix upstream.

[Michael Terry (mterry)]

Marking this Work In Progress then, so it won't show up in the to-sponsor list (since it looks like we'll wait for upstream).

[Michael Terry (mterry)]

Arg, I can't. Nevermind. ::sheepish look::

[Benjamin Kerensa (bkerensa)]

Has this been submitted upstream?

Unmerged revisions

77. By Chad Dunlap <email address hidden> on 2011-09-11

Fixed Spelling Error (LP#816388)
* fixed spelling error: aplay/aplay.c:177 -- 'coeficient' to 'coefficient'

=== modified file 'aplay/aplay.c'
--- aplay/aplay.c	2011-02-22 15:56:54 +0000
+++ aplay/aplay.c	2011-10-04 18:17:24 +0000
@@ -205,7 +205,7 @@
 "    --disable-format    disable automatic format conversions\n"
 "    --disable-softvol   disable software volume control (softvol)\n"
 "    --test-position     test ring buffer position\n"
-"    --test-coef=#	 test coeficient for ring buffer position (default 8)\n"
+"    --test-coef=#	 test coefficient for ring buffer position (default 8)\n"
 "                        expression for validation is: coef * (buffer_size / 2)\n"
 "    --test-nowait       do not wait for ring buffer - eats whole CPU\n"
 "    --max-file-time=#   start another output file when the old file has recorded\n"
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-09-29 12:02:39 +0000
+++ debian/changelog	2011-10-04 18:17:24 +0000
@@ -1,9 +1,19 @@
+<<<<<<< TREE
 alsa-utils (1.0.24.2-0ubuntu8) oneiric; urgency=low
 
   * 90-alsa-ucm.rules: Trigger on ATTRS{id}=="SDP4430|Panda" (LP: #746023)
 
  -- Adam Conrad <[e-mail]>  Thu, 29 Sep 2011 12:02:39 -0600
 
+=======
+alsa-utils (1.0.24.2-0ubuntu8) natty; urgency=low
+
+  * Fixed Spelling Error (LP#816388) 
+	* aplay/aplay.c:177 -- 'coeficient' to 'coefficient'
+
+ -- Chad Dunlap <cldunlap@BA120470>  Sun, 11 Sep 2011 02:28:01 -0400
+
+>>>>>>> MERGE-SOURCE
 alsa-utils (1.0.24.2-0ubuntu7) oneiric; urgency=low
 
   [ David Henningsson ]