Ubuntu

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

Proposed by Chad Dunlap on 2011-10-04
Status: Work in progress
Proposed branch: lp:~cldunlap1/ubuntu/oneiric/alsa-utils/fix-for-816388
Merge into: lp:ubuntu/oneiric/alsa-utils
Diff against target: 36 lines (+11/-1) 2 files modified (has conflicts)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~cldunlap1/ubuntu/oneiric/alsa-utils/fix-for-816388
Reviewer Review Type Date Requested Status
Ubuntu branches 2011-10-04 Pending
Review via email: mp+78136@code.launchpad.net

Description of the Change

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

To post a comment you must log in.
Daniel Holbach (dholbach) wrote :

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) wrote :

David Henningson agreed to take this fix upstream.

Michael Terry (mterry) wrote :

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) wrote :

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

Benjamin Kerensa (bkerensa) wrote :

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'

Preview Diff

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

Subscribers

People subscribed via source and target branches

to all changes: